Merge pull request #183 from grantfirl/update_dtc_develop_20200608

Update dtc/develop branch to work with ccpp-physics/framework as of 20200608
NCAR · Jun 9, 2020 · cb1dd17 · cb1dd17
2 parents 02f7afd + bacbc93
commit cb1dd17
Show file tree

Hide file tree

Showing 16 changed files with 882 additions and 243 deletions.
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -120,6 +120,8 @@
     'ccpp/physics/physics/module_mp_thompson.F90',
     'ccpp/physics/physics/module_mp_thompson_make_number_concentrations.F90',
     'ccpp/physics/physics/module_MP_FER_HIRES.F90',
+#    'ccpp/physics/physics/HWRF_mersenne_twister.F90',
+#    'ccpp/physics/physics/HWRF_mcica_random_numbers.F90',
     'ccpp/physics/physics/module_bl_mynn.F90',
     'ccpp/physics/physics/module_sf_mynn.F90',
     'ccpp/physics/physics/module_SF_JSFC.F90',
@@ -170,6 +172,9 @@
     'ccpp/physics/physics/namelist_soilveg_ruc.F90',
     'ccpp/physics/physics/set_soilveg_ruc.F90',
     'ccpp/physics/physics/module_soil_pre.F90',
+#    'ccpp/physics/physics/module_sf_noahlsm.F90',
+#    'ccpp/physics/physics/module_sf_noahlsm_glacial_only.F90',
+#    'ccpp/physics/physics/module_sf_exchcoef.f90',
     # RRTMGP
     'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
     'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics.F90',
@@ -196,7 +201,7 @@
     'ccpp/physics/physics/rte-rrtmgp/extensions/mo_heating_rates.F90',
     'ccpp/physics/physics/rte-rrtmgp/extensions/mo_rrtmgp_clr_all_sky.F90',
     'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
-    'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_sampling.F90', 
+    'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_sampling.F90',
     # derived data type definitions
     'scm/src/GFS_typedefs.F90',
     'scm/src/gmtb_scm_kinds.F90',
@@ -237,6 +242,7 @@
     'ccpp/physics/physics/gcm_shoc.F90'                     : ['physics'],
     'ccpp/physics/physics/get_prs_fv3.F90'                  : ['physics'],
     'ccpp/physics/physics/gfdl_cloud_microphys.F90'         : ['physics'],
+#    'ccpp/physics/physics/gfdl_sfc_layer.F90'               : ['physics'],
     'ccpp/physics/physics/gscond.f'                         : ['physics'],
     'ccpp/physics/physics/gwdc.f'                           : ['physics'],
     'ccpp/physics/physics/gwdps.f'                          : ['physics'],
@@ -269,6 +275,8 @@
     'ccpp/physics/physics/ozphys.f'                         : ['physics'],
     'ccpp/physics/physics/ozphys_2015.f'                    : ['physics'],
     'ccpp/physics/physics/precpd.f'                         : ['physics'],
+#    'ccpp/physics/physics/radlw_main.F90'                   : ['physics'],
+#    'ccpp/physics/physics/radsw_main.F90'                   : ['physics'],
     'ccpp/physics/physics/radlw_main.f'                     : ['physics'],
     'ccpp/physics/physics/radsw_main.f'                     : ['physics'],
     'ccpp/physics/physics/rayleigh_damp.f'                  : ['physics'],
@@ -283,6 +291,8 @@
     'ccpp/physics/physics/sfc_cice.f'                       : ['physics'],
     'ccpp/physics/physics/sfc_diff.f'                       : ['physics'],
     'ccpp/physics/physics/sfc_drv.f'                        : ['physics'],
+#    'ccpp/physics/physics/sfc_noah_wrfv4_interstitial.F90'  : ['physics'],
+#    'ccpp/physics/physics/sfc_noah_wrfv4.F90'               : ['physics'],
     'ccpp/physics/physics/sfc_noahmp_drv.f'                 : ['physics'],
     'ccpp/physics/physics/sfc_nst.f'                        : ['physics'],
     'ccpp/physics/physics/sfc_ocean.F'                      : ['physics'],

