implement timestep_init phases and catch up with master of ccpp-physics

ccpp/config/ccpp_prebuild_config.py

@@ -17,6 +17,8 @@
     # actual variable definition files
     'ccpp/physics/physics/machine.F',
     'ccpp/physics/physics/radsw_param.f',
+    'ccpp/physics/physics/h2o_def.f',
+    'ccpp/physics/physics/ozne_def.f',
     'ccpp/physics/physics/radlw_param.f',
     'scm/src/GFS_typedefs.F90',
     'scm/src/gmtb_scm_kinds.F90',
@@ -158,7 +160,6 @@
     'ccpp/physics/physics/ozphys_2015.f'                    ,
     'ccpp/physics/physics/precpd.f'                         ,
     'ccpp/physics/physics/phys_tend.F90'                    ,
-    'ccpp/physics/physics/tracer_sanitizer.F90'             ,
     'ccpp/physics/physics/radlw_main.F90'                   ,
     'ccpp/physics/physics/radsw_main.F90'                   ,
     'ccpp/physics/physics/rascnv.F90'                       ,
@@ -170,7 +171,6 @@
     'ccpp/physics/physics/sfc_diag.f'                       ,
     'ccpp/physics/physics/sfc_diag_post.F90'                ,
     'ccpp/physics/physics/sfc_drv_ruc.F90'                  ,
-    'ccpp/physics/physics/lsm_ruc_sfc_sice_interstitial.F90',
     'ccpp/physics/physics/sfc_cice.f'                       ,
     'ccpp/physics/physics/sfc_diff.f'                       ,
     'ccpp/physics/physics/sfc_drv.f'                        ,
@@ -212,22 +212,22 @@
 DEFAULT_BUILD_DIR = 'scm/bin'
 
 # Auto-generated makefile/cmakefile snippets that contain all type definitions
-TYPEDEFS_MAKEFILE   = 'ccpp/physics/CCPP_TYPEDEFS.mk'
-TYPEDEFS_CMAKEFILE  = 'ccpp/physics/CCPP_TYPEDEFS.cmake'
-TYPEDEFS_SOURCEFILE = 'ccpp/physics/CCPP_TYPEDEFS.sh'
+TYPEDEFS_MAKEFILE   = '{build_dir}/ccpp/physics/CCPP_TYPEDEFS.mk'
+TYPEDEFS_CMAKEFILE  = '{build_dir}/ccpp/physics/CCPP_TYPEDEFS.cmake'
+TYPEDEFS_SOURCEFILE = '{build_dir}/ccpp/physics/CCPP_TYPEDEFS.sh'
 
 # Auto-generated makefile/cmakefile snippets that contain all schemes
-SCHEMES_MAKEFILE = 'ccpp/physics/CCPP_SCHEMES.mk'
-SCHEMES_CMAKEFILE = 'ccpp/physics/CCPP_SCHEMES.cmake'
-SCHEMES_SOURCEFILE = 'ccpp/physics/CCPP_SCHEMES.sh'
+SCHEMES_MAKEFILE = '{build_dir}/ccpp/physics/CCPP_SCHEMES.mk'
+SCHEMES_CMAKEFILE = '{build_dir}/ccpp/physics/CCPP_SCHEMES.cmake'
+SCHEMES_SOURCEFILE = '{build_dir}/ccpp/physics/CCPP_SCHEMES.sh'
 
 # Auto-generated makefile/cmakefile snippets that contain all caps
-CAPS_MAKEFILE = 'ccpp/physics/CCPP_CAPS.mk'
-CAPS_CMAKEFILE = 'ccpp/physics/CCPP_CAPS.cmake'
-CAPS_SOURCEFILE = 'ccpp/physics/CCPP_CAPS.sh'
+CAPS_MAKEFILE = '{build_dir}/ccpp/physics/CCPP_CAPS.mk'
+CAPS_CMAKEFILE = '{build_dir}/ccpp/physics/CCPP_CAPS.cmake'
+CAPS_SOURCEFILE = '{build_dir}/ccpp/physics/CCPP_CAPS.sh'
 
 # Directory where to put all auto-generated physics caps
-CAPS_DIR = 'ccpp/physics/physics'
+CAPS_DIR = '{build_dir}/ccpp/physics/physics'
 
 # Directory where the suite definition files are stored
 SUITES_DIR = 'ccpp/suites'
@@ -297,7 +297,7 @@
          'rrtmgp_sw_rte_run' : [
              'components_of_surface_downward_shortwave_fluxes',
              ],
-         },        
+         },
     'GFS_rrtmgp_sw_post' : {
          'GFS_rrtmgp_sw_post_run' : [
              'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',
@@ -325,4 +325,4 @@
 HTML_VARTABLE_FILE = 'ccpp/physics/CCPP_VARIABLES_SCM.html'
 
 # LaTeX document containing the provided vs requested CCPP variables
-LATEX_VARTABLE_FILE = 'ccpp/framework/doc/DevelopersGuide/CCPP_VARIABLES_SCM.tex'
+LATEX_VARTABLE_FILE = 'ccpp/framework/doc/DevelopersGuide/CCPP_VARIABLES_SCM.tex'

ccpp/suites/suite_SCM_GSD_v1.xml

@@ -45,9 +45,6 @@
       <scheme>sfc_nst</scheme>
       <scheme>sfc_nst_post</scheme>
       <scheme>lsm_ruc</scheme>
-      <scheme>lsm_ruc_sfc_sice_pre</scheme>
-      <scheme>sfc_sice</scheme>
-      <scheme>lsm_ruc_sfc_sice_post</scheme>
       <scheme>GFS_surface_loop_control_part2</scheme>
     </subcycle>
     <!-- End of surface iteration loop -->

scm/src/CMakeLists.txt

@@ -27,8 +27,10 @@ endif("${SUITES}" STREQUAL "")
 string(REGEX REPLACE "(.+),$" "\\1" SUITES ${SUITES})
 # Run CCPP prebuild.py
 message (STATUS "Running ccpp_prebuild.py for CCPP")
+# Make the directories where the ccpp_prebuild.py script wants to write caps and make snippets
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ccpp/physics/physics)
 execute_process(
-  COMMAND ccpp/framework/scripts/ccpp_prebuild.py --config=ccpp/config/ccpp_prebuild_config.py --suites=${SUITES} --builddir=${CMAKE_CURRENT_BINARY_DIR}/..
+  COMMAND ccpp/framework/scripts/ccpp_prebuild.py --config=ccpp/config/ccpp_prebuild_config.py --suites=${SUITES} --builddir=${CMAKE_CURRENT_BINARY_DIR}
   OUTPUT_FILE ${PROJECT_BINARY_DIR}/ccpp_prebuild.out
   ERROR_FILE ${PROJECT_BINARY_DIR}/ccpp_prebuild.err
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../..