Skip to content

Commit

Permalink
Merge pull request #1 from ihesp/ihesp-hires_grace
Browse files Browse the repository at this point in the history 
port to grace
  • Loading branch information
@jedwards4b
jedwards4b authored Apr 14, 2021
2 parents 03197eb + d4bc287 commit ad3f384
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 16 deletions.
4 changes: 3 additions & 1 deletion config/cesm/machines/config_batch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,8 @@
</submit_args>
<queues>
<queue walltimemax="02:00:00" nodemin="1" nodemax="40">development</queue>
<queue walltimemax="24:00:00" nodemin="1" nodemax="512" default="true">normal</queue>
<queue walltimemax="24:00:00" nodemin="1" nodemax="2" default="true">small</queue>
<queue walltimemax="24:00:00" nodemin="3" nodemax="512" default="true">normal</queue>
<queue walltimemax="24:00:00" nodemin="513" nodemax="2048" >large</queue>
</queues>
</batch_system>
Expand Down Expand Up @@ -564,6 +565,7 @@
<submit_args>
<arg flag="--time" name="$JOB_WALLCLOCK_TIME"/>
<arg flag="-p" name="$JOB_QUEUE"/>
<arg flag="--account" name="$JOB_QUEUE"/>
</submit_args>
<directives>
<directive>--mem=360GB </directive>
Expand Down
12 changes: 6 additions & 6 deletions config/cesm/machines/config_compilers.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1204,14 +1204,14 @@ using a fortran linker.
<SFC>ifort</SFC>
<SCC>icc</SCC>
<SCXX>icpc</SCXX>
<NETCDF_PATH>/scratch/group/ihesp/software/share/netcdf-c-4.7.4/install2019b_2</NETCDF_PATH>
<!-- <NETCDF_PATH>/scratch/group/ihesp/software/share/netcdf-c-4.7.4/install2019b_2</NETCDF_PATH>
<NETCDF_C_PATH>/scratch/group/ihesp/software/share/netcdf-c-4.7.4/install2019b_2</NETCDF_C_PATH>
<PNETCDF_PATH>/scratch/group/ihesp/software/share/pnetcdf-1.12.1/install2019b_2</PNETCDF_PATH>
<NETCDF_FORTRAN_PATH>/scratch/group/ihesp/software/share/netcdf-fortran-4.5.3/install2019b_2</NETCDF_FORTRAN_PATH>
<!-- <NETCDF_PATH>/sw/eb/sw/netCDF/4.6.1-intel-2018b</NETCDF_PATH>
<NETCDF_C_PATH>/sw/eb/sw/netCDF/4.6.1-intel-2018b</NETCDF_C_PATH>
<NETCDF_FORTRAN_PATH>/sw/eb/sw/netCDF-Fortran/4.5.2-intel-2018b</NETCDF_FORTRAN_PATH>
<PNETCDF_PATH>/sw/eb/sw/PnetCDF/1.12.1-intel-2018b</PNETCDF_PATH> -->
<NETCDF_FORTRAN_PATH>/scratch/group/ihesp/software/share/netcdf-fortran-4.5.3/install2019b_2</NETCDF_FORTRAN_PATH> -->
<NETCDF_PATH>/scratch/group/ihesp/software/easybuild/eb/x86_64/sw/netCDF/4.7.4-iimpi-2020b</NETCDF_PATH>
<NETCDF_C_PATH>/scratch/group/ihesp/software/easybuild/eb/x86_64/sw/netCDF/4.7.4-iimpi-2020b</NETCDF_C_PATH>
<NETCDF_FORTRAN_PATH>/scratch/group/ihesp/software/easybuild/eb/x86_64/sw/netCDF-Fortran/4.5.3-iimpi-2020b</NETCDF_FORTRAN_PATH>
<PNETCDF_PATH>/scratch/group/ihesp/software/easybuild/eb/x86_64/sw/PnetCDF/1.12.1-iimpi-2020b</PNETCDF_PATH>
<SLIBS>
<append>-L$(NETCDF_C_PATH)/lib -Wl,-rpath,$(NETCDF_PATH)/lib -lnetcdf</append>
<append>-L$(NETCDF_FORTRAN_PATH)/lib -Wl,-rpath,$(NETCDF_FORTRAN_PATH)/lib -lnetcdff</append>
Expand Down
32 changes: 23 additions & 9 deletions config/cesm/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@ This allows using a different mpirun command to launch unit tests
<CIME_OUTPUT_ROOT>$ENV{SCRATCH}</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/scratch/group/ihesp/software/cesm/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/scratch/group/ihesp/software/cesm/inputdata/lmwg</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>$WORK/archive/$CASE</DOUT_S_ROOT>
<DOUT_S_ROOT>$ENV{SCRATCH}/archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>/scratch/group/ihesp/software/cesm/cesm_baselines</BASELINE_ROOT>
<CCSM_CPRNC>/scratch/group/ihesp/software/cesm/cime/tools/cprnc/cprnc</CCSM_CPRNC>
<GMAKE_J>4</GMAKE_J>
Expand All @@ -1324,9 +1324,9 @@ This allows using a different mpirun command to launch unit tests
<MAX_TASKS_PER_NODE>96</MAX_TASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE>48</MAX_MPITASKS_PER_NODE>
<mpirun mpilib="impi">
<executable>srun</executable>
<executable>mpirun</executable>
<arguments>
<arg name="num_tasks"> -n $TOTALPES</arg>
<arg name="num_tasks"> -np $TOTALPES</arg>
</arguments>
</mpirun>
<module_system type="module">
Expand All @@ -1340,25 +1340,39 @@ This allows using a different mpirun command to launch unit tests
<cmd_path lang="csh">module</cmd_path>
<modules>
<command name="purge"></command>
<command name="load">intel/2019b</command>
<command name="unuse">/sw/eb/mods/all/MPI/intel/2019.5.281/impi/2018.5.288:/sw/eb/mods/all/Compiler/intel/2019.5.281:/sw/eb/mods/all/Compiler/GCCcore/8.3.0:/sw/hprc/mods/all/Core:/sw/eb/mods/all/Core:/sw/lmod/hprc/mods/Linux:/sw/lmod/8.4.3/modulefiles/Core</command>
<command name="use">/scratch/group/ihesp/software/easybuild/eb/x86_64/mods/all/Core</command>
<command name="load">intel/2020b</command>
<command name="load">CMake/3.18.4</command>
<command name="load">cURL/7.72.0</command>
<command name="load">Python/2.7.18</command>
<command name="load">XML-LibXML/2.0206</command>
<command name="load">PnetCDF/1.12.1</command>
<command name="load">netCDF/4.7.4</command>
<command name="load">netCDF-Fortran/4.5.3</command>
<!-- <command name="load">intel/2019b</command>
<command name="load">CMake/3.15.3</command>
<command name="load">cURL/7.66.0</command>
<command name="load">Python/2.7.16</command>
<command name="load">XML-LibXML/2.0201</command>
<command name="load">PnetCDF/1.12.1</command>
<command name="load">netCDF/4.7.4</command>
<command name="load">netCDF-Fortran/4.5.3</command> -->
</modules>
<modules mpilib="impi">
<!-- <modules mpilib="impi">
<command name="load">impi/2018.5.288</command>
<command name="load">HDF5/1.10.5</command>
<command name="load">HDF5/1.10.5</command> -->
<!-- <command name="load">PnetCDF/1.12.1</command> -->
<!-- <command name="load">netCDF/4.6.1</command> -->
<!-- <command name="load">netCDF-Fortran/4.5.2</command>
<command name="load">netCDF-C++4/4.3.1</command> -->
</modules>
<!-- </modules>-->
</module_system>
<environment_variables>
<env name="OMP_STACKSIZE">256M</env>
<env name="I_MPI_PMI_LIBRARY">/usr/lib64/libpmi.so</env>
<env name="I_MPI_DEBUG">4</env>
<!-- <env name="I_MPI_PMI_LIBRARY">/usr/lib64/libpmi.so</env> -->
<env name="I_MPI_FABRICS">shm:ofi</env>
<!--<env name="I_MPI_DEBUG">4</env>-->
</environment_variables>
</machine>

Expand Down

0 comments on commit ad3f384

Please sign in to comment.