Skip to content

Commit

Permalink
Merge pull request #1956 from ekluzek/addlblmachs
Browse files Browse the repository at this point in the history 
Add LBL Machines...
  • Loading branch information
@ekluzek
ekluzek authored Oct 17, 2017
2 parents a915609 + a24dfc0 commit 48c6fa8
Show file tree
Hide file tree
Showing 3 changed files with 154 additions and 0 deletions.
24 changes: 24 additions & 0 deletions config/cesm/machines/config_batch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,30 @@
</queues>
</batch_system>

<batch_system MACH="lbl-lr3" type="slurm">
<batch_submit>sbatch</batch_submit>
<directives>
<directive>--qos=lr_normal</directive>
<directive>--partition=lr3</directive>
<directive>--account={{ project }}</directive>
</directives>
<queues>
<queue walltimemin="00:00:00" walltimemax="72:00:00" nodemin="1" nodemax="64" default="true">lr3</queue>
</queues>
</batch_system>

<batch_system MACH="lbl-lr2" type="slurm">
<batch_submit>sbatch</batch_submit>
<directives>
<directive>--qos=lr_normal</directive>
<directive>--partition=lr2</directive>
<directive>--account={{ project }}</directive>
</directives>
<queues>
<queue walltimemin="00:00:00" walltimemax="72:00:00" nodemin="1" nodemax="64" default="true">lr2</queue>
</queues>
</batch_system>

<batch_jobs>
<!-- order matters, with no-batch jobs will be run in the order listed here -->
<job name="case.run">
Expand Down
32 changes: 32 additions & 0 deletions config/cesm/machines/config_compilers.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1078,4 +1078,36 @@ using a fortran linker.
<SFC MPILIB="mpi-serial">pgfortran</SFC>
</compiler>

<compiler COMPILER="intel" MACH="lbl-lr3">
<CPPDEFS>
<append MODEL="gptl"> -DHAVE_VPRINTF -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </append>
</CPPDEFS>
<SLIBS>
<append> -lnetcdff -lnetcdf -mkl </append>
</SLIBS>
<FFLAGS>
<append DEBUG="TRUE"> -ftrapuv </append>
</FFLAGS>
<CFLAGS>
<append DEBUG="TRUE"> -ftrapuv </append>
</CFLAGS>
<NETCDF_PATH>$ENV{NETCDF_DIR}</NETCDF_PATH>
</compiler>

<compiler COMPILER="intel" MACH="lbl-lr2">
<CPPDEFS>
<append MODEL="gptl"> -DHAVE_VPRINTF -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </append>
</CPPDEFS>
<SLIBS>
<append> -lnetcdff -lnetcdf -mkl </append>
</SLIBS>
<FFLAGS>
<append DEBUG="TRUE"> -ftrapuv </append>
</FFLAGS>
<CFLAGS>
<append DEBUG="TRUE"> -ftrapuv </append>
</CFLAGS>
<NETCDF_PATH>$ENV{NETCDF_DIR}</NETCDF_PATH>
</compiler>

</config_compilers>
98 changes: 98 additions & 0 deletions config/cesm/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1638,6 +1638,104 @@
</environment_variables>
</machine>

