From 1f8285a04e37ab85bb37689e3f6b809171e8992e Mon Sep 17 00:00:00 2001
From: apcraig <anthony.p.craig@gmail.com>
Date: Thu, 11 Jun 2020 12:56:18 -0600
Subject: [PATCH 1/6] add MACHINFO and ENVINFO to env files, update
 implementation to be more self consistent using mach and env instead of env
 and compiler

---
 cice.setup                                    | 42 ++++++++++---------
 configuration/scripts/cice.build              |  8 ++--
 configuration/scripts/cice.settings           |  2 +-
 .../scripts/machines/env.badger_intel         |  4 +-
 .../scripts/machines/env.banting_gnu          |  4 +-
 .../scripts/machines/env.banting_intel        |  4 +-
 .../scripts/machines/env.cesium_intel         |  4 +-
 .../scripts/machines/env.cheyenne_gnu         |  6 ++-
 .../scripts/machines/env.cheyenne_intel       |  6 ++-
 .../scripts/machines/env.cheyenne_pgi         |  6 ++-
 .../scripts/machines/env.conda_linux          |  6 ++-
 .../scripts/machines/env.conda_macos          |  6 ++-
 .../scripts/machines/env.conrad_cray          |  6 ++-
 configuration/scripts/machines/env.conrad_gnu |  6 ++-
 .../scripts/machines/env.conrad_intel         |  6 ++-
 configuration/scripts/machines/env.conrad_pgi |  6 ++-
 configuration/scripts/machines/env.cori_intel |  6 ++-
 configuration/scripts/machines/env.daley_gnu  |  4 +-
 .../scripts/machines/env.daley_intel          |  4 +-
 configuration/scripts/machines/env.fram_intel |  4 +-
 .../scripts/machines/env.gaffney_gnu          |  6 ++-
 .../scripts/machines/env.gaffney_intel        |  6 ++-
 .../scripts/machines/env.gordon_cray          |  6 ++-
 configuration/scripts/machines/env.gordon_gnu |  6 ++-
 .../scripts/machines/env.gordon_intel         | 10 +++--
 configuration/scripts/machines/env.gordon_pgi |  6 ++-
 configuration/scripts/machines/env.hera_intel |  6 ++-
 .../scripts/machines/env.high_Sierra_gnu      |  4 +-
 .../scripts/machines/env.hobart_intel         |  4 +-
 configuration/scripts/machines/env.hobart_nag |  4 +-
 configuration/scripts/machines/env.izumi_gnu  |  6 ++-
 .../scripts/machines/env.izumi_intel          |  6 ++-
 configuration/scripts/machines/env.izumi_nag  |  6 ++-
 configuration/scripts/machines/env.izumi_pgi  |  6 ++-
 .../scripts/machines/env.koehr_intel          |  6 ++-
 configuration/scripts/machines/env.loft_gnu   |  4 +-
 .../scripts/machines/env.millikan_intel       |  4 +-
 .../scripts/machines/env.mustang_intel18      |  6 ++-
 .../scripts/machines/env.mustang_intel19      |  6 ++-
 .../scripts/machines/env.mustang_intel20      |  6 ++-
 configuration/scripts/machines/env.onyx_cray  |  6 ++-
 configuration/scripts/machines/env.onyx_gnu   |  6 ++-
 configuration/scripts/machines/env.onyx_intel |  6 ++-
 .../scripts/machines/env.orion_intel          |  6 ++-
 .../scripts/machines/env.phase3_intel         |  4 +-
 .../scripts/machines/env.testmachine_intel    |  6 ++-
 .../scripts/machines/env.thunder_intel        |  4 +-
 .../scripts/machines/env.travisCI_gnu         |  6 ++-
 configuration/scripts/tests/baseline.script   | 15 +++++++
 .../scripts/tests/report_results.csh          | 29 +++++++------
 doc/source/user_guide/ug_case_settings.rst    |  2 +-
 doc/source/user_guide/ug_running.rst          |  8 ++--
 52 files changed, 220 insertions(+), 132 deletions(-)

diff --git a/cice.setup b/cice.setup
index a964478f2..78199e380 100755
--- a/cice.setup
+++ b/cice.setup
@@ -13,7 +13,7 @@ set dash = "-"
 set spval = "UnDeFiNeD"
 set machcomp = ${spval}
 set machine = ${spval}
-set compilers = intel
+set envnames = intel
 set case = ${spval}
 set test = ${spval}
 set grid = gx3
@@ -93,7 +93,7 @@ DESCRIPTION
     --setvers  : updates cice version number in sandbox
     --case, -c : case, case directory/name (not with --test or --suite)
     --mach, -m : machine, machine name (required)
-    --env,  -e : compiler(s), comma separated (default = $compilers)
+    --env,  -e : envname(s), comma separated (default = $envnames)
     --pes,  -p : tasks x threads [x blocksize_x x blocksize_y [x maxblocks]] (default is ${pesx})
     --acct     : account number for the batch submission
     --grid, -g : grid, grid (default = ${grid})
@@ -281,7 +281,7 @@ while (1)
     else if ("$option" =~ --mach* || "$option" == "-m") then
       set machine = $argv[1]
     else if ("$option" =~ --env* || "$option" == "-e") then
-      set compilers = $argv[1]
+      set envnames = $argv[1]
     else if ("$option" == "--test") then
       set test = $argv[1]
       set dotest = 1
@@ -341,7 +341,7 @@ if ($codecov == 1 && $report == 1) then
   exit -1
 endif
 
-if ($codecov == 1 && "$compilers" != "gnu") then
+if ($codecov == 1 && "$envnames" != "gnu") then
   echo "${0}: ERROR in arguments, must use --env gnu with --codecov"
   exit -1
 endif
@@ -360,12 +360,12 @@ if (${dosuite} == 0) then
     echo "${0}: ERROR in arguments, must use --suite with --codecov"
     exit -1
   endif
-  if ("$compilers" =~ "*,*") then
-    echo "${0}: ERROR in arguments, cannot set multiple compilers without --suite"
+  if ("$envnames" =~ "*,*") then
+    echo "${0}: ERROR in arguments, cannot set multiple envnames without --suite"
     exit -1
   else
-    set compiler = ${compilers}
-    set machcomp = ${machine}_${compiler}
+    set envname = ${envnames}
+    set machcomp = ${machine}_${envname}
   endif
 endif
 
@@ -529,12 +529,12 @@ endif
 #-------------------------------------------------------------------
 # Loop over cases/tests
 
-set ncompilers = "`echo $compilers | sed -e 's/,/ /g'`"
+set nenvnames = "`echo $envnames | sed -e 's/,/ /g'`"
 
-# check that machines and compilers are valid before starting big loop
+# check that machines and envnames are valid before starting big loop
 set doabort = false
-foreach compiler ( $ncompilers )
-  set machcomp = ${machine}_${compiler}
+foreach envname ( $nenvnames )
+  set machcomp = ${machine}_${envname}
   foreach file (env.${machcomp} Macros.${machcomp})
     if !(-e ${ICE_SCRIPTS}/machines/$file) then
       echo "${0}: ERROR, ${ICE_SCRIPTS}/machines/$file not found"
@@ -549,8 +549,8 @@ endif
 # Create a new sets_base variable to store sets passed to cice.setup
 set sets_base = "${sets}"
 set bfbcomp_base = "$bfbcomp"
-foreach compiler ( $ncompilers )
-  set machcomp = ${machine}_${compiler}
+foreach envname ( $nenvnames )
+  set machcomp = ${machine}_${envname}
   foreach line ( "`cat $tsfile`" )
 
     # Check if line is a comment line
@@ -573,12 +573,14 @@ EOF
     endif
 
     # unset env variables that might not exist in env machine file
-    # to avoid any carry over during multi compiler suites
+    # to avoid any carry over during multi envname suites
     unsetenv ICE_MACHINE_MAXTHREADS
     unsetenv ICE_MACHINE_MAXPES
     unsetenv ICE_MACHINE_QUIETMODE
     unsetenv ICE_MACHINE_CPPDEFS
     unsetenv ICE_MACHINE_QSTAT
+    unsetenv ICE_MACHINE_MACHINFO
+    unsetenv ICE_MACHINE_ENVINFO
     source ${ICE_SCRIPTS}/machines/env.${machcomp} -nomodules || exit 2
 
     # Obtain the test name, sets, grid, and PE information from .ts file
@@ -832,7 +834,7 @@ EOF
     echo "ICE_CASENAME = ${casename}"
     echo "ICE_CASEDIR  = ${casedir}"
     echo "ICE_MACHINE  = ${machine}"
-    echo "ICE_COMPILER = ${compiler}"
+    echo "ICE_ENVNAME  = ${envname}"
     echo "ICE_RUNDIR   = ${rundir}"
     echo "ICE_PES      = ${task}x${thrd}"
     echo "ICE_GRID     = ${grid} (${ICE_DECOMP_NXGLOB}x${ICE_DECOMP_NYGLOB}) blocksize=${ICE_DECOMP_BLCKX}x${ICE_DECOMP_BLCKY}x${ICE_DECOMP_MXBLCKS}"
@@ -886,7 +888,7 @@ setenv ICE_SCRIPTS  ${ICE_SCRIPTS}
 setenv ICE_CASENAME ${casename}
 setenv ICE_CASEDIR  ${casedir}
 setenv ICE_MACHINE  ${machine}
-setenv ICE_COMPILER ${compiler}
+setenv ICE_ENVNAME  ${envname}
 setenv ICE_MACHCOMP ${machcomp}
 setenv ICE_RUNDIR   ${rundir}
 setenv ICE_GRID     ${grid}
