Merge branch 'jgfouca/skybridge_working' (PR #7)

CIME tests now passing on skybridge [BFB] * jgfouca/skybridge_working: CIME tests now passing on skybridge
E3SM-Project · Jul 31, 2015 · b496e53 · b496e53
2 parents 4852e71 + a8f6ab6
commit b496e53
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/machines-acme/config_machines.xml b/machines-acme/config_machines.xml
@@ -763,7 +763,7 @@
          <DOUT_S_ROOT>$CESMSCRATCHROOT/archive/$CASE</DOUT_S_ROOT>               <!-- complete path to a short term archiving directory -->
          <DOUT_L_MSROOT>USERDEFINED_optional_run</DOUT_L_MSROOT>           <!-- complete path to a long term archiving directory -->
          <CCSM_BASELINE>/projects/ccsm/ccsm_baselines</CCSM_BASELINE>
-         <CCSM_CPRNC>$CCSMROOT/tools/cprnc/build/cprnc</CCSM_CPRNC>                <!-- path to the cprnc tool used to compare netcdf history files in testing -->
+         <CCSM_CPRNC>$CIMEROOT/tools/cprnc/build/cprnc</CCSM_CPRNC>                <!-- path to the cprnc tool used to compare netcdf history files in testing -->
          <BATCHQUERY>qstat</BATCHQUERY>
          <BATCHSUBMIT>sbatch</BATCHSUBMIT>
          <BATCHREDIRECT></BATCHREDIRECT>

diff --git a/machines-acme/env_mach_specific.skybridge b/machines-acme/env_mach_specific.skybridge
@@ -38,3 +38,7 @@ setenv NETCDF_INCLUDES $NETCDFROOT/include
 setenv NETCDF_LIBS $NETCDFROOT/lib
 
 setenv PNETCDFROOT $NETCDFROOT
+
+if ( $?PERL ) then
+   printenv
+endif