Skip to content

Commit dbb02c0

Browse files
author
Mariana Vertenstein
committed
Merge branch 'main' into feature/cism2mosart
2 parents e044a84 + 797acd7 commit dbb02c0

File tree

4 files changed

+116
-10
lines changed

4 files changed

+116
-10
lines changed

‎component_grids_nuopc.xml

+6
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,12 @@
532532
<desc>WW3 90 x 50 global grid</desc>
533533
<support>For testing of the WAV model</support>
534534
</domain>
535+
<domain name="wgx3v7">
536+
<nx>100</nx> <ny>116</ny>
537+
<mesh>$DIN_LOC_ROOT/share/meshes/wgx3v7_2301208_ESMFmesh.nc</mesh>
538+
<desc>gx3v7 global grid</desc>
539+
<support>For testing of the WAV model</support>
540+
</domain>
535541
<domain name="wtx0.66v1">
536542
<nx>540</nx> <ny>458</ny>
537543
<mesh>$DIN_LOC_ROOT/share/meshes/wtx0.66v1_210917_ESMFmesh.nc</mesh>

‎machines/Depends.nvhpc

+84
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,88 @@ mo_fluxes_broadband_kernels.o \
6060
mo_rte_solver_kernels.o \
6161
mo_optical_props_kernels.o
6262

63+
CLUBB_OBJS=\
64+
adg1_adg2_3d_luhar_pdf.o\
65+
advance_clubb_core_module.o\
66+
advance_helper_module.o\
67+
advance_windm_edsclrm_module.o\
68+
advance_wp2_wp3_module.o\
69+
advance_xm_wpxp_module.o\
70+
advance_xp2_xpyp_module.o\
71+
advance_xp3_module.o\
72+
array_index.o\
73+
calc_pressure.o\
74+
calc_roots.o\
75+
calendar.o\
76+
clip_explicit.o\
77+
clip_semi_implicit.o\
78+
clubb_api_module.o\
79+
clubb_precision.o\
80+
code_timer_module.o\
81+
constants_clubb.o\
82+
corr_varnce_module.o\
83+
diagnose_correlations_module.o\
84+
diffusion.o\
85+
endian.o\
86+
error_code.o\
87+
file_functions.o\
88+
fill_holes.o\
89+
grid_class.o\
90+
hydromet_pdf_parameter_module.o\
91+
index_mapping.o\
92+
input_names.o\
93+
input_reader.o\
94+
interpolation.o\
95+
lapack_interfaces.o\
96+
lapack_wrap.o\
97+
LY93_pdf.o\
98+
matrix_operations.o\
99+
matrix_solver_wrapper.o\
100+
mean_adv.o\
101+
mixing_length.o\
102+
model_flags.o\
103+
mono_flux_limiter.o\
104+
mt95.o\
105+
Nc_Ncn_eqns.o\
106+
new_hybrid_pdf.o\
107+
new_hybrid_pdf_main.o\
108+
new_pdf.o\
109+
new_pdf_main.o\
110+
new_tsdadg_pdf.o\
111+
numerical_check.o\
112+
output_grads.o\
113+
output_netcdf.o\
114+
parameter_indices.o\
115+
parameters_model.o\
116+
parameters_tunable.o\
117+
pdf_closure_module.o\
118+
pdf_parameter_module.o\
119+
pdf_utilities.o\
120+
penta_lu_solver.o\
121+
pos_definite_module.o\
122+
precipitation_fraction.o\
123+
saturation.o\
124+
setup_clubb_pdf_params.o\
125+
sfc_varnce_module.o\
126+
sigma_sqd_w_module.o\
127+
Skx_module.o\
128+
sponge_layer_damping.o\
129+
stat_file_module.o\
130+
stats_clubb_utilities.o\
131+
stats_lh_sfc_module.o\
132+
stats_lh_zt_module.o\
133+
stats_rad_zm_module.o\
134+
stats_rad_zt_module.o\
135+
stats_sfc_module.o\
136+
stats_type.o\
137+
stats_type_utilities.o\
138+
stats_variables.o\
139+
stats_zm_module.o\
140+
stats_zt_module.o\
141+
T_in_K_module.o\
142+
tridiag_lu_solver.o\
143+
turbulent_adv_pdf.o
144+
63145
ifeq ($(DEBUG),FALSE)
64146
$(PERFOBJS): %.o: %.F90
65147
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -Mfprelaxed=div $<
@@ -75,4 +157,6 @@ ifeq ($(DEBUG),FALSE)
75157
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -fastsse -Mnofma -Mflushz -Mfprelaxed=sqrt $(GPUFLAGS) $<
76158
$(RRTMGP_OBJS): %.o: %.F90
77159
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(GPUFLAGS) $<
160+
$(CLUBB_OBJS): %.o: %.F90
161+
$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(GPUFLAGS) $<
78162
endif

