Skip to content

Commit

Permalink
Merge pull request #42 from mvertens/feature/trigrid
Browse files Browse the repository at this point in the history 
first alias for trigrid
  • Loading branch information
@mvdebolskiy
mvdebolskiy authored Jul 11, 2024
2 parents d2be63e + 44838ea commit fe4e966
Show file tree
Hide file tree
Showing 7 changed files with 117 additions and 54 deletions.
13 changes: 12 additions & 1 deletion component_grids_nuopc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,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>
Expand Down Expand Up @@ -595,7 +601,12 @@
<domain name="1x1_smallvilleIA">
<lat>40.6878</lat>
<lon>267.0228</lon>
<desc>1x1 Smallville Iowa Crop Test Case -- only valid for DATM/CLM compset</desc>
<desc>1x1 Smallville Iowa Crop Test Case w/ synthetic land data -- only valid for DATM/CLM compset</desc>
</domain>
<domain name="1x1_cidadinhoBR">
<lat>-12.9952</lat>
<lon>305.3233</lon>
<desc>1x1 Cidadinho ("Smallville") Brazil Crop Test Case w/ synthetic land data -- only valid for DATM/CLM compset</desc>
</domain>
<domain name="1x1_camdenNJ">
<lat>40.0</lat>
Expand Down
84 changes: 84 additions & 0 deletions machines/Depends.nvhpc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 $<
Expand All @@ -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
1 change: 1 addition & 0 deletions machines/cmake_macros/ubuntu-latest.cmake
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(PFUNIT_PATH "$GITHUB_WORKSPACE/pfunit/build")
3 changes: 2 additions & 1 deletion machines/config_batch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
<directives>
<directive>-l nodes={{ num_nodes }}</directive>
<directive>-q iccp</directive>
<directive> -V </directive>
<directive> -V </directive>

</directives>
<queues>
Expand Down Expand Up @@ -677,6 +677,7 @@
<directive> --ntasks={{ total_tasks }}</directive>
<directive> --export=ALL</directive>
<directive> --switches=1</directive>
<directive> --exclude=b3355,b3356,b3357,b3359,b3379,b3382,b3383</directive>
</directives>
<directives queue = "normal">
<directive> --partition=normal</directive>
Expand Down
20 changes: 10 additions & 10 deletions machines/perlmutter/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
42 changes: 0 additions & 42 deletions maps_nuopc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,48 +95,6 @@
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_tnx1v4_e1000r300_170928.nc</map>
</gridmap>

<!-- ======================================================== -->
<!-- GRIDS: glc to ocn mapping -->
<!-- -->
<!-- Eventually we will also want glc to ice mapping files. -->
<!-- These will likely differ from the glc to ocn mapping -->
<!-- files in their degree of smoothing (or they may not be -->
<!-- smoothed at all). But for now we are only specifying -->
<!-- glc to ocn mapping files. (By default, glc to ice -->
<!-- mapping is turned off in the system.) -->
<!-- ======================================================== -->

<gridmap ocn_grid="gx1v7" glc_grid="gris4" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx1v7_nnsm_e1000r300_171105.nc</map>
</gridmap>
<!-- POP's estuary box model is currently not active for gx3v7, so we need nnsm maps for liquid as well as ice. -->
<gridmap ocn_grid="gx3v7" glc_grid="gris4" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
</gridmap>
<gridmap ocn_grid="gx1v7" glc_grid="gris20" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland20km/map_gland20km_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland20km/map_gland20km_to_gx1v7_nnsm_e1000r300_171105.nc</map>
</gridmap>
<!-- POP's estuary box model is currently not active for gx3v7, so we need nnsm maps for liquid as well as ice. -->
<gridmap ocn_grid="gx3v7" glc_grid="gris20" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland20km/map_gland20km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland20km/map_gland20km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
</gridmap>
<gridmap ocn_grid="gx1v7" glc_grid="ais8" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/ais8/map_ais8_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_TOBECREATED.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/ais8/map_ais8_to_gx1v7_nnsm_e1000r300_TOBECREATED.nc</map>
</gridmap>
<gridmap ocn_grid="tx0.66v1" glc_grid="gris4" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_tx0.66v1_nnsm_e1000r300_190314.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_tx0.66v1_nnsm_e1000r300_190314.nc</map>
</gridmap>
<gridmap ocn_grid="tx2_3v2" glc_grid="gris4" >
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_tx2_3_nnsm_e250r250_230914.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_tx2_3_nnsm_e1000r300_230415.nc</map>
</gridmap>

<!-- ======================================================== -->
<!-- MizuRoute mapping files -->
<!-- ======================================================== -->
Expand Down
8 changes: 8 additions & 0 deletions modelgrid_aliases_nuopc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,14 @@
<mask>gx1v7</mask>
</model_grid>

<!-- spectral element grids using trigrid -->
<model_grid alias="ne30pg3_f09_tn14" compset="_BLOM|_DOCN">
<grid name="atm">ne30np4.pg3</grid>
<grid name="lnd">0.9x1.25</grid>
<grid name="ocnice">tnx1v4</grid>
<mask>tnx1v4</mask>
</model_grid>

<!-- spectral element grids with 3x3 FVM physics grid -->

<model_grid alias="ne5pg3_ne5pg3_mg37" compset="_DOCN|_SOCN">
Expand Down

0 comments on commit fe4e966

Please sign in to comment.