Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add machine files for Constance PNNL cluster #1296

Merged
merged 2 commits into from
Mar 30, 2017
Merged

Add machine files for Constance PNNL cluster #1296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63004c5
Adds machine files for Constance PNNL cluster
singhbalwinder Mar 2, 2017
501d88e
Resolves conflicts in config_machine.xml
singhbalwinder Mar 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cime/cime_config/acme/machines/config_batch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,6 @@

<batch_system MACH="constance" type="slurm">
<directives>
<directive>-A climate</directive>
<directive>--ntasks-per-node={{ tasks_per_node }}</directive>
<directive>--mail-type=END</directive>
<directive>--mail-user=email@pnnl.gov</directive>
<directive>--output=slurm.out</directive>
Expand Down
1 change: 1 addition & 0 deletions cime/cime_config/acme/machines/config_compilers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,7 @@ for mct, etc.
<compiler COMPILER="pgi" MACH="constance">
<ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
<ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
<ADD_FFLAGS DEBUG="TRUE"> -g -traceback -O0 -fpe0 -check all -check noarg_temp_created -ftrapuv </ADD_FFLAGS>
<NETCDF_PATH> $(NETCDF_HOME)</NETCDF_PATH>
<PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
<CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
Expand Down
96 changes: 82 additions & 14 deletions cime/cime_config/acme/machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,35 +1239,103 @@
<DESC>PNL Haswell cluster, OS is Linux, batch system is SLURM</DESC>
<OS>LINUX</OS>
<COMPILERS>intel,pgi</COMPILERS>
<MPILIBS>mpich,mpi-serial</MPILIBS>
<MPILIBS>mvapich2,openmpi,intelmpi,mvapich</MPILIBS>
<NODENAME_REGEX>constance</NODENAME_REGEX>
<RUNDIR>/pic/scratch/$CCSMUSER/csmruns/$CASE/run</RUNDIR>
<EXEROOT>/pic/scratch/$CCSMUSER/csmruns/$CASE/bld</EXEROOT>
<RUNDIR>/pic/scratch/$USER/csmruns/$CASE/run</RUNDIR>
<EXEROOT>/pic/scratch/$USER/csmruns/$CASE/bld</EXEROOT>
<CIME_OUTPUT_ROOT>/pic/scratch/$USER</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/pic/projects/climate/csmdata/</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/pic/projects/climate/csmdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/pic/scratch/$CCSMUSER/archive/$CASE</DOUT_S_ROOT>
<DOUT_S_ROOT>/pic/scratch/$USER/archive/$CASE</DOUT_S_ROOT>
<DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
<BASELINE_ROOT>/pic/projects/climate/acme_baselines</BASELINE_ROOT>
<CCSM_CPRNC>/pic/projects/climate/acme_baselines/cprnc</CCSM_CPRNC>
<CCSM_CPRNC>/pic/projects/climate/acme_baselines/cprnc/cprnc</CCSM_CPRNC>
<SAVE_TIMING_DIR>/pic/projects/climate/csmdata/</SAVE_TIMING_DIR>
<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
<SUPPORTED_BY>balwinder.singh -at- pnnl.gov</SUPPORTED_BY>
<GMAKE_J>8</GMAKE_J>
<MAX_TASKS_PER_NODE>24</MAX_TASKS_PER_NODE>
<mpirun mpilib="mpich">
<PES_PER_NODE>24</PES_PER_NODE>
<PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
<mpirun mpilib="mpi-serial">
<executable></executable>
</mpirun>
<mpirun mpilib="mvapich2">
<executable>srun</executable>
<arguments>
<arg name="mpinone"> --mpi=none</arg>
<arg name="num_tasks"> --ntasks=$TOTALPES</arg>
<arg name="cpubind"> --cpu_bind=sockets</arg>
<arg name="cpubind"> --cpu_bind=verbose</arg>
<arg name="killonbadexit"> --kill-on-bad-exit</arg>
<arg name="mpi">--mpi=none</arg>
<arg name="num_tasks">--ntasks=$TOTALPES</arg>
<arg name="cpu_bind">--cpu_bind=sockets --cpu_bind=verbose</arg>
<arg name="kill-on-bad-exit">--kill-on-bad-exit</arg>
</arguments>
</mpirun>
<mpirun mpilib="mpi-serial">
<executable></executable>
<mpirun mpilib="mvapich">
<executable>srun</executable>
<arguments>
<arg name="num_tasks">--ntasks=$TOTALPES</arg>
<arg name="cpu_bind">--cpu_bind=sockets --cpu_bind=verbose</arg>
<arg name="kill-on-bad-exit">--kill-on-bad-exit</arg>
</arguments>
</mpirun>

<mpirun mpilib="intelmpi">
<executable>mpirun</executable>
<arguments>
<arg name="num_tasks">-n $TOTALPES</arg>
</arguments>
</mpirun>
<mpirun mpilib="openmpi">
<executable>mpirun</executable>
<arguments>
<arg name="num_tasks">-n $TOTALPES</arg>
</arguments>
</mpirun>
<module_system type="module">
<init_path lang="perl">/share/apps/modules/Modules/3.2.10/init/perl.pm</init_path>
<init_path lang="python">/share/apps/modules/Modules/3.2.10/init/python.py</init_path>
<init_path lang="csh">/etc/profile.d/modules.csh</init_path>
<init_path lang="sh">/etc/profile.d/modules.sh</init_path>
<cmd_path lang="perl">/share/apps/modules/Modules/3.2.10/bin/modulecmd perl </cmd_path>
<cmd_path lang="python">/share/apps/modules/Modules/3.2.10/bin/modulecmd python</cmd_path>
<cmd_path lang="sh">module</cmd_path>
<cmd_path lang="csh">module</cmd_path>
<modules>
<command name="purge"></command>
</modules>
<modules>
<command name="load">perl/5.20.0</command>
<command name="load">cmake/3.3.0</command>
<command name="load">python/2.7.8</command>
</modules>
<modules compiler="intel">
<command name="load">intel/15.0.1</command>
<command name="load">mkl/15.0.1</command>
</modules>
<modules compiler="pgi">
<command name="load">pgi/14.10</command>
</modules>
<modules mpilib="mvapich">
<command name="load">mvapich2/2.1</command>
</modules>
<modules mpilib="mvapich2">
<command name="load">mvapich2/2.1</command>
</modules>
<modules mpilib="intelmpi">
<command name="load">intelmpi/5.0.1.035</command>
</modules>
<modules mpilib="openmpi">
<command name="load">openmpi/1.8.3</command>
</modules>
<modules>
<command name="load">netcdf/4.3.2</command>
</modules>
</module_system>
<environment_variables>
<env name="OMP_STACKSIZE">64M</env>
<env name="NETCDF_HOME">$ENV{NETCDF_LIB}/../</env>
</environment_variables>
<environment_variables compiler="intel">
<env name="MKL_PATH">$ENV{MLIB_LIB}</env>
</environment_variables>
</machine>

<machine MACH="oic2">
Expand Down