diff --git a/ccpp/framework b/ccpp/framework
diff --git a/ccpp/physics b/ccpp/physics
diff --git a/ccpp/physics_namelists/input_csawmg.nml b/ccpp/physics_namelists/input_csawmg.nml
@@ -72,8 +72,7 @@
        mg_qcvar       = 1.0
        fprcp          = 2
        pdfflag        = 4
-       iccn           = .false.
-       aero_in        = .false.
+       iccn           = 0
        mg_do_graupel  = .true.
        mg_do_hail     = .false.
        do_sb_physics  = .true.

diff --git a/scm/etc/case_config/astex.nml b/scm/etc/case_config/astex.nml
@@ -15,6 +15,7 @@ mom_forcing_type = 2,
 relax_time = 7200.0,
 sfc_flux_spec = .false.,
 sfc_type = 0,
+sfc_roughness_length_cm = 0.02,
 reference_profile_choice = 1,
 year = 1992,
 month = 6,

diff --git a/scm/etc/case_config/fv3_model_point_noah.nml b/scm/etc/case_config/fv3_model_point_noah.nml
@@ -22,6 +22,5 @@ year = 2016,
 month = 10,
 day = 3,
 hour = 0,
-output_dir = 'output_fv3_model_point_noah'
 $end
 
diff --git a/scm/etc/case_config/fv3_model_point_noahmp.nml b/scm/etc/case_config/fv3_model_point_noahmp.nml
@@ -22,6 +22,5 @@ year = 2016,
 month = 10,
 day = 3,
 hour = 0,
-output_dir = 'output_fv3_model_point_noahmp'
 $end
 
diff --git a/scm/etc/case_config/twpice.nml b/scm/etc/case_config/twpice.nml
@@ -15,6 +15,7 @@ mom_forcing_type = 3,
 relax_time = 7200.0,
 sfc_flux_spec = .false.,
 sfc_type = 0,
+sfc_roughness_length_cm = 0.02,
 reference_profile_choice = 1,
 year = 2006,
 month = 1,

diff --git a/scm/src/CMakeLists.txt b/scm/src/CMakeLists.txt
@@ -2,45 +2,39 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(scm)
 set(PROJECT "CCPP-SCM")
 
-# The only option to build is the static build
-set(STATIC TRUE)
-
 ####################################################################
 # Begin CCPP prebuild step                                         #
 ####################################################################