<machine MACH="lbl-lr3">
<DESC>Lawrencium LR3 cluster at LBL, OS is Linux (intel), batch system is SLURM</DESC>
<NODENAME_REGEX>n0*.lr3.lbl.gov</NODENAME_REGEX>
<OS>LINUX</OS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>openmpi</MPILIBS>
<CIME_OUTPUT_ROOT>/global/scratch/$ENV{USER}</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/global/scratch/$ENV{USER}/cesm_input_datasets/</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/global/scratch/$ENV{USER}/cesm_input_datasets/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/cesm_archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>$CIME_OUTPUT_ROOT/cesm_baselines</BASELINE_ROOT>
<CCSM_CPRNC>/$CIME_OUTPUT_ROOT/cesm_tools/cprnc/cprnc</CCSM_CPRNC>
<GMAKE_J>4</GMAKE_J>
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
<SUPPORTED_BY>rgknox and gbisht at lbl dot gov</SUPPORTED_BY>
<MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE>16</MAX_MPITASKS_PER_NODE>
<PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
<mpirun mpilib="default">
<executable>mpirun</executable>
</mpirun>
<module_system type="module">
<init_path lang="sh">/etc/profile.d/modules.sh</init_path>
<init_path lang="csh">/etc/profile.d/modules.csh</init_path>
<init_path lang="perl">/usr/Modules/init/perl.pm</init_path>
<init_path lang="python">/usr/Modules/python.py</init_path>
<cmd_path lang="sh">module</cmd_path>
<cmd_path lang="csh">module</cmd_path>
<cmd_path lang="perl">/usr/Modules/bin/modulecmd perl</cmd_path>
<cmd_path lang="python">/usr/Modules/bin/modulecmd python</cmd_path>
<modules>
<command name="purge"/>
<command name="load">cmake</command>
<command name="load">perl xml-libxml switch python/2.7.11</command>
</modules>
<modules compiler="intel">
<command name="load">intel/2015.6.233</command>
<command name="load">mkl</command>
</modules>
<modules compiler="intel" mpilib="mpi-serial">
<command name="load">netcdf/4.4.0-intel-s</command>
</modules>
<modules compiler="intel" mpilib="!mpi-serial">
<command name="load">openmpi</command>
<command name="load">netcdf/4.4.0-intel-p</command>
</modules>
</module_system>
</machine>

<machine MACH="lbl-lr2">
<DESC>Lawrencium LR2 cluster at LBL, OS is Linux (intel), batch system is SLURM</DESC>
<NODENAME_REGEX>n0*.lr2.lbl.gov</NODENAME_REGEX>
<OS>LINUX</OS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>openmpi</MPILIBS>
<CIME_OUTPUT_ROOT>/global/scratch/$ENV{USER}</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/global/scratch/$ENV{USER}/cesm_input_datasets/</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/global/scratch/$ENV{USER}/cesm_input_datasets/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/cesm_archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>$CIME_OUTPUT_ROOT/cesm_baselines</BASELINE_ROOT>
<CCSM_CPRNC>/$CIME_OUTPUT_ROOT/cesm_tools/cprnc/cprnc</CCSM_CPRNC>
<GMAKE_J>4</GMAKE_J>
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
<SUPPORTED_BY>rgknox and gbisht at lbl dot gov</SUPPORTED_BY>
<MAX_TASKS_PER_NODE>12</MAX_TASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE>12</MAX_MPITASKS_PER_NODE>
<PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
<mpirun mpilib="default">
<executable>mpirun</executable>
</mpirun>
<module_system type="module">
<init_path lang="sh">/etc/profile.d/modules.sh</init_path>
<init_path lang="csh">/etc/profile.d/modules.csh</init_path>
<init_path lang="perl">/usr/Modules/init/perl.pm</init_path>
<init_path lang="python">/usr/Modules/python.py</init_path>
<cmd_path lang="sh">module</cmd_path>
<cmd_path lang="csh">module</cmd_path>
<cmd_path lang="perl">/usr/Modules/bin/modulecmd perl</cmd_path>
<cmd_path lang="python">/usr/Modules/bin/modulecmd python</cmd_path>
<modules>
<command name="purge"/>
<command name="load">cmake</command>
<command name="load">perl xml-libxml switch python/2.7.11</command>
</modules>
<modules compiler="intel">
<command name="load">intel/2015.6.233</command>
<command name="load">mkl</command>
</modules>
<modules compiler="intel" mpilib="mpi-serial">
<command name="load">netcdf/4.4.0-intel-s</command>
</modules>
<modules compiler="intel" mpilib="!mpi-serial">
<command name="load">openmpi</command>
<command name="load">netcdf/4.4.0-intel-p</command>
</modules>
</module_system>
</machine>

<machine MACH="theta">
<DESC>ALCF Cray XC* KNL, os is CNL, 64 pes/node, batch system is cobalt</DESC>
<NODENAME_REGEX>theta.*</NODENAME_REGEX>
Expand Down

0 comments on commit 48c6fa8

Please sign in to comment.