Skip to content

Commit

Permalink
changes for bringing in nemo
Browse files Browse the repository at this point in the history
  • Loading branch information
Mariana Vertenstein committed Dec 1, 2022
1 parent bfbfe3d commit ea2e006
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 6 deletions.
11 changes: 11 additions & 0 deletions component_grids_nuopc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
<mesh>$DIN_LOC_ROOT/share/meshes/0.125nldas2_ESMFmesh_cd5_241220.nc</mesh>
<desc>Regional NLDAS-2 grid over the U.S. (0.125 degree resolution; 25-53N, 235-293E)</desc>
</domain>
<domain name="0.47x0.63">
<nx>576</nx> <ny>384</ny>
<mesh>$DIN_LOC_ROOT/share/meshes/fv0.47x0.63_141008_FIX102722_polemod_ESMFMesh.nc</mesh>
<desc>0.47x0.63 is FV 1/2-deg grid:</desc>
</domain>
<domain name="0.9x1.25">
<nx>288</nx> <ny>192</ny>
<!-- This is needed for PTS_MODE - it specifies the xml variable PTS_DOMAINFILE -->
Expand Down Expand Up @@ -308,6 +313,12 @@
<mesh>$DIN_LOC_ROOT/share/meshes/gx1v7_151008_ESMFmesh.nc</mesh>
<desc>gx1v7 is displaced Greenland pole 1-deg grid with Caspian as a land feature:</desc>
</domain>
<domain name="tn0.25v3">
<nx>1440</nx> <ny>1050</ny>
<!-- <mesh>$DIN_LOC_ROOT/share/meshes/tn0.25v3_160721_ESMFmesh.nc</mesh> -->
<mesh>$DIN_LOC_ROOT/share/scripgrids/tn0.25v3_160721.nc</mesh>
<desc>tn0.25v3 is NEMO ORCA1 tripole grid at 1/4 deg (reduced eORCA):</desc>
</domain>
<domain name="gx3v7">
<nx>100</nx> <ny>116</ny>
<mesh>$DIN_LOC_ROOT/share/meshes/gx3v7_120309_ESMFmesh.nc</mesh>
Expand Down
3 changes: 2 additions & 1 deletion machines/config_batch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -765,9 +765,10 @@
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="-W" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-P" name="$PROJECT"/>
<arg flag="-x" />
</submit_args>
<directives>
<directive > -R "span[ptile={{ tasks_per_node }}]"</directive>
<directive > -R "span[ptile=30]"</directive>
</directives>
<queues>
<queue walltimemin="00:00" walltimemax="02:00" default="true">p_short</queue>
Expand Down
14 changes: 9 additions & 5 deletions machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3589,7 +3589,7 @@ This allows using a different mpirun command to launch unit tests

