Changes to pass prebuild with nTiedtke addition

scrasmussen · Jul 31, 2024 · ebcac0d · ebcac0d
1 parent 9c2adcf
commit ebcac0d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -225,19 +225,18 @@
     'ccpp/physics/physics/smoke_dust/rrfs_smoke_wrapper.F90',
     'ccpp/physics/physics/smoke_dust/rrfs_smoke_postpbl.F90',
     'ccpp/physics/physics/tools/get_prs_fv3.F90',
-    'ccpp/physics/physics/tools/get_phi_fv3.F90'
+    'ccpp/physics/physics/tools/get_phi_fv3.F90',
 
     # CNU_NTIEDTKE
-
-    'ccpp/physics/physics/mmm_physics/cu_ntiedtke.F90'      ,
-    'ccpp/physics/physics/scm_cu_ntiedtke_pre.F90'          ,
-    'ccpp/physics/physics/scm_cu_ntiedtke_post.F90'         ,
+    'ccpp/physics/physics/mmm_physics/mmm_cu_ntiedtke.F90'  ,
+    'ccpp/physics/physics/CONV/nTiedtke/mmm_cu_ntiedtke_pre.F90' ,
+    'ccpp/physics/physics/CONV/nTiedtke/mmm_cu_ntiedtke_post.F90' ,
 
     # NCAR MMM
-    'ccpp/physics/physics/gfs_mmm_sfclayrev_pre.F90'        ,
-    'ccpp/physics/physics/gfs_mmm_sfclayrev_post.F90'       ,
-    'ccpp/physics/physics/gfs_mmm_ysu_pre.F90'              ,
-    'ccpp/physics/physics/gfs_mmm_ysu_post.F90'             ,
+    # 'ccpp/physics/physics/mmm_physics/sfclayrev_pre.F90'        ,
+    # 'ccpp/physics/physics/mmm_physics/sfclayrev_post.F90'       ,
+    # 'ccpp/physics/physics/gfs_mmm_ysu_pre.F90'              ,
+    # 'ccpp/physics/physics/gfs_mmm_ysu_post.F90'             ,
     'ccpp/physics/physics/mmm_physics/sf_sfclayrev.F90'     ,
     'ccpp/physics/physics/mmm_physics/bl_ysu.F90'
     ]

diff --git a/ccpp/physics b/ccpp/physics
diff --git a/ccpp/physics_namelists/input_RAP_ntietke.nml b/ccpp/physics_namelists/input_RAP_ntietke.nml
@@ -103,6 +103,7 @@
   do_sppt      = .false.
   do_shum      = .false.
   do_skeb      = .false.
+  do_ysu       = .true.
   lndp_type    = 0
   n_var_lndp   = 0
   fscav_aero   = "'*:0.0'"

diff --git a/ccpp/suites/suite_SCM_RAP_mmm.xml b/ccpp/suites/suite_SCM_RAP_mmm.xml
@@ -40,9 +40,9 @@
     </subcycle>
     <!-- Surface iteration loop -->
     <subcycle loop="2">
-      <scheme>gfs_mmm_sfclayrev_pre</scheme>
+      <!-- <scheme>sf_sfclayrev_pre</scheme> -->
       <scheme>sf_sfclayrev</scheme>
-      <scheme>gfs_mmm_sfclayrev_post</scheme>
+      <!-- <scheme>sf_sfclayrev_post</scheme> -->
       <scheme>GFS_surface_loop_control_part1</scheme>
       <scheme>sfc_nst_pre</scheme>
       <scheme>sfc_nst</scheme>
@@ -65,7 +65,7 @@
       <scheme>drag_suite</scheme>
       <scheme>GFS_GWD_generic_post</scheme>
       <scheme>GFS_suite_stateout_update</scheme>
-      <!-- <scheme>module_ozphys</scheme> ozphys_2015 was moved into ty_ozphys --> 
+      <!-- <scheme>module_ozphys</scheme> ozphys_2015 was moved into ty_ozphys -->
       <scheme>h2ophys</scheme>
       <scheme>get_phi_fv3</scheme>
       <scheme>GFS_suite_interstitial_3</scheme>

diff --git a/ccpp/suites/suite_SCM_RAP_ntiedtke.xml b/ccpp/suites/suite_SCM_RAP_ntiedtke.xml
@@ -19,7 +19,7 @@
       <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
-      <scheme>rrtmg_lw_pre</scheme>
+      <!-- <scheme>rrtmg_lw_pre</scheme> moved to NOTUSED during restructuring -->
       <scheme>rrtmg_lw</scheme>
       <scheme>sgscloud_radpost</scheme>
       <scheme>rrtmg_lw_post</scheme>
@@ -75,9 +75,9 @@
       <!-- <scheme>mp_thompson_pre</scheme> -->
       <!-- <scheme>mp_thompson</scheme> -->
       <!-- <scheme>mp_thompson_post</scheme> -->
-      <scheme>scm_cu_ntiedtke_pre</scheme>
-      <!-- <scheme>cu_ntiedtke_run</scheme> -->
-      <scheme>scm_cu_ntiedtke_post</scheme>
+      <scheme>mmm_cu_ntiedtke_pre</scheme>
+      <scheme>mmm_cu_ntiedtke</scheme>
+      <scheme>mmm_cu_ntiedtke_post</scheme>
       <scheme>GFS_MP_generic_post</scheme>
       <scheme>cu_gf_driver_post</scheme>
       <scheme>maximum_hourly_diagnostics</scheme>
+9 −9		physics/CONV/nTiedtke/mmm_cu_ntiedtke_post.F90
+3 −3		physics/CONV/nTiedtke/mmm_cu_ntiedtke_post.meta
+9 −9		physics/CONV/nTiedtke/mmm_cu_ntiedtke_pre.F90
+3 −3		physics/CONV/nTiedtke/mmm_cu_ntiedtke_pre.meta
+2 −1		physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta
+3 −0		physics/SFC_Layer/MYNN/mynnsfc_wrapper.meta
+5 −2		physics/SFC_Models/Land/Noahmp/noahmpdrv.meta
+1 −1		physics/mmm_physics
+1 −0		physics/smoke_dust/rrfs_smoke_wrapper.meta