@@ -1044,7 +1046,7 @@ cd ${testname_base}
 source ./cice.settings
 if (\${dobuild} == true) then
    if (\${doreuse} == true) then
-     set ciceexe = "../ciceexe.\${ICE_COMPILER}.\${ICE_COMMDIR}.\${ICE_BLDDEBUG}.\${ICE_THREADED}.\${ICE_IOTYPE}"
+     set ciceexe = "../ciceexe.\${ICE_ENVNAME}.\${ICE_COMMDIR}.\${ICE_BLDDEBUG}.\${ICE_THREADED}.\${ICE_IOTYPE}"
      ./cice.build --exe \${ciceexe}
      if !(-e \${ciceexe}) cp -p \${ICE_RUNDIR}/cice \${ciceexe}
    else
@@ -1069,7 +1071,7 @@ EOF
 
    # This is the foreach end for the testsuite
   end
-# This is the foreach end for the compilers
+# This is the foreach end for the envnames
 end
 
 #-----------------------------------------------------
@@ -1086,7 +1088,7 @@ EOF0
 
   # Add code to results.csh to count the number of failures
   cat >> ${tsdir}/results.csh << EOF
-cat ./results.log
+cat ./results.log | grep -iv "#machinfo" | grep -iv "#envinfo"
 set pends     = \`cat ./results.log | grep PEND | wc -l\`
 set misses    = \`cat ./results.log | grep MISS | wc -l\`
 set failures  = \`cat ./results.log | grep FAIL | wc -l\`
diff --git a/configuration/scripts/cice.build b/configuration/scripts/cice.build
index 1729c52e6..d319c274d 100755
--- a/configuration/scripts/cice.build
+++ b/configuration/scripts/cice.build
@@ -96,12 +96,12 @@ endif
 source ./cice.settings
 source ${ICE_CASEDIR}/env.${ICE_MACHCOMP} || exit 2
 
-if (${ICE_MACHINE} != ${ICE_MACHINE_ENVNAME}) then
-  echo "WARNING, is ICE_MACHINE setting OK, ${ICE_MACHINE}, ${ICE_MACHINE_ENVNAME}"
+if (${ICE_MACHINE} != ${ICE_MACHINE_MACHNAME}) then
+  echo "WARNING, is ICE_MACHINE setting OK, ${ICE_MACHINE}, ${ICE_MACHINE_MACHNAME}"
 endif
 
-if (${ICE_COMPILER} != ${ICE_MACHINE_COMPILER}) then
-  echo "WARNING, is ICE_COMPILER setting OK, ${ICE_COMPILER}, ${ICE_MACHINE_COMPILER}"
+if (${ICE_ENVNAME} != ${ICE_MACHINE_ENVNAME}) then
+  echo "WARNING, is ICE_ENVNAME setting OK, ${ICE_ENVNAME}, ${ICE_MACHINE_ENVNAME}"
 endif
 
 echo " "
diff --git a/configuration/scripts/cice.settings b/configuration/scripts/cice.settings
index 19b695ba1..007cc37ea 100755
--- a/configuration/scripts/cice.settings
+++ b/configuration/scripts/cice.settings
@@ -3,7 +3,7 @@
 setenv ICE_CASENAME   undefined
 setenv ICE_SANDBOX    undefined
 setenv ICE_MACHINE    undefined
-setenv ICE_COMPILER   undefined
+setenv ICE_ENVNAME    undefined
 setenv ICE_MACHCOMP   undefined
 setenv ICE_SCRIPTS    undefined
 setenv ICE_CASEDIR    undefined
diff --git a/configuration/scripts/machines/env.badger_intel b/configuration/scripts/machines/env.badger_intel
index 8fe69148b..435fd3a5c 100755
--- a/configuration/scripts/machines/env.badger_intel
+++ b/configuration/scripts/machines/env.badger_intel
@@ -30,8 +30,8 @@ module load netcdf-h5parallel/4.4.0
 
 endif
 
-setenv ICE_MACHINE_ENVNAME badger
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME badger
+setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /net/scratch3/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /usr/projects/climate/eclare/DATA/Consortium
diff --git a/configuration/scripts/machines/env.banting_gnu b/configuration/scripts/machines/env.banting_gnu
index 7b1a55eac..0c0a4abce 100755
--- a/configuration/scripts/machines/env.banting_gnu
+++ b/configuration/scripts/machines/env.banting_gnu
@@ -21,8 +21,8 @@ setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesyste
 
 endif
 
-setenv ICE_MACHINE_ENVNAME banting
-setenv ICE_MACHINE_COMPILER gnu
+setenv ICE_MACHINE_MACHNAME banting
+setenv ICE_MACHINE_ENVNAME gnu
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR ~/data/banting/cice/runs 
 setenv ICE_MACHINE_INPUTDATA /home/ords/cmdd/cmde/sice500/
diff --git a/configuration/scripts/machines/env.banting_intel b/configuration/scripts/machines/env.banting_intel
index 48dce9d1e..8760f2d95 100755
--- a/configuration/scripts/machines/env.banting_intel
+++ b/configuration/scripts/machines/env.banting_intel
@@ -16,8 +16,8 @@ setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesyste
 
 endif
 
-setenv ICE_MACHINE_ENVNAME banting
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME banting
+setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR ~/data/banting/cice/runs 
 setenv ICE_MACHINE_INPUTDATA /home/ords/cmdd/cmde/sice500/
diff --git a/configuration/scripts/machines/env.cesium_intel b/configuration/scripts/machines/env.cesium_intel
index 1b8717897..19209919e 100755
--- a/configuration/scripts/machines/env.cesium_intel
+++ b/configuration/scripts/machines/env.cesium_intel
@@ -6,8 +6,8 @@ source /fs/ssm/main/opt/intelcomp/intelcomp-2016.1.156/intelcomp_2016.1.156_mult
 source $ssmuse -d /fs/ssm/main/opt/openmpi/openmpi-1.6.5/intelcomp-2016.1.156 # openmpi
 source $ssmuse -d /fs/ssm/hpco/tmp/eccc/201402/04/intel-2016.1.150 # netcdf (and openmpi)
 
-setenv ICE_MACHINE_ENVNAME cesium
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME cesium
+setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE colormake-short
 setenv ICE_MACHINE_WKDIR  /users/dor/afsg/phb/local/CICEDIRS/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /users/dor/afsg/phb/local/FORCING
diff --git a/configuration/scripts/machines/env.cheyenne_gnu b/configuration/scripts/machines/env.cheyenne_gnu
index f8f139dc0..002086c99 100755
--- a/configuration/scripts/machines/env.cheyenne_gnu
+++ b/configuration/scripts/machines/env.cheyenne_gnu
@@ -29,8 +29,10 @@ endif
 
 endif
 
-setenv ICE_MACHINE_ENVNAME cheyenne
-setenv ICE_MACHINE_COMPILER gnu
+setenv ICE_MACHINE_MACHNAME cheyenne
+setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
+setenv ICE_MACHINE_ENVNAME gnu
+setenv ICE_MACHINE_ENVINFO "GNU Fortran (GCC) 8.3.0, mpt2.19, netcdf4.6.3, pnetcdf1.11.1, pio1.10.1, pio2.4.4"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /glade/scratch/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev
diff --git a/configuration/scripts/machines/env.cheyenne_intel b/configuration/scripts/machines/env.cheyenne_intel
index 82cfd3aeb..d7124375d 100755
--- a/configuration/scripts/machines/env.cheyenne_intel
+++ b/configuration/scripts/machines/env.cheyenne_intel
@@ -29,8 +29,10 @@ endif
 
 endif
 
-setenv ICE_MACHINE_ENVNAME cheyenne
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME cheyenne
+setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 19.0.2.187 20190117, mpt2.19, netcdf4.6.3, pnetcdf1.11.1, pio1.10.1, pio2.4.4"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /glade/scratch/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev
diff --git a/configuration/scripts/machines/env.cheyenne_pgi b/configuration/scripts/machines/env.cheyenne_pgi
index 864c907e3..209a300e2 100755
--- a/configuration/scripts/machines/env.cheyenne_pgi
+++ b/configuration/scripts/machines/env.cheyenne_pgi
@@ -29,8 +29,10 @@ endif
 
 endif
 
-setenv ICE_MACHINE_ENVNAME cheyenne
-setenv ICE_MACHINE_COMPILER pgi
+setenv ICE_MACHINE_MACHNAME cheyenne
+setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
+setenv ICE_MACHINE_ENVNAME pgi
+setenv ICE_MACHINE_ENVINFO "pgf90 19.9-0, mpt2.21, netcdf4.7.3, pnetcdf1.12.1,  pio1.10.1, pio2.4.4"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /glade/scratch/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev
diff --git a/configuration/scripts/machines/env.conda_linux b/configuration/scripts/machines/env.conda_linux
index 14f2d5c46..961d26508 100755
--- a/configuration/scripts/machines/env.conda_linux
+++ b/configuration/scripts/machines/env.conda_linux
@@ -26,8 +26,10 @@ endif
 
 endif
 
-setenv ICE_MACHINE_ENVNAME conda
-setenv ICE_MACHINE_COMPILER linux
+setenv ICE_MACHINE_MACHNAME conda
+setenv ICE_MACHINE_MACHINFO "Generic Linux with conda"
+setenv ICE_MACHINE_ENVNAME linux
+setenv ICE_MACHINE_ENVINFO "(NOTE: may vary) GNU Fortran (GCC) 7.3.0, openmpi 4.0.2, netcdf 4.5.2"
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR  $HOME/cice-dirs/runs
 setenv ICE_MACHINE_INPUTDATA $HOME/cice-dirs/input
diff --git a/configuration/scripts/machines/env.conda_macos b/configuration/scripts/machines/env.conda_macos
index aef2b3a4b..a10c40995 100755
--- a/configuration/scripts/machines/env.conda_macos
+++ b/configuration/scripts/machines/env.conda_macos
@@ -26,8 +26,10 @@ endif
 
 endif
 
-setenv ICE_MACHINE_ENVNAME conda
-setenv ICE_MACHINE_COMPILER macos
+setenv ICE_MACHINE_MACHNAME conda
+setenv ICE_MACHINE_MACHINFO "Generic MacOS with conda"
+setenv ICE_MACHINE_ENVNAME macos
+setenv ICE_MACHINE_ENVINFO "(NOTE: may vary) GNU Fortran 7.3.0, clang 9.0.1, openmpi 4.0.2, netcdf 4.5.2"
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR  $HOME/cice-dirs/runs
 setenv ICE_MACHINE_INPUTDATA $HOME/cice-dirs/input
diff --git a/configuration/scripts/machines/env.conrad_cray b/configuration/scripts/machines/env.conrad_cray
index 32093eb40..62549a738 100755
--- a/configuration/scripts/machines/env.conrad_cray
+++ b/configuration/scripts/machines/env.conrad_cray
@@ -41,8 +41,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME conrad
-setenv ICE_MACHINE_COMPILER cray
+setenv ICE_MACHINE_MACHNAME conrad
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME cray
+setenv ICE_MACHINE_ENVINFO "cce 8.5.8, mpich 7.5.3, netcdf 4.4.1.1"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
diff --git a/configuration/scripts/machines/env.conrad_gnu b/configuration/scripts/machines/env.conrad_gnu
index 112d0f719..dd7f36a76 100755
--- a/configuration/scripts/machines/env.conrad_gnu
+++ b/configuration/scripts/machines/env.conrad_gnu
@@ -41,8 +41,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME conrad
-setenv ICE_MACHINE_COMPILER gnu
+setenv ICE_MACHINE_MACHNAME conrad
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME gnu
+setenv ICE_MACHINE_ENVINFO "GNU Fortran (GCC) 6.3.0 20161221, mpich 7.5.3, netcdf 4.4.1.1"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
diff --git a/configuration/scripts/machines/env.conrad_intel b/configuration/scripts/machines/env.conrad_intel
index f3f2c2529..e37ce4b1f 100755
--- a/configuration/scripts/machines/env.conrad_intel
+++ b/configuration/scripts/machines/env.conrad_intel
@@ -41,8 +41,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME conrad
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME conrad
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 17.0.2 20170213, mpich 7.3.2, netcdf 4.3.2"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
diff --git a/configuration/scripts/machines/env.conrad_pgi b/configuration/scripts/machines/env.conrad_pgi
index c5f813242..2e82ea34f 100755
--- a/configuration/scripts/machines/env.conrad_pgi
+++ b/configuration/scripts/machines/env.conrad_pgi
@@ -41,8 +41,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME conrad
-setenv ICE_MACHINE_COMPILER pgi
+setenv ICE_MACHINE_MACHNAME conrad
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME pgi
+setenv ICE_MACHINE_ENVINFO "pgf90 16.10-0, mpich 7.5.3, netcdf 4.4.1.1"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
diff --git a/configuration/scripts/machines/env.cori_intel b/configuration/scripts/machines/env.cori_intel
index bd66b4313..ed01928f4 100755
--- a/configuration/scripts/machines/env.cori_intel
+++ b/configuration/scripts/machines/env.cori_intel
@@ -44,8 +44,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME cori
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME cori
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 19.0.3.199 20190206, cray-mpich/7.7.6, netcdf/4.6.3.2"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $SCRATCH/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /project/projectdirs/ccsm1/cice-consortium/
diff --git a/configuration/scripts/machines/env.daley_gnu b/configuration/scripts/machines/env.daley_gnu
index f77bf2d88..b1e379eb0 100755
--- a/configuration/scripts/machines/env.daley_gnu
+++ b/configuration/scripts/machines/env.daley_gnu
@@ -21,8 +21,8 @@ setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesyste
 
 endif
 
-setenv ICE_MACHINE_ENVNAME daley
-setenv ICE_MACHINE_COMPILER gnu
+setenv ICE_MACHINE_MACHNAME daley
+setenv ICE_MACHINE_ENVNAME gnu
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR ~/data/daley/cice/runs 
 setenv ICE_MACHINE_INPUTDATA /home/ords/cmdd/cmde/sice500/
diff --git a/configuration/scripts/machines/env.daley_intel b/configuration/scripts/machines/env.daley_intel
index 0d25f983f..5f0cd8241 100755
--- a/configuration/scripts/machines/env.daley_intel
+++ b/configuration/scripts/machines/env.daley_intel
@@ -16,8 +16,8 @@ setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesyste
 
 endif
 
-setenv ICE_MACHINE_ENVNAME daley
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME daley
+setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR ~/data/daley/cice/runs 
 setenv ICE_MACHINE_INPUTDATA /home/ords/cmdd/cmde/sice500/
diff --git a/configuration/scripts/machines/env.fram_intel b/configuration/scripts/machines/env.fram_intel
index 8b1326913..a7b141479 100755
--- a/configuration/scripts/machines/env.fram_intel
+++ b/configuration/scripts/machines/env.fram_intel
@@ -7,8 +7,8 @@ source /fs/ssm/main/opt/intelcomp/intelcomp-2016.1.156/intelcomp_2016.1.156_mult
 source $ssmuse -d /fs/ssm/main/opt/openmpi/openmpi-1.6.5/intelcomp-2016.1.156 # openmpi
 source $ssmuse -d /fs/ssm/hpco/tmp/eccc/201402/04/intel-2016.1.150 # netcdf (and openmpi)
 
-setenv ICE_MACHINE_ENVNAME fram
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME fram
+setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR /home/dormrb01/zephyr4/armn/jfl/local1/CICEDIRS/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /users/dor/armn/jfl/local1/FORCING
diff --git a/configuration/scripts/machines/env.gaffney_gnu b/configuration/scripts/machines/env.gaffney_gnu
index d0dff0949..a63ee2ae4 100755
--- a/configuration/scripts/machines/env.gaffney_gnu
+++ b/configuration/scripts/machines/env.gaffney_gnu
@@ -27,8 +27,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME gaffney
-setenv ICE_MACHINE_COMPILER gnu
+setenv ICE_MACHINE_MACHNAME gaffney
+setenv ICE_MACHINE_MACHINFO "HPE SGI 8600 Xeon Platinum 8168"
+setenv ICE_MACHINE_ENVNAME gnu
+setenv ICE_MACHINE_ENVINFO "GNU Fortran (GCC) 7.3.0, mpt2.18, netcdf4.4.2"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/home/apcraig/cice-consortium-data/cice_consortium
diff --git a/configuration/scripts/machines/env.gaffney_intel b/configuration/scripts/machines/env.gaffney_intel
index 569d0befa..9fa11d16e 100755
--- a/configuration/scripts/machines/env.gaffney_intel
+++ b/configuration/scripts/machines/env.gaffney_intel
@@ -27,8 +27,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME gaffney
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME gaffney
+setenv ICE_MACHINE_MACHINFO "HPE SGI 8600 Xeon Platinum 8168"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 18.0.1 20171018, mpt2.18, netcdf4.4.2"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/home/apcraig/cice-consortium-data/cice_consortium
diff --git a/configuration/scripts/machines/env.gordon_cray b/configuration/scripts/machines/env.gordon_cray
index 271761d42..d8c392d60 100755
--- a/configuration/scripts/machines/env.gordon_cray
+++ b/configuration/scripts/machines/env.gordon_cray
@@ -41,8 +41,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME gordon
-setenv ICE_MACHINE_COMPILER cray
+setenv ICE_MACHINE_MACHNAME gordon
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME cray
+setenv ICE_MACHINE_ENVINFO "cce 8.5.8, mpich 7.5.3, netcdf 4.4.1.1"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
diff --git a/configuration/scripts/machines/env.gordon_gnu b/configuration/scripts/machines/env.gordon_gnu
index 9b1db5b1b..d17923bd3 100755
--- a/configuration/scripts/machines/env.gordon_gnu
+++ b/configuration/scripts/machines/env.gordon_gnu
@@ -41,8 +41,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME gordon
-setenv ICE_MACHINE_COMPILER gnu
+setenv ICE_MACHINE_MACHNAME gordon
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME gnu
+setenv ICE_MACHINE_ENVINFO "GNU Fortran (GCC) 6.3.0 20161221, mpich 7.5.3, netcdf 4.4.1.1"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
diff --git a/configuration/scripts/machines/env.gordon_intel b/configuration/scripts/machines/env.gordon_intel
index 9fd3a7fe4..67aaa9c69 100755
--- a/configuration/scripts/machines/env.gordon_intel
+++ b/configuration/scripts/machines/env.gordon_intel
@@ -41,8 +41,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME gordon
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME gordon
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 17.0.2 20170213, mpich 7.3.2, netcdf 4.3.2"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
@@ -50,6 +52,8 @@ setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
 setenv ICE_MACHINE_SUBMIT "qsub "
 setenv ICE_MACHINE_ACCT P00000000
 setenv ICE_MACHINE_QUEUE "debug"
-setenv ICE_MACHINE_TPNODE 32    # tasks per node
+setenv ICE_MACHINE_TPNODE 32        # tasks per node
+setenv ICE_MACHINE_MAXPES 8000      # maximum total pes (tasks * threads) available
+setenv ICE_MACHINE_MAXRUNLENGTH 168 # maximum batch wall time limit in hours (integer)
 setenv ICE_MACHINE_BLDTHRDS 4
 setenv ICE_MACHINE_QSTAT "qstat "
diff --git a/configuration/scripts/machines/env.gordon_pgi b/configuration/scripts/machines/env.gordon_pgi
index 2505018c7..5885afb4b 100755
--- a/configuration/scripts/machines/env.gordon_pgi
+++ b/configuration/scripts/machines/env.gordon_pgi
@@ -41,8 +41,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME gordon
-setenv ICE_MACHINE_COMPILER pgi
+setenv ICE_MACHINE_MACHNAME gordon
+setenv ICE_MACHINE_MACHINFO "Cray XC40 Xeon E5-2698v3 Haswell"
+setenv ICE_MACHINE_ENVNAME pgi
+setenv ICE_MACHINE_ENVINFO "pgf90 16.10-0, mpich 7.5.3, netcdf 4.4.1.1"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/RASM_data/cice_consortium
diff --git a/configuration/scripts/machines/env.hera_intel b/configuration/scripts/machines/env.hera_intel
index 9204cf046..7330c3937 100755
--- a/configuration/scripts/machines/env.hera_intel
+++ b/configuration/scripts/machines/env.hera_intel
@@ -17,8 +17,10 @@ module load netcdf/4.7.0
 
 endif
  
-setenv ICE_MACHINE_ENVNAME hera
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME hera
+setenv ICE_MACHINE_MACHINFO "Cray Intel SkyLake 6148"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 18.0.5 20180823, intelmpi/2018.0.4, netcdf/4.7.0"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $HOME/scratch/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /home/Anthony.Craig/scratch/CICE_INPUTDATA
diff --git a/configuration/scripts/machines/env.high_Sierra_gnu b/configuration/scripts/machines/env.high_Sierra_gnu
index db8bc01a3..3845a91aa 100755
--- a/configuration/scripts/machines/env.high_Sierra_gnu
+++ b/configuration/scripts/machines/env.high_Sierra_gnu
@@ -1,7 +1,7 @@
 #!/bin/csh -f
 
-setenv ICE_MACHINE_ENVNAME high_Sierra
-setenv ICE_MACHINE_COMPILER gnu
+setenv ICE_MACHINE_MACHNAME high_Sierra
+setenv ICE_MACHINE_ENVNAME gnu
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR /Volumes/ncep/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /Volumes/Data/
diff --git a/configuration/scripts/machines/env.hobart_intel b/configuration/scripts/machines/env.hobart_intel
index 80092297a..2ab7a3c53 100755
--- a/configuration/scripts/machines/env.hobart_intel
+++ b/configuration/scripts/machines/env.hobart_intel
@@ -14,8 +14,8 @@ module load compiler/intel/18.0.3
 
 endif
 
-setenv ICE_MACHINE_ENVNAME hobart
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME hobart
+setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /scratch/cluster/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /fs/cgd/csm/inputdata
diff --git a/configuration/scripts/machines/env.hobart_nag b/configuration/scripts/machines/env.hobart_nag
index cc3fc2e67..cae8c0fd8 100755
--- a/configuration/scripts/machines/env.hobart_nag
+++ b/configuration/scripts/machines/env.hobart_nag
@@ -14,8 +14,8 @@ module load compiler/nag/6.2
 
 endif
 
-setenv ICE_MACHINE_ENVNAME hobart
-setenv ICE_MACHINE_COMPILER nag
+setenv ICE_MACHINE_MACHNAME hobart
+setenv ICE_MACHINE_ENVNAME nag
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /scratch/cluster/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /fs/cgd/csm/inputdata
diff --git a/configuration/scripts/machines/env.izumi_gnu b/configuration/scripts/machines/env.izumi_gnu
index b49be991a..873324e5d 100755
--- a/configuration/scripts/machines/env.izumi_gnu
+++ b/configuration/scripts/machines/env.izumi_gnu
@@ -16,8 +16,10 @@ setenv OMP_STACKSIZE 64M
 
 endif
 
-setenv ICE_MACHINE_ENVNAME izumi
-setenv ICE_MACHINE_COMPILER gnu
+setenv ICE_MACHINE_MACHNAME izumi
+setenv ICE_MACHINE_MACHINFO "Linux Cluster"
+setenv ICE_MACHINE_ENVNAME gnu
+setenv ICE_MACHINE_ENVINFO "GNU Fortran (GCC) 9.3.0, mvapich2-2.3.3, netcdf4.7.4"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /scratch/cluster/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /fs/cgd/csm/inputdata
diff --git a/configuration/scripts/machines/env.izumi_intel b/configuration/scripts/machines/env.izumi_intel
index 55eccaf11..33baa096e 100755
--- a/configuration/scripts/machines/env.izumi_intel
+++ b/configuration/scripts/machines/env.izumi_intel
@@ -16,8 +16,10 @@ setenv OMP_STACKSIZE 64M
 
 endif
 
-setenv ICE_MACHINE_ENVNAME izumi
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME izumi
+setenv ICE_MACHINE_MACHINFO "Linux Cluster"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 19.1.0.166 20191121, mvapich2-2.3.3, netcdf4.7.4"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_CPPDEFS ""
 setenv ICE_MACHINE_WKDIR /scratch/cluster/$user/CICE_RUNS
diff --git a/configuration/scripts/machines/env.izumi_nag b/configuration/scripts/machines/env.izumi_nag
index f87740e8e..d1ce4ba95 100755
--- a/configuration/scripts/machines/env.izumi_nag
+++ b/configuration/scripts/machines/env.izumi_nag
@@ -17,8 +17,10 @@ setenv OMP_STACKSIZE 64M
 
 endif
 
-setenv ICE_MACHINE_ENVNAME izumi
-setenv ICE_MACHINE_COMPILER nag
+setenv ICE_MACHINE_MACHNAME izumi
+setenv ICE_MACHINE_MACHINFO "Linux Cluster"
+setenv ICE_MACHINE_ENVNAME nag
+setenv ICE_MACHINE_ENVINFO "NAG Fortran Compiler Release 6.2(Chiyoda) Build 6207, gcc (GCC) 8.1.0, cc (GCC) 4.8.5 20150623, mvapich2-2.3.3, netcdf/c4.6.1-f4.4.4"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /scratch/cluster/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /fs/cgd/csm/inputdata
diff --git a/configuration/scripts/machines/env.izumi_pgi b/configuration/scripts/machines/env.izumi_pgi
index 11de0e8cf..8a8c36b8f 100755
--- a/configuration/scripts/machines/env.izumi_pgi
+++ b/configuration/scripts/machines/env.izumi_pgi
@@ -16,8 +16,10 @@ setenv OMP_STACKSIZE 64M
 
 endif
 
-setenv ICE_MACHINE_ENVNAME izumi
-setenv ICE_MACHINE_COMPILER pgi
+setenv ICE_MACHINE_MACHNAME izumi
+setenv ICE_MACHINE_MACHINFO "Linux Cluster"
+setenv ICE_MACHINE_ENVNAME pgi
+setenv ICE_MACHINE_ENVINFO "pgf90 20.1-0, mvapich2-2.3.3, netcdf4.7.4"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /scratch/cluster/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /fs/cgd/csm/inputdata
diff --git a/configuration/scripts/machines/env.koehr_intel b/configuration/scripts/machines/env.koehr_intel
index 30876b656..f4d7cada2 100755
--- a/configuration/scripts/machines/env.koehr_intel
+++ b/configuration/scripts/machines/env.koehr_intel
@@ -27,8 +27,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME koehr
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME koehr
+setenv ICE_MACHINE_MACHINFO "HPE SGI 8600 Xeon Platinum 8168"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 18.0.1 20171018, mpt2.18, netcdf4.4.2"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/home/apcraig/cice-consortium-data/cice_consortium
diff --git a/configuration/scripts/machines/env.loft_gnu b/configuration/scripts/machines/env.loft_gnu
index 666a8ff54..f8dec2f7c 100755
--- a/configuration/scripts/machines/env.loft_gnu
+++ b/configuration/scripts/machines/env.loft_gnu
@@ -2,8 +2,8 @@
 
 #setenv NETCDF_PATH /usr/projects/climate/SHARED_CLIMATE/software/conejo/netcdf/3.6.3/intel-13.0.1
 
-setenv ICE_MACHINE_ENVNAME loft
-setenv ICE_MACHINE_COMPILER gnu
+setenv ICE_MACHINE_MACHNAME loft
+setenv ICE_MACHINE_ENVNAME gnu
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /Users/$user/Desktop/CICE-Consortium/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /Users/$user/Desktop/CICE-Consortium
diff --git a/configuration/scripts/machines/env.millikan_intel b/configuration/scripts/machines/env.millikan_intel
index fc81ac097..63913166d 100755
--- a/configuration/scripts/machines/env.millikan_intel
+++ b/configuration/scripts/machines/env.millikan_intel
@@ -6,8 +6,8 @@ source /fs/ssm/main/opt/intelcomp/intelcomp-2016.1.156/intelcomp_2016.1.156_mult
 source $ssmuse -d /fs/ssm/main/opt/openmpi/openmpi-1.6.5/intelcomp-2016.1.156 # openmpi
 source $ssmuse -d /fs/ssm/hpco/tmp/eccc/201402/04/intel-2016.1.150 # netcdf (and openmpi)
 
-setenv ICE_MACHINE_ENVNAME millikan
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME millikan
+setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR  /users/dor/armn/amb/data/local/runs
 setenv ICE_MACHINE_INPUTDATA /users/dor/armn/amb/data/local/forcing
diff --git a/configuration/scripts/machines/env.mustang_intel18 b/configuration/scripts/machines/env.mustang_intel18
index 5ebe9ec70..f420ec7ff 100755
--- a/configuration/scripts/machines/env.mustang_intel18
+++ b/configuration/scripts/machines/env.mustang_intel18
@@ -30,8 +30,10 @@ setenv NETCDF_PATH /app/COST/netcdf-fortran/4.4.2/intel
 
 endif
 
-setenv ICE_MACHINE_ENVNAME mustang
-setenv ICE_MACHINE_COMPILER intel18
+setenv ICE_MACHINE_MACHNAME mustang
+setenv ICE_MACHINE_MACHINFO "HPE SGI 8600 Xeon Platinum 8168"
+setenv ICE_MACHINE_ENVNAME intel18
+setenv ICE_MACHINE_ENVINFO "ifort 18.0.3 20180410, mpt2.19, netcdf4.4.2"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/projects/RASM/cice-consortium
diff --git a/configuration/scripts/machines/env.mustang_intel19 b/configuration/scripts/machines/env.mustang_intel19
index b402e3ff4..0fc0458fd 100755
--- a/configuration/scripts/machines/env.mustang_intel19
+++ b/configuration/scripts/machines/env.mustang_intel19
@@ -30,8 +30,10 @@ setenv NETCDF_PATH /app/COST/netcdf-fortran/4.4.2/intel
 
 endif
 
-setenv ICE_MACHINE_ENVNAME mustang
-setenv ICE_MACHINE_COMPILER intel19
+setenv ICE_MACHINE_MACHNAME mustang
+setenv ICE_MACHINE_MACHINFO "HPE SGI 8600 Xeon Platinum 8168"
+setenv ICE_MACHINE_ENVNAME intel19
+setenv ICE_MACHINE_ENVINFO "ifort 19.0.3.199 20190206, mpt2.20, netcdf4.4.2"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/projects/RASM/cice-consortium
diff --git a/configuration/scripts/machines/env.mustang_intel20 b/configuration/scripts/machines/env.mustang_intel20
index c664f3ca0..00c4a250d 100755
--- a/configuration/scripts/machines/env.mustang_intel20
+++ b/configuration/scripts/machines/env.mustang_intel20
@@ -30,8 +30,10 @@ setenv NETCDF_PATH /app/COST/netcdf-fortran/4.4.2/intel
 
 endif
 
-setenv ICE_MACHINE_ENVNAME mustang
-setenv ICE_MACHINE_COMPILER intel20
+setenv ICE_MACHINE_MACHNAME mustang
+setenv ICE_MACHINE_MACHINFO "HPE SGI 8600 Xeon Platinum 8168"
+setenv ICE_MACHINE_ENVNAME intel20
+setenv ICE_MACHINE_ENVINFO "ifort 19.1.1.217 20200306, mpt2.19, netcdf4.4.2"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work1/projects/RASM/cice-consortium
diff --git a/configuration/scripts/machines/env.onyx_cray b/configuration/scripts/machines/env.onyx_cray
index 78cdb739f..b155c1d1e 100755
--- a/configuration/scripts/machines/env.onyx_cray
+++ b/configuration/scripts/machines/env.onyx_cray
@@ -41,8 +41,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME onyx
-setenv ICE_MACHINE_COMPILER cray
+setenv ICE_MACHINE_MACHNAME onyx
+setenv ICE_MACHINE_MACHINFO "Cray XC40/50 Xeon E5-2699v4 Broadwell"
+setenv ICE_MACHINE_ENVNAME cray
+setenv ICE_MACHINE_ENVINFO "Cray cce/8.6.4, cray-mpich/7.6.3, netcdf/4.4.1.1.3"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/app/unsupported/RASM/cice_consortium
diff --git a/configuration/scripts/machines/env.onyx_gnu b/configuration/scripts/machines/env.onyx_gnu
index 139250142..de7bcc787 100755
--- a/configuration/scripts/machines/env.onyx_gnu
+++ b/configuration/scripts/machines/env.onyx_gnu
@@ -41,8 +41,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME onyx
-setenv ICE_MACHINE_COMPILER gnu
+setenv ICE_MACHINE_MACHNAME onyx
+setenv ICE_MACHINE_MACHINFO "Cray XC40/50 Xeon E5-2699v4 Broadwell"
+setenv ICE_MACHINE_ENVNAME gnu
+setenv ICE_MACHINE_ENVINFO "GNU Fortran (GCC) 7.2.0 20170814, cray-mpich/7.6.2, netcdf/4.4.1.1.3"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/app/unsupported/RASM/cice_consortium
diff --git a/configuration/scripts/machines/env.onyx_intel b/configuration/scripts/machines/env.onyx_intel
index e2a8bde4a..df42fe9f8 100755
--- a/configuration/scripts/machines/env.onyx_intel
+++ b/configuration/scripts/machines/env.onyx_intel
@@ -41,8 +41,10 @@ limit stacksize unlimited
 
 endif
 
-setenv ICE_MACHINE_ENVNAME onyx
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME onyx
+setenv ICE_MACHINE_MACHINFO "Cray XC40/50 Xeon E5-2699v4 Broadwell"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 17.0.1 20161005, cray-mpich/7.6.2, netcdf/4.4.1.1.3"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/app/unsupported/RASM/cice_consortium
diff --git a/configuration/scripts/machines/env.orion_intel b/configuration/scripts/machines/env.orion_intel
index 7088bed49..95850b6bb 100755
--- a/configuration/scripts/machines/env.orion_intel
+++ b/configuration/scripts/machines/env.orion_intel
@@ -24,8 +24,10 @@ echo "  module load netcdf/4.7.2"
 
 endif
  
-setenv ICE_MACHINE_ENVNAME orion
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME orion
+setenv ICE_MACHINE_MACHINFO "Dell EMC PowerEdge C6420 Xeon Gold 6148"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 19.1.0.166 20191121, intelmpi 2019 Update 6 Build 20191024, netcdf/4.7.2"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $HOME/scratch/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /home/acraig/scratch/CICE_INPUTDATA
diff --git a/configuration/scripts/machines/env.phase3_intel b/configuration/scripts/machines/env.phase3_intel
index 4c8f65eee..af8dd3e5f 100755
--- a/configuration/scripts/machines/env.phase3_intel
+++ b/configuration/scripts/machines/env.phase3_intel
@@ -13,8 +13,8 @@ module load NetCDF/4.5.0
 module load ESMF/7_1_0r
 module list
 
-setenv ICE_MACHINE_ENVNAME phase3
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME phase3
+setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /u/Robert.Grumbine/noscrub/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /u/Robert.Grumbine/noscrub/
diff --git a/configuration/scripts/machines/env.testmachine_intel b/configuration/scripts/machines/env.testmachine_intel
index b85d610c9..5b52f1b07 100755
--- a/configuration/scripts/machines/env.testmachine_intel
+++ b/configuration/scripts/machines/env.testmachine_intel
@@ -1,7 +1,9 @@
 #!/bin/csh -f
 
-setenv ICE_MACHINE_ENVNAME testmachine
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME testmachine
+setenv ICE_MACHINE_MACHINFO "Undefined"
+setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "Undefined"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR ~/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA ~/CICE_INPUTDATA
diff --git a/configuration/scripts/machines/env.thunder_intel b/configuration/scripts/machines/env.thunder_intel
index caf1880d9..b1649a813 100755
--- a/configuration/scripts/machines/env.thunder_intel
+++ b/configuration/scripts/machines/env.thunder_intel
@@ -34,8 +34,8 @@ setenv NETCDF_PATH /app/COST/netcdf-fortran/4.4.2/intel
 
 endif
 
-setenv ICE_MACHINE_ENVNAME thunder
-setenv ICE_MACHINE_COMPILER intel
+setenv ICE_MACHINE_MACHNAME thunder
+setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /p/work2/projects/rasm/cice_consortium
diff --git a/configuration/scripts/machines/env.travisCI_gnu b/configuration/scripts/machines/env.travisCI_gnu
index f3c9da26b..b7a1b6176 100755
--- a/configuration/scripts/machines/env.travisCI_gnu
+++ b/configuration/scripts/machines/env.travisCI_gnu
@@ -1,7 +1,9 @@
 #!/bin/csh -f
 
-setenv ICE_MACHINE_ENVNAME travisCI
-setenv ICE_MACHINE_COMPILER gnu
+setenv ICE_MACHINE_MACHNAME travisCI
+setenv ICE_MACHINE_MACHINFO "Cloud Computing"
+setenv ICE_MACHINE_ENVNAME gnu
+setenv ICE_MACHINE_ENVINFO "(NOTE: varies in time) gfortran, gcc, openmpi, netcdf"
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR ~/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA ~
diff --git a/configuration/scripts/tests/baseline.script b/configuration/scripts/tests/baseline.script
index 9e78027a1..a1ab4e055 100644
--- a/configuration/scripts/tests/baseline.script
+++ b/configuration/scripts/tests/baseline.script
@@ -98,3 +98,18 @@ if (${ICE_BFBCOMP} != ${ICE_SPVAL}) then
 endif
 
 #-----------------------------------------------------------
+
+# Document machine and env
+
+set machinfo = ""
+set envinfo  = ""
+if ($?ICE_MACHINE_MACHINFO) then
+  set machinfo = "${ICE_MACHINE_MACHINFO}"
+endif
+if ($?ICE_MACHINE_ENVINFO) then
+  set envinfo = "${ICE_MACHINE_ENVINFO}"
+endif
+echo "#machinfo = ${machinfo}" >> ${ICE_CASEDIR}/test_output
+echo "#envinfo ${ICE_ENVNAME} = ${envinfo}" >> ${ICE_CASEDIR}/test_output
+
+#-----------------------------------------------------------
diff --git a/configuration/scripts/tests/report_results.csh b/configuration/scripts/tests/report_results.csh
index 4a64deff8..e3f8eed70 100755
--- a/configuration/scripts/tests/report_results.csh
+++ b/configuration/scripts/tests/report_results.csh
@@ -49,7 +49,7 @@ set totl = `grep "#totl = " results.log | cut -c 9-`
 set pass = `grep "#pass = " results.log | cut -c 9-`
 set fail = `grep "#fail = " results.log | cut -c 9-`
 set cases = `grep -v "#" results.log | grep ${mach}_ | cut -d " " -f 2 | sort -u`
-set compilers = `grep -v "#" results.log | grep ${mach}_ | cut -d "_" -f 2 | sort -u`
+set envnames = `grep -v "#" results.log | grep ${mach}_ | cut -d "_" -f 2 | sort -u`
 
 #echo "debug ${repo}"
 #echo "debug ${bran}"
@@ -93,12 +93,15 @@ unset noglob
 # Create results table
 #==============================================================
 
-foreach compiler ( ${compilers} )
+foreach envname ( ${envnames} )
+
+  set machinfo = `grep -m 1 "#machinfo = " results.log | cut -d = -f 2`
+  set envinfo = `grep -m 1 "#envinfo ${envname} = " results.log | cut -d = -f 2`
 
   set cnt = 0
   set found = 1
   while ($found == 1)
-    set ofile = "${shhash}.${mach}.${compiler}.${xcdat}.${xctim}.$cnt"
+    set ofile = "${shhash}.${mach}.${envname}.${xcdat}.${xctim}.$cnt"
     set outfile = "${wikiname}/${tsubdir}/${ofile}.md"
     if (-e ${outfile}) then
       @ cnt = $cnt + 1
@@ -126,7 +129,7 @@ EOF
 @ rothr = 0
 
 foreach case ( ${cases} )
-if ( ${case} =~ *_${compiler}_* ) then
+if ( ${case} =~ *_${envname}_* ) then
 
 # check that case results are meaningful
   set fbuild = `grep " ${case} " results.log | grep " build"   | cut -c 1-4`
@@ -292,7 +295,9 @@ cat >! ${outfile} << EOF
 - hash = ${hash}
 - hash created by ${hashuser} ${hashdate}
 - vers = ${vers}
-- tested on ${mach}, ${compiler}, ${user}, ${cdat} ${ctim} UTC
+- tested by ${user}, ${cdat} ${ctim} UTC
+- ${mach} : ${machinfo}
+- ${envname} : ${envinfo}
 - ${ttotl} total tests: ${tpass} pass, ${tfail} fail
 - ${ttotl} total regressions: ${rpass} pass, ${rfail} fail, ${rothr} other
 EOF
@@ -326,9 +331,9 @@ if ($chk == 0) then
 cat >! ${hashfile} << EOF
 #### ${hash}
 
-| machine | compiler | version | date | test fail | comp fail | total |
+| machine | envname | version | date | test fail | comp fail | total |
 | ------ | ------ | ------ | ------  | ------ | ------ | ------ |
-| ${mach} | ${compiler} | ${vers} | ${cdat} | ${tcolor} ${tfail}, ${tunkn} | ${rcolor} ${rfail}, ${rothr} | [${ttotl}](${ofile}) |
+| ${mach} | ${envname} | ${vers} | ${cdat} | ${tcolor} ${tfail}, ${tunkn} | ${rcolor} ${rfail}, ${rothr} | [${ttotl}](${ofile}) |
 
 EOF
 if (-e ${hashfile}.prev) cat ${hashfile}.prev >> ${hashfile}
@@ -336,7 +341,7 @@ if (-e ${hashfile}.prev) cat ${hashfile}.prev >> ${hashfile}
 else
   set oline = `grep -n "#### ${hash}" ${hashfile} | head -1 | cut -d : -f 1`
   @ nline = ${oline} + 3
-  sed -i "$nline a | ${mach} | ${compiler} | ${vers} | ${cdat} | ${tcolor} ${tfail}, ${tunkn} | ${rcolor} ${rfail}, ${rothr} | [${ttotl}](${ofile}) | " ${hashfile}
+  sed -i "$nline a | ${mach} | ${envname} | ${vers} | ${cdat} | ${tcolor} ${tfail}, ${tunkn} | ${rcolor} ${rfail}, ${rothr} | [${ttotl}](${ofile}) | " ${hashfile}
 endif
 
 #=====================
@@ -350,9 +355,9 @@ if ($chk == 0) then
 cat >! ${machfile} << EOF
 #### ${mach}
 
-| version | hash | compiler | date | test fail | comp fail | total |
+| version | hash | envname | date | test fail | comp fail | total |
 | ------ | ------ | ------ | ------ | ------  | ------ | ------ |
-| ${vers} | ${shhash} | ${compiler} | ${cdat} | ${tcolor} ${tfail}, ${tunkn} | ${rcolor} ${rfail}, ${rothr} | [${ttotl}](${ofile}) |
+| ${vers} | ${shhash} | ${envname} | ${cdat} | ${tcolor} ${tfail}, ${tunkn} | ${rcolor} ${rfail}, ${rothr} | [${ttotl}](${ofile}) |
 
 EOF
 if (-e ${machfile}.prev) cat ${machfile}.prev >> ${machfile}
@@ -360,10 +365,10 @@ if (-e ${machfile}.prev) cat ${machfile}.prev >> ${machfile}
 else
   set oline = `grep -n "#### ${mach}" ${machfile} | head -1 | cut -d : -f 1`
   @ nline = ${oline} + 3
-  sed -i "$nline a | ${vers} | ${shhash} | ${compiler} | ${cdat} | ${tcolor} ${tfail}, ${tunkn} | ${rcolor} ${rfail}, ${rothr} | [${ttotl}](${ofile}) | " ${machfile}
+  sed -i "$nline a | ${vers} | ${shhash} | ${envname} | ${cdat} | ${tcolor} ${tfail}, ${tunkn} | ${rcolor} ${rfail}, ${rothr} | [${ttotl}](${ofile}) | " ${machfile}
 endif
 
-#foreach compiler
+#foreach envname
 end
 
 #=====================
diff --git a/doc/source/user_guide/ug_case_settings.rst b/doc/source/user_guide/ug_case_settings.rst
index 39c846b2c..58cb79c91 100644
--- a/doc/source/user_guide/ug_case_settings.rst
+++ b/doc/source/user_guide/ug_case_settings.rst
@@ -28,7 +28,7 @@ can be modified as needed.
    "ICE_CASENAME", "string", "case name", "set by cice.setup"
    "ICE_SANDBOX", "string", "sandbox directory", "set by cice.setup"
    "ICE_MACHINE", "string", "machine name", "set by cice.setup"
-   "ICE_COMPILER", "string", "environment name", "set by cice.setup"
+   "ICE_ENVNAME", "string", "environment name", "set by cice.setup"
    "ICE_MACHCOMP", "string", "machine_environment name", "set by cice.setup"
    "ICE_SCRIPTS", "string", "scripts directory", "set by cice.setup"
    "ICE_CASEDIR", "string", "case directory", "set by cice.setup"
diff --git a/doc/source/user_guide/ug_running.rst b/doc/source/user_guide/ug_running.rst
index b4fa7bcd7..4d9133cc0 100644
--- a/doc/source/user_guide/ug_running.rst
+++ b/doc/source/user_guide/ug_running.rst
@@ -378,7 +378,7 @@ and the environment (compiler) is specified with ``--env``.
 
 - Copy an existing env and a Macros file to new names for your new machine
 
-- Edit your env and Macros files
+- Edit your env and Macros files, update as needed
 
 - cd .. to **configuration/scripts/**
 
@@ -412,8 +412,10 @@ system.  Some variables are optional.
    :header: "variable", "format", "description"
    :widths: 15, 15, 25
 
-   "ICE_MACHINE_ENVNAME", "string", "machine name"
-   "ICE_MACHINE_COMPILER", "string", "compiler"
+   "ICE_MACHINE_MACHNAME", "string", "machine name"
+   "ICE_MACHINE_MACHINFO", "string", "machine information"
+   "ICE_MACHINE_ENVNAME", "string", "env/compiler name"
+   "ICE_MACHINE_ENVINFO", "string", "env/compiler information"
    "ICE_MACHINE_MAKE", "string", "make command"
    "ICE_MACHINE_WKDIR", "string", "root work directory"
    "ICE_MACHINE_INPUTDATA", "string", "root input data directory"

From 3f8a034e98d0d20eafb35619c500d4176ee2761e Mon Sep 17 00:00:00 2001
From: apcraig <anthony.p.craig@gmail.com>
Date: Thu, 11 Jun 2020 18:07:37 -0600
Subject: [PATCH 2/6] update badger, remove loft

---
 configuration/scripts/cice.batch.csh          | 12 ----
 configuration/scripts/cice.launch.csh         | 11 ----
 .../scripts/machines/Macros.loft_gnu          | 64 -------------------
 .../scripts/machines/env.badger_intel         |  2 +
 configuration/scripts/machines/env.loft_gnu   | 16 -----
 5 files changed, 2 insertions(+), 103 deletions(-)
 delete mode 100644 configuration/scripts/machines/Macros.loft_gnu
 delete mode 100755 configuration/scripts/machines/env.loft_gnu

diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh
index 79edd4bbe..917924f46 100755
--- a/configuration/scripts/cice.batch.csh
+++ b/configuration/scripts/cice.batch.csh
@@ -146,18 +146,6 @@ cat >> ${jobfile} << EOFB
 #SBATCH --qos=standby
 EOFB
 
-else if (${ICE_MACHINE} =~ loft*) then
-cat >> ${jobfile} << EOFB
-#PBS -N ${shortcase}
-#PBS -q ${queue}
-#PBS -A ${acct}
-#PBS -l select=${nnodes}:ncpus=${maxtpn}:mpiprocs=${taskpernode}
-#PBS -l walltime=${batchtime}
-#PBS -j oe
-###PBS -M username@domain.com
-###PBS -m be
-EOFB
-
 else if (${ICE_MACHINE} =~ fram*) then
 cat >> ${jobfile} << EOFB
 #SBATCH -J ${ICE_CASENAME}
diff --git a/configuration/scripts/cice.launch.csh b/configuration/scripts/cice.launch.csh
index e1189e23d..eaa062bff 100755
--- a/configuration/scripts/cice.launch.csh
+++ b/configuration/scripts/cice.launch.csh
@@ -105,17 +105,6 @@ mpirun -np ${ntasks} ./cice >&! \$ICE_RUNLOG_FILE
 EOFR
 endif
 
-#=======
-else if (${ICE_MACHINE} =~ loft*) then
-if (${ICE_COMMDIR} =~ serial*) then
-cat >> ${jobfile} << EOFR
-./cice >&! \$ICE_RUNLOG_FILE
-EOFR
-else
-cat >> ${jobfile} << EOFR
-aprun -n ${ntasks} -N ${taskpernodelimit} -d ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE
-EOFR
-endif
 #=======
 else if (${ICE_MACHINE} =~ fram*) then
 if (${ICE_COMMDIR} =~ serial*) then
diff --git a/configuration/scripts/machines/Macros.loft_gnu b/configuration/scripts/machines/Macros.loft_gnu
deleted file mode 100644
index 6d14c04cc..000000000
--- a/configuration/scripts/machines/Macros.loft_gnu
+++ /dev/null
@@ -1,64 +0,0 @@
-#==============================================================================
-# Macros file for LANL osx, gfortran compiler (loft laptop)
-#==============================================================================
-
-CPP        := /usr/bin/cpp
-#CPP        := fpp
-CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
-CFLAGS     := -c -O2 -fp-model precise   -xHost
-
-FIXEDFLAGS := -132
-#FREEFLAGS  := -FR
-
-#gfortran flags
-FFLAGS     :=  -O2 -ffree-line-length-none -fconvert=big-endian -finit-real=nan
-#FFLAGS     :=  -O2 -ffree-line-length-none -fconvert=big-endian -finit-real=nan -Wall -Wextra -pedantic -fbacktrace -std=f2008
-
-#ifort flags
-#FFLAGS     := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback   -xHost
-
-FFLAGS_NOOPT:= -O0
-
-ifeq ($(ICE_BLDDEBUG), true)
-  FFLAGS     += -O0 -Wextra -fbacktrace -fbounds-check -ffpe-trap=zero,overflow
-#  FFLAGS     += -O0 -g -Wextra -fbacktrace -fbounds-check -ffpe-trap=zero,overflow
-#  FFLAGS     += -O0 -Wextra -fbacktrace -fbounds-check -ffpe-trap=zero,overflow
-# ifort flags
-#  FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created
-else
-  FFLAGS     += -O2
-endif
-
-SCC   := gcc 
-SFC   := gfortran
-MPICC := gcc
-MPIFC := gfortran
-
-ifeq ($(ICE_COMMDIR), mpi)
-  FC := $(MPIFC)
-  CC := $(MPICC)
-else
-  FC := $(SFC)
-  CC := $(SCC)
-endif
-LD:= $(FC)
-
-ifeq ($(ICE_IOTYPE), netcdf)
-  NETCDF_PATH := /usr/projects/climate/SHARED_CLIMATE/software/conejo/netcdf/3.6.3/intel-13.0.1
-  INCLDIR := $(INCLDIR) -I$(NETCDF_PATH)/include
-  LIB_NETCDF := $(NETCDF_PATH)/lib
-  LIB_PNETCDF := 
-  SLIBS   := -L$(LIB_NETCDF) -lnetcdf 
-else
-  SLIBS   := 
-endif
-
-LIB_MPI := 
-
-ifeq ($(ICE_THREADED), true) 
-   LDFLAGS += -openmp
-   CFLAGS += -openmp
-   FFLAGS += -openmp
-endif
-
-
diff --git a/configuration/scripts/machines/env.badger_intel b/configuration/scripts/machines/env.badger_intel
index 435fd3a5c..eef4cf9dd 100755
--- a/configuration/scripts/machines/env.badger_intel
+++ b/configuration/scripts/machines/env.badger_intel
@@ -31,7 +31,9 @@ module load netcdf-h5parallel/4.4.0
 endif
 
 setenv ICE_MACHINE_MACHNAME badger
+setenv ICE_MACHINE_MACHINFO "Penguin Intel Xeon Broadwell"
 setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "ifort 19.0.4.243 20190416, openmpi/2.1.2, netcdf4.4.0"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /net/scratch3/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /usr/projects/climate/eclare/DATA/Consortium
diff --git a/configuration/scripts/machines/env.loft_gnu b/configuration/scripts/machines/env.loft_gnu
deleted file mode 100755
index f8dec2f7c..000000000
--- a/configuration/scripts/machines/env.loft_gnu
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/tcsh -f
-
-#setenv NETCDF_PATH /usr/projects/climate/SHARED_CLIMATE/software/conejo/netcdf/3.6.3/intel-13.0.1
-
-setenv ICE_MACHINE_MACHNAME loft
-setenv ICE_MACHINE_ENVNAME gnu
-setenv ICE_MACHINE_MAKE gmake
-setenv ICE_MACHINE_WKDIR /Users/$user/Desktop/CICE-Consortium/CICE_RUNS
-setenv ICE_MACHINE_INPUTDATA /Users/$user/Desktop/CICE-Consortium
-setenv ICE_MACHINE_BASELINE /Users/$user/Desktop/CICE-Consortium/CICE_BASELINE
-setenv ICE_MACHINE_SUBMIT " "
-setenv ICE_MACHINE_ACCT 
-setenv ICE_MACHINE_QUEUE "default"
-setenv ICE_MACHINE_TPNODE 1
-setenv ICE_MACHINE_BLDTHRDS 1
-setenv ICE_MACHINE_QSTAT " "

From 72fe79d6e87cb9d9486300559dc2a58d40e00e13 Mon Sep 17 00:00:00 2001
From: apcraig <anthony.p.craig@gmail.com>
Date: Thu, 11 Jun 2020 18:08:46 -0600
Subject: [PATCH 3/6] update machines

---
 configuration/scripts/machines/env.badger_intel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration/scripts/machines/env.badger_intel b/configuration/scripts/machines/env.badger_intel
index eef4cf9dd..6d53bf978 100755
--- a/configuration/scripts/machines/env.badger_intel
+++ b/configuration/scripts/machines/env.badger_intel
@@ -33,7 +33,7 @@ endif
 setenv ICE_MACHINE_MACHNAME badger
 setenv ICE_MACHINE_MACHINFO "Penguin Intel Xeon Broadwell"
 setenv ICE_MACHINE_ENVNAME intel
-setenv ICE_MACHINE_ENVINFO "ifort 19.0.4.243 20190416, openmpi/2.1.2, netcdf4.4.0"
+setenv ICE_MACHINE_ENVINFO "(Note: can vary) ifort 19.0.4.243 20190416, openmpi/2.1.2, netcdf4.4.0"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /net/scratch3/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /usr/projects/climate/eclare/DATA/Consortium

From 3040498a2d9930cbcd99303acf3718c673883843 Mon Sep 17 00:00:00 2001
From: apcraig <anthony.p.craig@gmail.com>
Date: Thu, 11 Jun 2020 18:15:37 -0600
Subject: [PATCH 4/6] remove thunder

---
 configuration/scripts/cice.batch.csh          |  2 +-
 configuration/scripts/cice.launch.csh         | 12 ----
 .../scripts/machines/Macros.thunder_intel     | 56 -------------------
 .../scripts/machines/env.thunder_intel        | 48 ----------------
 4 files changed, 1 insertion(+), 117 deletions(-)
 delete mode 100644 configuration/scripts/machines/Macros.thunder_intel
 delete mode 100755 configuration/scripts/machines/env.thunder_intel

diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh
index 917924f46..c3c91b5c4 100755
--- a/configuration/scripts/cice.batch.csh
+++ b/configuration/scripts/cice.batch.csh
@@ -91,7 +91,7 @@ cat >> ${jobfile} << EOFB
 #PBS -l walltime=${batchtime}
 EOFB
 
-else if (${ICE_MACHINE} =~ thunder* || ${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad*  || ${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr* || ${ICE_MACHINE} =~ mustang) then
+else if (${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad*  || ${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr* || ${ICE_MACHINE} =~ mustang) then
 cat >> ${jobfile} << EOFB
 #PBS -N ${shortcase}
 #PBS -q ${queue}
diff --git a/configuration/scripts/cice.launch.csh b/configuration/scripts/cice.launch.csh
index eaa062bff..45dd7acd9 100755
--- a/configuration/scripts/cice.launch.csh
+++ b/configuration/scripts/cice.launch.csh
@@ -45,18 +45,6 @@ mpiexec -n ${ntasks} ./cice >&! \$ICE_RUNLOG_FILE
 EOFR
 endif
 
-#=======
-else if (${ICE_MACHINE} =~ thunder*) then
-if (${ICE_COMMDIR} =~ serial*) then
-cat >> ${jobfile} << EOFR
-./cice >&! \$ICE_RUNLOG_FILE
-EOFR
-else
-cat >> ${jobfile} << EOFR
-mpiexec_mpt -np ${ntasks} omplace ./cice >&! \$ICE_RUNLOG_FILE
-EOFR
-endif
-
 #=======
 else if (${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr* || ${ICE_MACHINE} =~ mustang*) then
 if (${ICE_COMMDIR} =~ serial*) then
diff --git a/configuration/scripts/machines/Macros.thunder_intel b/configuration/scripts/machines/Macros.thunder_intel
deleted file mode 100644
index 7163fb883..000000000
--- a/configuration/scripts/machines/Macros.thunder_intel
+++ /dev/null
@@ -1,56 +0,0 @@
-#==============================================================================
-# Macros file for ARFL thunder, intel compiler
-#==============================================================================
-
-CPP        := fpp
-CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
-CFLAGS     := -c -O2 -fp-model precise   -xHost
-
-FIXEDFLAGS := -132
-FREEFLAGS  := -FR
-FFLAGS     := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback   -xHost
-FFLAGS_NOOPT:= -O0
-
-ifeq ($(ICE_BLDDEBUG), true)
-  FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created
-else
-  FFLAGS     += -O2
-endif
-
-SCC   := icc 
-SFC   := ifort
-MPICC := icc
-MPIFC := ifort
-
-ifeq ($(ICE_COMMDIR), mpi)
-  FC := $(MPIFC)
-  CC := $(MPICC)
-  LDFLAGS += -lmpi
-else
-  FC := $(SFC)
-  CC := $(SCC)
-endif
-LD:= $(FC)
-
-# defined by module
-#NETCDF_PATH := $(NETCDF)
-#PNETCDF_PATH := $(PNETCDF)
-#PNETCDF_PATH := /glade/apps/opt/pnetcdf/1.3.0/intel/default
-#LAPACK_LIBDIR := /glade/apps/opt/lapack/3.4.2/intel/12.1.5/lib
-
-#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs 
-
-INCLDIR := $(INCLDIR)
-INCLDIR += -I$(NETCDF_PATH)/include
-
-LIB_NETCDF := $(NETCDF_PATH)/lib
-LIB_PNETCDF := $(PNETCDF_PATH)/lib
-LIB_MPI := $(IMPILIBDIR)
-SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
-
-ifeq ($(ICE_THREADED), true) 
-   LDFLAGS += -qopenmp
-   CFLAGS += -qopenmp
-   FFLAGS += -qopenmp
-endif
-
diff --git a/configuration/scripts/machines/env.thunder_intel b/configuration/scripts/machines/env.thunder_intel
deleted file mode 100755
index b1649a813..000000000
--- a/configuration/scripts/machines/env.thunder_intel
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/csh -f
-
-set inp = "undefined"
-if ($#argv == 1) then
-  set inp = $1
-endif
-
-if ("$inp" != "-nomodules") then
-
-source ${MODULESHOME}/init/csh
-
-module unload gcc-compilers
-module unload intel-compilers
-module unload mpt
-module unload netcdf-fortran
-module unload netcdf-c
-module unload hdf5
-module unload pbs
-
-module load costinit
-module load intel-compilers/15.0.3.187
-module load mpt/2.14
-module load netcdf-fortran/intel/4.4.2
-module load pbs/12.2.4.142262
-
-setenv NETCDF_PATH /app/COST/netcdf-fortran/4.4.2/intel
-
-#setenv OMP_STACKSIZE 256M
-#setenv MP_LABELIO yes
-#setenv MP_INFOLEVEL 2
-#setenv MP_SHARED_MEMORY yes
-#setenv MP_EUILIB us
-#setenv MP_EAGER_LIMIT 0
-
-endif
-
-setenv ICE_MACHINE_MACHNAME thunder
-setenv ICE_MACHINE_ENVNAME intel
-setenv ICE_MACHINE_MAKE gmake
-setenv ICE_MACHINE_WKDIR $WORKDIR/CICE_RUNS
-setenv ICE_MACHINE_INPUTDATA /p/work2/projects/rasm/cice_consortium
-setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
-setenv ICE_MACHINE_SUBMIT "qsub "
-setenv ICE_MACHINE_ACCT P00000000
-setenv ICE_MACHINE_QUEUE "debug"
-setenv ICE_MACHINE_TPNODE 36    # tasks per node
-setenv ICE_MACHINE_BLDTHRDS 4
-setenv ICE_MACHINE_QSTAT "qstat "

From c63fedd8282245d4597dbb3103a760d5bbc82a55 Mon Sep 17 00:00:00 2001
From: apcraig <anthony.p.craig@gmail.com>
Date: Fri, 12 Jun 2020 12:43:51 -0600
Subject: [PATCH 5/6] update conda machinfo

---
 configuration/scripts/machines/env.conda_linux | 2 +-
 configuration/scripts/machines/env.conda_macos | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration/scripts/machines/env.conda_linux b/configuration/scripts/machines/env.conda_linux
index 961d26508..08cf27724 100755
--- a/configuration/scripts/machines/env.conda_linux
+++ b/configuration/scripts/machines/env.conda_linux
@@ -27,7 +27,7 @@ endif
 endif
 
 setenv ICE_MACHINE_MACHNAME conda
-setenv ICE_MACHINE_MACHINFO "Generic Linux with conda"
+setenv ICE_MACHINE_MACHINFO "Generic conda setup"
 setenv ICE_MACHINE_ENVNAME linux
 setenv ICE_MACHINE_ENVINFO "(NOTE: may vary) GNU Fortran (GCC) 7.3.0, openmpi 4.0.2, netcdf 4.5.2"
 setenv ICE_MACHINE_MAKE make
diff --git a/configuration/scripts/machines/env.conda_macos b/configuration/scripts/machines/env.conda_macos
index a10c40995..e33eee710 100755
--- a/configuration/scripts/machines/env.conda_macos
+++ b/configuration/scripts/machines/env.conda_macos
@@ -27,7 +27,7 @@ endif
 endif
 
 setenv ICE_MACHINE_MACHNAME conda
-setenv ICE_MACHINE_MACHINFO "Generic MacOS with conda"
+setenv ICE_MACHINE_MACHINFO "Generic conda setup"
 setenv ICE_MACHINE_ENVNAME macos
 setenv ICE_MACHINE_ENVINFO "(NOTE: may vary) GNU Fortran 7.3.0, clang 9.0.1, openmpi 4.0.2, netcdf 4.5.2"
 setenv ICE_MACHINE_MAKE make

From e05cfab85f6833886b1cc09678324a34e106a2b6 Mon Sep 17 00:00:00 2001
From: Philippe Blain <philippe.blain@canada.ca>
Date: Fri, 12 Jun 2020 15:08:07 -0400
Subject: [PATCH 6/6] machines: add ICE_MACHINE_MACHINFO and
 ICE_MACHINE_ENVINFO for ECCC machines

---
 configuration/scripts/machines/env.banting_intel | 2 ++
 configuration/scripts/machines/env.daley_intel   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/configuration/scripts/machines/env.banting_intel b/configuration/scripts/machines/env.banting_intel
index 8760f2d95..ac01e4d72 100755
--- a/configuration/scripts/machines/env.banting_intel
+++ b/configuration/scripts/machines/env.banting_intel
@@ -17,7 +17,9 @@ setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesyste
 endif
 
 setenv ICE_MACHINE_MACHNAME banting
+setenv ICE_MACHINE_MACHINFO "Cray XC50, Intel Xeon Gold 6148 (Skylake)"
 setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "Intel 19.0.3.199, cray-mpich/7.7.7, cray-netcdf/4.6.1.3"
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR ~/data/banting/cice/runs 
 setenv ICE_MACHINE_INPUTDATA /home/ords/cmdd/cmde/sice500/
diff --git a/configuration/scripts/machines/env.daley_intel b/configuration/scripts/machines/env.daley_intel
index 5f0cd8241..502c71037 100755
--- a/configuration/scripts/machines/env.daley_intel
+++ b/configuration/scripts/machines/env.daley_intel
@@ -17,7 +17,9 @@ setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesyste
 endif
 
 setenv ICE_MACHINE_MACHNAME daley
+setenv ICE_MACHINE_MACHINFO "Cray XC50, Intel Xeon Gold 6148 (Skylake)"
 setenv ICE_MACHINE_ENVNAME intel
+setenv ICE_MACHINE_ENVINFO "Intel 19.0.3.199, cray-mpich/7.7.6, cray-netcdf/4.6.1.3"
 setenv ICE_MACHINE_MAKE make
 setenv ICE_MACHINE_WKDIR ~/data/daley/cice/runs 
 setenv ICE_MACHINE_INPUTDATA /home/ords/cmdd/cmde/sice500/