<machine MACH="zeus">
<DESC> CMCC Lenovo ThinkSystem SD530, os is Linux, 36 pes/node, batch system is LSF</DESC>
<NODENAME_REGEX>(login[1,2]-ib|n[0-9][0-9][0-9]-ib)</NODENAME_REGEX>
<NODENAME_REGEX>(login[1,2].cluster.net|n[0-9][0-9][0-9].cluster.net)</NODENAME_REGEX>
<OS>LINUX</OS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>impi,mpi-serial</MPILIBS>
Expand Down Expand Up @@ -3639,21 +3639,25 @@ This allows using a different mpirun command to launch unit tests
<command name="load">impi20.1/parallel-netcdf/1.12.1</command>
</modules>
<modules compiler="intel" mpilib="!mpi-serial" DEBUG="TRUE">
<command name="load">impi20.1/esmf/8.1.1-intelmpi-64-g</command>
<command name="load">impi20.1/esmf/8.2.0-intelmpi-64-g</command>
</modules>
<modules compiler="intel" mpilib="!mpi-serial" DEBUG="FALSE">
<command name="load">impi20.1/esmf/8.1.1-intelmpi-64-O</command>
<command name="load">impi20.1/esmf/8.2.0-intelmpi-64-O</command>
</modules>
<modules compiler="intel" mpilib="mpi-serial" DEBUG="TRUE">
<command name="load">intel20.1/esmf/8.1.1-mpiuni-64-g</command>
<command name="load">intel20.1/esmf/8.2.0-mpiuni-64-g</command>
</modules>
<modules compiler="intel" mpilib="mpi-serial" DEBUG="FALSE">
<command name="load">intel20.1/esmf/8.1.1-mpiuni-64-O</command>
<command name="load">intel20.1/esmf/8.2.0-mpiuni-64-O</command>
</modules>
</module_system>
<environment_variables>
<env name="XIOS_PATH">/data/inputs/CESM/xios-2.5</env>
</environment_variables>
<environment_variables comp_interface="nuopc">
<env name="ESMF_RUNTIME_PROFILE">ON</env>
<env name="ESMF_RUNTIME_PROFILE_OUTPUT">SUMMARY</env>
</environment_variables>
<environment_variables compiler="intel">
<env name="I_MPI_EXTRA_FILESYSTEM">1</env>
<env name="I_MPI_EXTRA_FILESYSTEM_FORCE">gpfs</env>
Expand Down
8 changes: 8 additions & 0 deletions maps_nuopc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_170413.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_gx1v7_nnsm_e1000r300_170413.nc</map>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="tn0.25v3" >
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_tn0.25v3_e1000r300_160721.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_tn0.25v3_e1000r300_160721.nc</map>
</gridmap>
<gridmap rof_grid="rx1" ocn_grid="tx1v1" >
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_tx1v1_e1000r300_161214.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/rx1/map_rx1_to_tx1v1_e1000r300_161214.nc</map>
Expand Down Expand Up @@ -46,6 +50,10 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_170413.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/r05/map_r05_to_gx1v7_nnsm_e1000r300_170413.nc</map>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="tn0.25v3" >
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_tn0.25v3_e1000r300_160721.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_tn0.25v3_e1000r300_160721.nc</map>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="tx1v1" >
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx1v1_e1000r500_161214.nc</map>
<map name="ROF2OCN_ICE_RMAPNAME">cpl/gridmaps/r05/map_r05_to_tx1v1_e1000r500_161214.nc</map>
Expand Down
21 changes: 21 additions & 0 deletions modelgrid_aliases_nuopc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,13 @@
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="f05_n0253">
<grid name="atm">0.47x0.63</grid>
<grid name="lnd">0.47x0.63</grid>
<grid name="ocnice">tn0.25v3</grid>
<mask>tn0.25v3</mask>
</model_grid>

<model_grid alias="f05_t12">
<grid name="atm">0.47x0.63</grid>
<grid name="lnd">0.47x0.63</grid>
Expand Down Expand Up @@ -831,6 +838,13 @@
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="ne30_n0253">
<grid name="atm">ne30np4</grid>
<grid name="lnd">ne30np4</grid>
<grid name="ocnice">tn0.25v3</grid>
<mask>tn0.25v3</mask>
</model_grid>

<model_grid alias="ne30pg3_g17">
<grid name="atm">ne30np4.pg3</grid>
<grid name="lnd">ne30np4.pg3</grid>
Expand Down Expand Up @@ -898,6 +912,13 @@
<mask>gx1v7</mask>
</model_grid>

<model_grid alias="ne60_n0253">
<grid name="atm">ne60np4</grid>
<grid name="lnd">ne60np4</grid>
<grid name="ocnice">tn0.25v3</grid>
<mask>tn0.25v3</mask>
</model_grid>

<model_grid alias="ne60_ne60_mg16" not_compset="_POP">
<grid name="atm">ne60np4</grid>
<grid name="lnd">ne60np4</grid>
Expand Down

0 comments on commit ea2e006

Please sign in to comment.