Merge branch 'update/cesm3_0_beta01/ccs_config_cesm0.0.109' into ew-d…

…evelop (PR #26)
EarthWorksOrg · Aug 29, 2024 · 673a152 · 673a152
2 parents a28328d + 0347dfd
commit 673a152
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 10 deletions.
diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml
@@ -586,6 +586,12 @@
     <desc>WW3 90 x 50 global grid</desc>
     <support>For testing of the WAV model</support>
   </domain>
+  <domain name="wgx3v7">
+    <nx>100</nx>  <ny>116</ny>
+    <mesh>$DIN_LOC_ROOT/share/meshes/wgx3v7_2301208_ESMFmesh.nc</mesh>
+    <desc>gx3v7 global grid</desc>
+    <support>For testing of the WAV model</support>
+  </domain>
   <domain name="wtx0.66v1">
     <nx>540</nx> <ny>458</ny>
     <mesh>$DIN_LOC_ROOT/share/meshes/wtx0.66v1_210917_ESMFmesh.nc</mesh>

diff --git a/machines/Depends.nvhpc b/machines/Depends.nvhpc
@@ -60,6 +60,88 @@ mo_fluxes_broadband_kernels.o \
 mo_rte_solver_kernels.o \
 mo_optical_props_kernels.o
 
+CLUBB_OBJS=\
+adg1_adg2_3d_luhar_pdf.o\
+advance_clubb_core_module.o\
+advance_helper_module.o\
+advance_windm_edsclrm_module.o\
+advance_wp2_wp3_module.o\
+advance_xm_wpxp_module.o\
+advance_xp2_xpyp_module.o\
+advance_xp3_module.o\
+array_index.o\
+calc_pressure.o\
+calc_roots.o\
+calendar.o\
+clip_explicit.o\
+clip_semi_implicit.o\
+clubb_api_module.o\
+clubb_precision.o\
+code_timer_module.o\
+constants_clubb.o\
+corr_varnce_module.o\
+diagnose_correlations_module.o\
+diffusion.o\
+endian.o\
+error_code.o\
+file_functions.o\
+fill_holes.o\
+grid_class.o\
+hydromet_pdf_parameter_module.o\
+index_mapping.o\
+input_names.o\
+input_reader.o\
+interpolation.o\
+lapack_interfaces.o\
+lapack_wrap.o\
+LY93_pdf.o\
+matrix_operations.o\
+matrix_solver_wrapper.o\
+mean_adv.o\
+mixing_length.o\
+model_flags.o\
+mono_flux_limiter.o\
+mt95.o\
+Nc_Ncn_eqns.o\
+new_hybrid_pdf.o\
+new_hybrid_pdf_main.o\
+new_pdf.o\
+new_pdf_main.o\
+new_tsdadg_pdf.o\
+numerical_check.o\
+output_grads.o\
+output_netcdf.o\
+parameter_indices.o\
+parameters_model.o\
+parameters_tunable.o\
+pdf_closure_module.o\
+pdf_parameter_module.o\
+pdf_utilities.o\
+penta_lu_solver.o\
+pos_definite_module.o\
+precipitation_fraction.o\
+saturation.o\
+setup_clubb_pdf_params.o\
+sfc_varnce_module.o\
+sigma_sqd_w_module.o\
+Skx_module.o\
+sponge_layer_damping.o\
+stat_file_module.o\
+stats_clubb_utilities.o\
+stats_lh_sfc_module.o\
+stats_lh_zt_module.o\
+stats_rad_zm_module.o\
+stats_rad_zt_module.o\
+stats_sfc_module.o\
+stats_type.o\
+stats_type_utilities.o\
+stats_variables.o\
+stats_zm_module.o\
+stats_zt_module.o\
+T_in_K_module.o\
+tridiag_lu_solver.o\
+turbulent_adv_pdf.o
+
 ifeq ($(DEBUG),FALSE)
   $(PERFOBJS): %.o: %.F90
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -Mfprelaxed=div $<
@@ -75,4 +157,6 @@ ifeq ($(DEBUG),FALSE)
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -fastsse -Mnofma -Mflushz -Mfprelaxed=sqrt $(GPUFLAGS) $<
   $(RRTMGP_OBJS): %.o: %.F90
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(GPUFLAGS) $<
+  $(CLUBB_OBJS): %.o: %.F90
+	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(GPUFLAGS) $<
 endif
diff --git a/machines/perlmutter/config_machines.xml b/machines/perlmutter/config_machines.xml
@@ -59,31 +59,31 @@
       </modules>
       <modules compiler="gnu">
         <command name="load">PrgEnv-gnu</command>
-        <command name="switch">gcc gcc/11.2.0</command>
+	
       </modules>
       <modules>
-        <command name="swap">craype craype/2.7.10</command>
+        <command name="swap">craype craype/2.7.30</command>
       </modules>
       <modules>
-        <command name="switch">cray-libsci/21.08.1.2</command>
+        <command name="switch">cray-libsci/23.12.5</command>
       </modules>
       <modules>
-        <command name="load">cray-mpich/8.1.9</command>
+        <command name="load">cray-mpich/8.1.28</command>
       </modules>
       <modules mpilib="mpi-serial">
         <command name="rm">cray-netcdf-hdf5parallel</command>
         <command name="rm">cray-hdf5-parallel</command>
         <command name="rm">cray-parallel-netcdf</command>
-        <command name="load">cray-hdf5/1.12.0.7</command>
-        <command name="load">cray-netcdf/4.7.4.7</command>
+        <command name="load">cray-hdf5</command>
+        <command name="load">cray-netcdf</command>
       </modules>
       <modules mpilib="!mpi-serial">
-        <command name="load">cray-hdf5-parallel/1.12.0.7</command>
-        <command name="load">cray-netcdf-hdf5parallel/4.7.4.7</command>
-        <command name="load">cray-parallel-netcdf/1.12.1.7</command>
+        <command name="load">cray-hdf5-parallel</command>
+        <command name="load">cray-netcdf-hdf5parallel</command>
+        <command name="load">cray-parallel-netcdf</command>
       </modules>
       <modules>
-        <command name="load">cmake/3.20.5</command>
+        <command name="load">cmake/3.22.0</command>
       </modules>
     </module_system>
     <environment_variables>

diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml
@@ -357,6 +357,14 @@
     <grid name="rof">JRA025</grid>
   </model_grid>
 
+  <model_grid alias="TL319_t232_wg37" compset="DATM%JRA">
+    <grid name="atm">TL319</grid>
+    <grid name="lnd">TL319</grid>
+    <grid name="ocnice">tx2_3v2</grid>
+    <grid name="rof">JRA025</grid>
+    <grid name="wav">wgx3v7</grid>
+  </model_grid>
+
   <model_grid alias="TL319_t061_wt061" not_compset="_CAM">
     <grid name="atm">TL319</grid>
     <grid name="lnd">TL319</grid>
@@ -1043,6 +1051,14 @@
     <mask>tx2_3v2</mask>
   </model_grid>
 
+  <model_grid alias="ne30pg3_t232_wg37">
+    <grid name="atm">ne30np4.pg3</grid>
+    <grid name="lnd">ne30np4.pg3</grid>
+    <grid name="ocnice">tx2_3v2</grid>
+    <grid name="wav">wgx3v7</grid>
+    <mask>tx2_3v2</mask>
+  </model_grid>
+
   <model_grid alias="ne30pg3_t232_gris4">
     <grid name="atm">ne30np4.pg3</grid>
     <grid name="lnd">ne30np4.pg3</grid>