-if(STATIC)
-  # Start with empty list of suites
-  message (STATUS "Generating list of suites to compile for static CCPP")
-  set(SUITES "")
-  # Get list of all suite definition files (with full path)
-  file(GLOB SUITE_DEFINITION_FILES
-      "${CMAKE_CURRENT_SOURCE_DIR}/../../ccpp/suites/suite_*.xml"
-  )
-  # Extract file name and suite name and append to SUITES
-  foreach(suite_definition_filepath IN LISTS SUITE_DEFINITION_FILES)
-    get_filename_component(suite_definition_filename ${suite_definition_filepath} NAME)
-    string(REGEX REPLACE "^suite_(.+)\\.xml$" "\\1" suite_name ${suite_definition_filename})
-    set(SUITES ${SUITES}${suite_name},)
-    message (STATUS "  adding suite ${suite_name}")
-  endforeach(suite_definition_filepath IN LISTS SUITE_DEFINITION_FILES)
-  # Abort if no suites found
-  if ("${SUITES}" STREQUAL "")
-    message(FATAL_ERROR "No suites found to compile for static CCPP")
-  endif("${SUITES}" STREQUAL "")
-  # Remove trailing comma from list of suites
-  string(REGEX REPLACE "(.+),$" "\\1" SUITES ${SUITES})
-  # Run CCPP prebuild.py
-  message (STATUS "Running ccpp_prebuild.py for static CCPP")
-  execute_process(
-    COMMAND ccpp/framework/scripts/ccpp_prebuild.py --config=ccpp/config/ccpp_prebuild_config.py --static --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}/../..
-    RESULT_VARIABLE return_code
-  )
-else(STATIC)
-  message(FATAL_ERROR "Dynamic CCPP build no longer supported")
-endif(STATIC)
+# Start with empty list of suites
+message (STATUS "Generating list of suites to compile for CCPP")
+set(SUITES "")
+# Get list of all suite definition files (with full path)
+file(GLOB SUITE_DEFINITION_FILES
+    "${CMAKE_CURRENT_SOURCE_DIR}/../../ccpp/suites/suite_*.xml"
+)
+# Extract file name and suite name and append to SUITES
+foreach(suite_definition_filepath IN LISTS SUITE_DEFINITION_FILES)
+  get_filename_component(suite_definition_filename ${suite_definition_filepath} NAME)
+  string(REGEX REPLACE "^suite_(.+)\\.xml$" "\\1" suite_name ${suite_definition_filename})
+  set(SUITES ${SUITES}${suite_name},)
+  message (STATUS "  adding suite ${suite_name}")
+endforeach(suite_definition_filepath IN LISTS SUITE_DEFINITION_FILES)
+# Abort if no suites found
+if ("${SUITES}" STREQUAL "")
+  message(FATAL_ERROR "No suites found to compile for CCPP")
+endif("${SUITES}" STREQUAL "")
+# Remove trailing comma from list of suites
+string(REGEX REPLACE "(.+),$" "\\1" SUITES ${SUITES})
+# Run CCPP prebuild.py
+message (STATUS "Running ccpp_prebuild.py for CCPP")
+execute_process(
+  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}/../..
+  RESULT_VARIABLE return_code
+)
+
 # Check return code from CCPP prebuild.py
 if(return_code EQUAL 0)
   message (STATUS "CCPP prebuild step completed successfully")
@@ -88,10 +82,6 @@ ELSE(DEFINED ENV{W3NCO_LIBd})
   MESSAGE(FATAL_ERROR "The W3NCO_LIBd environment variable must be set to point to your W3NCO installation (part of NCEPLIBS) before building. Stopping...")
 ENDIF(DEFINED ENV{W3NCO_LIBd})
 
-if(STATIC)
-  ADD_DEFINITIONS(-DSTATIC)
-endif(STATIC)
-
 SET(CCPP_SRC ${CMAKE_SOURCE_DIR}/../../ccpp/framework)
 SET(GFSPHYSICS_SRC ${CMAKE_SOURCE_DIR}/../../ccpp/physics)
 
@@ -299,13 +289,9 @@ SET(scm_source_files gmtb_scm.F90
             gmtb_scm_output.F90
 )
 
-if(STATIC)
-  ADD_EXECUTABLE(gmtb_scm ${scm_source_files} ccpp_static_api.F90)
-  TARGET_LINK_LIBRARIES(gmtb_scm ccppphys ccpp ${BACIO_LIB4} ${SP_LIBd} ${W3NCO_LIBd})
-else(STATIC)
-  ADD_EXECUTABLE(gmtb_scm ${scm_source_files})
-  TARGET_LINK_LIBRARIES(gmtb_scm ccppphys ccpp)
-endif(STATIC)
+ADD_EXECUTABLE(gmtb_scm ${scm_source_files} ccpp_static_api.F90)
+TARGET_LINK_LIBRARIES(gmtb_scm ccppphys ccpp ${BACIO_LIB4} ${SP_LIBd} ${W3NCO_LIBd})
+
 
 set_target_properties(gmtb_scm PROPERTIES
                                COMPILE_FLAGS "${CMAKE_Fortran_FLAGS}"