Move piece in CmakeLists. Update MPAS ccpp-prebuild script

NOAA-EMC · Oct 2, 2024 · fe342d0 · fe342d0
1 parent f571248
commit fe342d0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,9 +105,6 @@ if (FV3)
     if(32BIT)
       list(APPEND _ufsatm_defs_private OVERLOAD_R4 OVERLOAD_R8)
     endif()
-    if(MULTI_GASES)
-      list(APPEND _ufsatm_defs_private MULTI_GASES)
-    endif()
 
     list(APPEND moving_nest_srcs
       fv3/moving_nest/bounding_box.F90
@@ -122,6 +119,10 @@ if (FV3)
     list(APPEND moving_nest_srcs "")
   endif()
 
+  if(MULTI_GASES)
+    list(APPEND _ufsatm_defs_private MULTI_GASES)
+  endif()
+
   # FV3 drivers and dependencies
   add_library(${DYCORE_TARGET}
     fv3/atmos_model.F90

diff --git a/mpas/ccpp/config/ccpp_prebuild_config.py b/mpas/ccpp/config/ccpp_prebuild_config.py
@@ -19,11 +19,11 @@
     'physics/physics/hooks/machine.F',
     'physics/physics/Radiation/RRTMG/radsw_param.f',
     'physics/physics/Radiation/RRTMG/radlw_param.f',
-    'physics/physics/photochem/h2o_def.f',
     'physics/physics/photochem/module_ozphys.F90',
+    'physics/physics/photochem/module_h2ophys.F90',
     '../ccpp/data/CCPP_typedefs.F90',
     '../ccpp/data/GFS_typedefs.F90',
-    '../ccpp/data/CCPP_data.F90',
+    '../ccpp/data/CCPP_data.F90'
     ]
 
 TYPEDEFS_NEW_METADATA = {
@@ -45,6 +45,10 @@
         'module_ozphys' : '',
         'ty_ozphys'     : '',
         },
+    'module_h2ophys' : {
+        'module_h2ophys' : '',
+        'ty_h2ophys'     : '',
+        },
     'CCPP_typedefs' : {
         'GFS_interstitial_type' : 'GFS_Interstitial(cdata%thrd_no)',
         'GFDL_interstitial_type' : 'GFDL_interstitial',
@@ -55,16 +59,15 @@
         },
     'GFS_typedefs' : {
         'GFS_control_type'      : 'GFS_Control',
-        'GFS_data_type'         : 'GFS_Data(cdata%blk_no)',
-        'GFS_diag_type'         : 'GFS_Data(cdata%blk_no)%Intdiag',
-        'GFS_tbd_type'          : 'GFS_Data(cdata%blk_no)%Tbd',
-        'GFS_sfcprop_type'      : 'GFS_Data(cdata%blk_no)%Sfcprop',
-        'GFS_coupling_type'     : 'GFS_Data(cdata%blk_no)%Coupling',
-        'GFS_statein_type'      : 'GFS_Data(cdata%blk_no)%Statein',
-        'GFS_cldprop_type'      : 'GFS_Data(cdata%blk_no)%Cldprop',
-        'GFS_radtend_type'      : 'GFS_Data(cdata%blk_no)%Radtend',
-        'GFS_grid_type'         : 'GFS_Data(cdata%blk_no)%Grid',
-        'GFS_stateout_type'     : 'GFS_Data(cdata%blk_no)%Stateout',
+        'GFS_statein_type'      : 'GFS_Statein',
+        'GFS_stateout_type'     : 'GFS_Stateout',
+        'GFS_grid_type'         : 'GFS_Grid',
+        'GFS_tbd_type'          : 'GFS_Tbd',
+        'GFS_cldprop_type'      : 'GFS_Cldprop',
+        'GFS_sfcprop_type'      : 'GFS_Sfcprop',
+        'GFS_radtend_type'      : 'GFS_Radtend',
+        'GFS_coupling_type'     : 'GFS_Coupling',
+        'GFS_diag_type'         : 'GFS_Intdiag',
         'GFS_typedefs' : '',
         },
     }
@@ -86,6 +89,7 @@
     'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.F90',
     'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90',
     'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.F90',
+    'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry.F90',
     'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.F90',
     'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.F90',
     'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90',
@@ -151,7 +155,7 @@
     'physics/physics/GWD/gwdc_post.f',
     'physics/physics/GWD/gwdps.f',
     'physics/physics/GWD/rayleigh_damp.f',
-    'physics/physics/photochem/h2ophys.f',
+    'physics/physics/photochem/module_h2ophys.F90',
     'physics/physics/photochem/module_ozphys.F90',
     'physics/physics/MP/Ferrier_Aligo/mp_fer_hires.F90',
     'physics/physics/MP/GFDL/gfdl_cloud_microphys.F90',