Skip to content

Commit

Permalink
Paths updated to be environment variables
Browse files Browse the repository at this point in the history
  • Loading branch information
eers1 committed Feb 11, 2022
1 parent aea21a6 commit 5ba36a1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion config/cesm/machines/config_batch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@
<batch_mail_type_flag>-m</batch_mail_type_flag>
<batch_mail_type>, bea, b, e, a, n, bes</batch_mail_type>
<submit_args>
<arg flag="-P" name="$PROJECT"/>
<arg flag="-q" name="$JOB_QUEUE"/>
<arg flag="-P" name="$PROJECT"/>
<arg flag="-l h_rt=" name="$JOB_WALLCLOCK_TIME"/>
</submit_args>
<directives>
Expand Down Expand Up @@ -206,6 +206,7 @@
<batch_system MACH="arc4" type="sge">
<queues>
<queue walltimemax="48:00:00" nodemin="1" nodemax="149" default="true" >40core-192G.q</queue>
<queue walltimemax="48:00:00" nodemax="1">planet.q</queue>
</queues>
</batch_system>

Expand Down
2 changes: 1 addition & 1 deletion config/cesm/machines/config_compilers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ using a fortran linker.
<LDFLAGS>
<append>-mkl </append>
</LDFLAGS>
<ESMF_LIBDIR>/nobackup/CESM/esmf_8.2.0/lib/libO/Linux.intel.64.intelmpi.default/</ESMF_LIBDIR>
<ESMF_LIBDIR>$ENV{ESMF_LIBDIR}</ESMF_LIBDIR>
</compiler>

<compiler MACH="athena">
Expand Down
6 changes: 3 additions & 3 deletions config/cesm/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ This allows using a different mpirun command to launch unit tests
<COMPILERS>intel</COMPILERS>
<MPILIBS>intelmpi,openmpi,mpich</MPILIBS>
<CIME_OUTPUT_ROOT>/nobackup/$ENV{USER}/cesm_sims</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/nobackup/CESM/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/nobackup/CESM/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DIN_LOC_ROOT>$ENV{ARC4_CESM2_ROOT}/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>$ENV{ARC4_CESM2_ROOT}/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>${CIME_OUTPUT_ROOT}/archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>${CIME_OUTPUT_ROOT}/cesm_baselines</BASELINE_ROOT>
<CCSM_CPRNC>$ENV{CESM_HOME}/cime/tools/cprnc/cprnc</CCSM_CPRNC>
<CCSM_CPRNC>${CIMEROOT}/tools/cprnc</CCSM_CPRNC>
<GMAKE>make</GMAKE>
<GMAKE_J>16</GMAKE_J>
<BATCH_SYSTEM>sge</BATCH_SYSTEM>
Expand Down

0 comments on commit 5ba36a1

Please sign in to comment.