‎machines/perlmutter/config_machines.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -59,31 +59,31 @@
5959
</modules>
6060
<modules compiler="gnu">
6161
<command name="load">PrgEnv-gnu</command>
62-
<command name="switch">gcc gcc/11.2.0</command>
62+
6363
</modules>
6464
<modules>
65-
<command name="swap">craype craype/2.7.10</command>
65+
<command name="swap">craype craype/2.7.30</command>
6666
</modules>
6767
<modules>
68-
<command name="switch">cray-libsci/21.08.1.2</command>
68+
<command name="switch">cray-libsci/23.12.5</command>
6969
</modules>
7070
<modules>
71-
<command name="load">cray-mpich/8.1.9</command>
71+
<command name="load">cray-mpich/8.1.28</command>
7272
</modules>
7373
<modules mpilib="mpi-serial">
7474
<command name="rm">cray-netcdf-hdf5parallel</command>
7575
<command name="rm">cray-hdf5-parallel</command>
7676
<command name="rm">cray-parallel-netcdf</command>
77-
<command name="load">cray-hdf5/1.12.0.7</command>
78-
<command name="load">cray-netcdf/4.7.4.7</command>
77+
<command name="load">cray-hdf5</command>
78+
<command name="load">cray-netcdf</command>
7979
</modules>
8080
<modules mpilib="!mpi-serial">
81-
<command name="load">cray-hdf5-parallel/1.12.0.7</command>
82-
<command name="load">cray-netcdf-hdf5parallel/4.7.4.7</command>
83-
<command name="load">cray-parallel-netcdf/1.12.1.7</command>
81+
<command name="load">cray-hdf5-parallel</command>
82+
<command name="load">cray-netcdf-hdf5parallel</command>
83+
<command name="load">cray-parallel-netcdf</command>
8484
</modules>
8585
<modules>
86-
<command name="load">cmake/3.20.5</command>
86+
<command name="load">cmake/3.22.0</command>
8787
</modules>
8888
</module_system>
8989
<environment_variables>

‎modelgrid_aliases_nuopc.xml

+16
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,14 @@
357357
<grid name="rof">JRA025</grid>
358358
</model_grid>
359359

360+
<model_grid alias="TL319_t232_wg37" compset="DATM%JRA">
361+
<grid name="atm">TL319</grid>
362+
<grid name="lnd">TL319</grid>
363+
<grid name="ocnice">tx2_3v2</grid>
364+
<grid name="rof">JRA025</grid>
365+
<grid name="wav">wgx3v7</grid>
366+
</model_grid>
367+
360368
<model_grid alias="TL319_t061_wt061" not_compset="_CAM">
361369
<grid name="atm">TL319</grid>
362370
<grid name="lnd">TL319</grid>
@@ -940,6 +948,14 @@
940948
<mask>tx2_3v2</mask>
941949
</model_grid>
942950

951+
<model_grid alias="ne30pg3_t232_wg37">
952+
<grid name="atm">ne30np4.pg3</grid>
953+
<grid name="lnd">ne30np4.pg3</grid>
954+
<grid name="ocnice">tx2_3v2</grid>
955+
<grid name="wav">wgx3v7</grid>
956+
<mask>tx2_3v2</mask>
957+
</model_grid>
958+
943959
<model_grid alias="ne30pg3_t232_gris4">
944960
<grid name="atm">ne30np4.pg3</grid>
945961
<grid name="lnd">ne30np4.pg3</grid>

0 commit comments

Comments
 (0)