diff --git a/cicecore/drivers/direct/hadgem3/CICE.F90 b/cicecore/drivers/direct/hadgem3/CICE.F90
index b2314240c..b0176e801 100644
--- a/cicecore/drivers/direct/hadgem3/CICE.F90
+++ b/cicecore/drivers/direct/hadgem3/CICE.F90
@@ -1,8 +1,8 @@
 !=======================================================================
-! Copyright (c) 2021, Triad National Security, LLC
+! Copyright (c) 2022, Triad National Security, LLC
 ! All rights reserved.
 !                
-! Copyright 2021. Triad National Security, LLC. This software was
+! Copyright 2022. Triad National Security, LLC. This software was
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  
diff --git a/cicecore/drivers/mct/cesm1/CICE_copyright.txt b/cicecore/drivers/mct/cesm1/CICE_copyright.txt
index e10da1e77..6eb3c9cca 100644
--- a/cicecore/drivers/mct/cesm1/CICE_copyright.txt
+++ b/cicecore/drivers/mct/cesm1/CICE_copyright.txt
@@ -1,7 +1,7 @@
-! Copyright (c) 2021, Triad National Security, LLC
+! Copyright (c) 2022, Triad National Security, LLC
 ! All rights reserved.
 !                
-! Copyright 2021. Triad National Security, LLC. This software was
+! Copyright 2022. Triad National Security, LLC. This software was
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  
diff --git a/cicecore/drivers/nuopc/cmeps/CICE_copyright.txt b/cicecore/drivers/nuopc/cmeps/CICE_copyright.txt
index e10da1e77..6eb3c9cca 100644
--- a/cicecore/drivers/nuopc/cmeps/CICE_copyright.txt
+++ b/cicecore/drivers/nuopc/cmeps/CICE_copyright.txt
@@ -1,7 +1,7 @@
-! Copyright (c) 2021, Triad National Security, LLC
+! Copyright (c) 2022, Triad National Security, LLC
 ! All rights reserved.
 !                
-! Copyright 2021. Triad National Security, LLC. This software was
+! Copyright 2022. Triad National Security, LLC. This software was
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  
diff --git a/cicecore/drivers/nuopc/dmi/CICE.F90 b/cicecore/drivers/nuopc/dmi/CICE.F90
index 7056e0e5b..d6a28c3ba 100644
--- a/cicecore/drivers/nuopc/dmi/CICE.F90
+++ b/cicecore/drivers/nuopc/dmi/CICE.F90
@@ -1,8 +1,8 @@
 !=======================================================================
-! Copyright (c) 2021, Triad National Security, LLC
+! Copyright (c) 2022, Triad National Security, LLC
 ! All rights reserved.
 !                
-! Copyright 2021. Triad National Security, LLC. This software was
+! Copyright 2022. Triad National Security, LLC. This software was
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  
diff --git a/cicecore/drivers/standalone/cice/CICE.F90 b/cicecore/drivers/standalone/cice/CICE.F90
index 7056e0e5b..d6a28c3ba 100644
--- a/cicecore/drivers/standalone/cice/CICE.F90
+++ b/cicecore/drivers/standalone/cice/CICE.F90
@@ -1,8 +1,8 @@
 !=======================================================================
-! Copyright (c) 2021, Triad National Security, LLC
+! Copyright (c) 2022, Triad National Security, LLC
 ! All rights reserved.
 !                
-! Copyright 2021. Triad National Security, LLC. This software was
+! Copyright 2022. Triad National Security, LLC. This software was
 ! produced under U.S. Government contract DE-AC52-06NA25396 for Los 
 ! Alamos National Laboratory (LANL), which is operated by Triad
 ! National Security, LLC for the U.S. Department of Energy. The U.S.  
diff --git a/cicecore/version.txt b/cicecore/version.txt
index 04a90ef1a..9e5f9f3e1 100644
--- a/cicecore/version.txt
+++ b/cicecore/version.txt
@@ -1 +1 @@
-CICE 6.3.0
+CICE 6.3.1
diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh
index e53b04533..85191dbf6 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} =~ gordon* || ${ICE_MACHINE} =~ conrad*  || ${ICE_MACHINE} =~ gaffney* || ${ICE_MACHINE} =~ koehr* || ${ICE_MACHINE} =~ mustang*) then
+else if (${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 a63c802ed..cb9068141 100755
--- a/configuration/scripts/cice.launch.csh
+++ b/configuration/scripts/cice.launch.csh
@@ -63,12 +63,6 @@ cat >> ${jobfile} << EOFR
 aprun -n ${ntasks} -N ${taskpernodelimit} -d ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE
 EOFR
 
-#=======
-else if (${ICE_MACHINE} =~ gordon* || ${ICE_MACHINE} =~ conrad*) then
-cat >> ${jobfile} << EOFR
-aprun -n ${ntasks} -N ${taskpernodelimit} -d ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE
-EOFR
-
 #=======
 else if (${ICE_MACHINE} =~ cori*) then
 if (${ICE_COMMDIR} =~ serial*) then
diff --git a/configuration/scripts/machines/Macros.conrad_cray b/configuration/scripts/machines/Macros.conrad_cray
deleted file mode 100644
index 19ddcb8f5..000000000
--- a/configuration/scripts/machines/Macros.conrad_cray
+++ /dev/null
@@ -1,57 +0,0 @@
-#==============================================================================
-# Macros file for NAVYDSRC conrad, cray compiler
-#==============================================================================
-
-CPP        := ftn -e P
-CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
-CFLAGS     := -c -O2 -h fp0 
-
-FIXEDFLAGS := -132
-FREEFLAGS  := 
-FFLAGS     := -h fp0 -h byteswapio 
-FFLAGS_NOOPT:= -O0
-LDFLAGS    := -h byteswapio
-
-ifeq ($(ICE_BLDDEBUG), true)
-  FFLAGS     += -O0 -g -Rbcdps
-#  FFLAGS     += -O0 -g -Rbcdps -ei
-else
-  FFLAGS     += -O2
-endif
-
-SCC   := cc 
-SFC   := ftn
-MPICC := cc
-MPIFC := ftn
-
-ifeq ($(ICE_COMMDIR), mpi)
-  FC := $(MPIFC)
-  CC := $(MPICC)
-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), false) 
-   LDFLAGS += -hnoomp
-   CFLAGS += -hnoomp
-   FFLAGS += -hnoomp
-endif
-
diff --git a/configuration/scripts/machines/Macros.conrad_gnu b/configuration/scripts/machines/Macros.conrad_gnu
deleted file mode 100644
index 5459d9b6b..000000000
--- a/configuration/scripts/machines/Macros.conrad_gnu
+++ /dev/null
@@ -1,55 +0,0 @@
-#==============================================================================
-# Macros file for NAVYDSRC conrad, gnu compiler
-#==============================================================================
-
-CPP        := ftn -E
-CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
-CFLAGS     := -c -O2
-
-FIXEDFLAGS := -ffixed-line-length-132
-FREEFLAGS  := -ffree-form
-FFLAGS     := -fconvert=big-endian -fbacktrace -ffree-line-length-none
-FFLAGS_NOOPT:= -O0
-
-ifeq ($(ICE_BLDDEBUG), true)
-  FFLAGS     += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow
-else
-  FFLAGS     += -O2
-endif
-
-SCC   := cc 
-SFC   := ftn
-MPICC := cc
-MPIFC := ftn
-
-ifeq ($(ICE_COMMDIR), mpi)
-  FC := $(MPIFC)
-  CC := $(MPICC)
-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 += -fopenmp
-   CFLAGS += -fopenmp
-   FFLAGS += -fopenmp
-endif
-
diff --git a/configuration/scripts/machines/Macros.conrad_intel b/configuration/scripts/machines/Macros.conrad_intel
deleted file mode 100644
index 74a36304d..000000000
--- a/configuration/scripts/machines/Macros.conrad_intel
+++ /dev/null
@@ -1,56 +0,0 @@
-#==============================================================================
-# Macros file for NAVYDSRC conrad, 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
-#  FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -init=snan,arrays
-else
-  FFLAGS     += -O2
-endif
-
-SCC   := cc 
-SFC   := ftn
-MPICC := cc
-MPIFC := ftn
-
-ifeq ($(ICE_COMMDIR), mpi)
-  FC := $(MPIFC)
-  CC := $(MPICC)
-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/Macros.conrad_pgi b/configuration/scripts/machines/Macros.conrad_pgi
deleted file mode 100644
index ef0a25ab4..000000000
--- a/configuration/scripts/machines/Macros.conrad_pgi
+++ /dev/null
@@ -1,55 +0,0 @@
-#==============================================================================
-# Macros file for NAVYDSRC conrad, pgi compiler
-#==============================================================================
-
-CPP        := pgcc -E 
-CPPDEFS    := -DFORTRANUNDERSCORE -DNO_R16 ${ICE_CPPDEFS}
-CFLAGS     := -c -O2 -Kieee
-
-FIXEDFLAGS := -Mextend
-FREEFLAGS  := -Mfree
-FFLAGS     := -Kieee -Mbyteswapio -traceback 
-FFLAGS_NOOPT:= -O0
-
-ifeq ($(ICE_BLDDEBUG), true)
-  FFLAGS     += -O0 -g -Mbounds -Mchkptr
-else
-  FFLAGS     += -O -g
-endif
-
-SCC   := cc 
-SFC   := ftn
-MPICC := cc
-MPIFC := ftn
-
-ifeq ($(ICE_COMMDIR), mpi)
-  FC := $(MPIFC)
-  CC := $(MPICC)
-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 += -mp
-   CFLAGS += -mp
-   FFLAGS += -mp
-endif
-
diff --git a/configuration/scripts/machines/Macros.gordon_cray b/configuration/scripts/machines/Macros.gordon_cray
deleted file mode 100644
index 6c5032e0d..000000000
--- a/configuration/scripts/machines/Macros.gordon_cray
+++ /dev/null
@@ -1,57 +0,0 @@
-#==============================================================================
-# Macros file for NAVYDSRC gordon, cray compiler
-#==============================================================================
-
-CPP        := ftn -e P
-CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
-CFLAGS     := -c -O2 -h fp0 
-
-FIXEDFLAGS := -132
-FREEFLAGS  := 
-FFLAGS     := -h fp0 -h byteswapio 
-FFLAGS_NOOPT:= -O0
-LDFLAGS    := -h byteswapio
-
-ifeq ($(ICE_BLDDEBUG), true)
-  FFLAGS     += -O0 -g -Rbcdps
-#  FFLAGS     += -O0 -g -Rbcdps -ei
-else
-  FFLAGS     += -O2
-endif
-
-SCC   := cc 
-SFC   := ftn
-MPICC := cc
-MPIFC := ftn
-
-ifeq ($(ICE_COMMDIR), mpi)
-  FC := $(MPIFC)
-  CC := $(MPICC)
-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), false) 
-   LDFLAGS += -hnoomp
-   CFLAGS += -hnoomp
-   FFLAGS += -hnoomp
-endif
-
diff --git a/configuration/scripts/machines/Macros.gordon_gnu b/configuration/scripts/machines/Macros.gordon_gnu
deleted file mode 100644
index 8c3e277ab..000000000
--- a/configuration/scripts/machines/Macros.gordon_gnu
+++ /dev/null
@@ -1,67 +0,0 @@
-#==============================================================================
-# Macros file for NAVYDSRC gordon, gnu compiler
-#==============================================================================
-
-CPP        := ftn -E
-CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
-CFLAGS     := -c
-
-FIXEDFLAGS := -ffixed-line-length-132
-FREEFLAGS  := -ffree-form
-FFLAGS     := -fconvert=big-endian -fbacktrace -ffree-line-length-none
-FFLAGS_NOOPT:= -O0
-
-ifeq ($(ICE_BLDDEBUG), true)
-  FFLAGS   += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow
-  CFLAGS   += -O0
-endif
-
-ifeq ($(ICE_COVERAGE), true)
-  FFLAGS   += -O0 -g -fprofile-arcs -ftest-coverage
-  CFLAGS   += -O0 -g -coverage
-  LDFLAGS  += -g -ftest-coverage -fprofile-arcs
-endif
-
-ifneq ($(ICE_BLDDEBUG), true)
-ifneq ($(ICE_COVERAGE), true)
-  FFLAGS   += -O2
-  CFLAGS   += -O2
-endif
-endif
-
-SCC   := cc 
-SFC   := ftn
-MPICC := cc
-MPIFC := ftn
-
-ifeq ($(ICE_COMMDIR), mpi)
-  FC := $(MPIFC)
-  CC := $(MPICC)
-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 += -fopenmp
-   CFLAGS += -fopenmp
-   FFLAGS += -fopenmp
-endif
-
diff --git a/configuration/scripts/machines/Macros.gordon_intel b/configuration/scripts/machines/Macros.gordon_intel
deleted file mode 100644
index 84659d00a..000000000
--- a/configuration/scripts/machines/Macros.gordon_intel
+++ /dev/null
@@ -1,55 +0,0 @@
-#==============================================================================
-# Macros file for NAVYDSRC gordon, 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   := cc 
-SFC   := ftn
-MPICC := cc
-MPIFC := ftn
-
-ifeq ($(ICE_COMMDIR), mpi)
-  FC := $(MPIFC)
-  CC := $(MPICC)
-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/Macros.gordon_pgi b/configuration/scripts/machines/Macros.gordon_pgi
deleted file mode 100644
index 1190f6eca..000000000
--- a/configuration/scripts/machines/Macros.gordon_pgi
+++ /dev/null
@@ -1,55 +0,0 @@
-#==============================================================================
-# Macros file for NAVYDSRC gordon, pgi compiler
-#==============================================================================
-
-CPP        := pgcc -Mcpp
-CPPDEFS    := -DFORTRANUNDERSCORE -DNO_R16 ${ICE_CPPDEFS}
-CFLAGS     := -c -O2 -Kieee
-
-FIXEDFLAGS := -Mextend
-FREEFLAGS  := -Mfree
-FFLAGS     := -Kieee -Mbyteswapio -traceback 
-FFLAGS_NOOPT:= -O0
-
-ifeq ($(ICE_BLDDEBUG), true)
-  FFLAGS     += -O0 -g -Mbounds -Mchkptr
-else
-  FFLAGS     += -O -g
-endif
-
-SCC   := cc 
-SFC   := ftn
-MPICC := cc
-MPIFC := ftn
-
-ifeq ($(ICE_COMMDIR), mpi)
-  FC := $(MPIFC)
-  CC := $(MPICC)
-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 += -mp
-   CFLAGS += -mp
-   FFLAGS += -mp
-endif
-
diff --git a/configuration/scripts/machines/env.banting_gnu b/configuration/scripts/machines/env.banting_gnu
index 0c0a4abce..997816a9d 100755
--- a/configuration/scripts/machines/env.banting_gnu
+++ b/configuration/scripts/machines/env.banting_gnu
@@ -19,6 +19,9 @@ module load cray-netcdf # NetCDF
 module load cray-hdf5 # HDF5
 setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesystem
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
 
 setenv ICE_MACHINE_MACHNAME banting
diff --git a/configuration/scripts/machines/env.banting_intel b/configuration/scripts/machines/env.banting_intel
index ac01e4d72..0beeb2618 100755
--- a/configuration/scripts/machines/env.banting_intel
+++ b/configuration/scripts/machines/env.banting_intel
@@ -14,6 +14,9 @@ module load cray-netcdf # NetCDF
 module load cray-hdf5 # HDF5
 setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesystem
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
 
 setenv ICE_MACHINE_MACHNAME banting
diff --git a/configuration/scripts/machines/env.cesium_intel b/configuration/scripts/machines/env.cesium_intel
index 19209919e..8dabe1645 100755
--- a/configuration/scripts/machines/env.cesium_intel
+++ b/configuration/scripts/machines/env.cesium_intel
@@ -6,6 +6,9 @@ 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)
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 setenv ICE_MACHINE_MACHNAME cesium
 setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE colormake-short
diff --git a/configuration/scripts/machines/env.cheyenne_gnu b/configuration/scripts/machines/env.cheyenne_gnu
index e731b8634..1b79c7f3b 100755
--- a/configuration/scripts/machines/env.cheyenne_gnu
+++ b/configuration/scripts/machines/env.cheyenne_gnu
@@ -40,6 +40,8 @@ endif
 
 limit coredumpsize unlimited
 limit stacksize unlimited
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
 
 setenv ICE_MACHINE_MACHNAME cheyenne
 setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
diff --git a/configuration/scripts/machines/env.cheyenne_intel b/configuration/scripts/machines/env.cheyenne_intel
index c8cc06523..f469b3585 100755
--- a/configuration/scripts/machines/env.cheyenne_intel
+++ b/configuration/scripts/machines/env.cheyenne_intel
@@ -40,6 +40,8 @@ endif
 
 limit coredumpsize unlimited
 limit stacksize unlimited
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
 
 setenv ICE_MACHINE_MACHNAME cheyenne
 setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
diff --git a/configuration/scripts/machines/env.cheyenne_pgi b/configuration/scripts/machines/env.cheyenne_pgi
index 1510d64ad..b5cf11a51 100755
--- a/configuration/scripts/machines/env.cheyenne_pgi
+++ b/configuration/scripts/machines/env.cheyenne_pgi
@@ -40,6 +40,8 @@ endif
 
 limit coredumpsize unlimited
 limit stacksize unlimited
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
 
 setenv ICE_MACHINE_MACHNAME cheyenne
 setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
diff --git a/configuration/scripts/machines/env.compy_intel b/configuration/scripts/machines/env.compy_intel
index fe3511aa6..6fc273204 100755
--- a/configuration/scripts/machines/env.compy_intel
+++ b/configuration/scripts/machines/env.compy_intel
@@ -23,6 +23,9 @@ setenv I_MPI_ADJUST_ALLREDUCE 1
 limit coredumpsize unlimited
 limit stacksize unlimited
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
 
 setenv ICE_MACHINE_MACHNAME compy
diff --git a/configuration/scripts/machines/env.conda_linux b/configuration/scripts/machines/env.conda_linux
index 08cf27724..ae6ea1b79 100755
--- a/configuration/scripts/machines/env.conda_linux
+++ b/configuration/scripts/machines/env.conda_linux
@@ -24,6 +24,9 @@ if $status then
   exit 1
 endif
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
 
 setenv ICE_MACHINE_MACHNAME conda
diff --git a/configuration/scripts/machines/env.conda_macos b/configuration/scripts/machines/env.conda_macos
index e33eee710..3b3537bf7 100755
--- a/configuration/scripts/machines/env.conda_macos
+++ b/configuration/scripts/machines/env.conda_macos
@@ -24,6 +24,9 @@ if $status then
   exit 1
 endif
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
 
 setenv ICE_MACHINE_MACHNAME conda
diff --git a/configuration/scripts/machines/env.conrad_cray b/configuration/scripts/machines/env.conrad_cray
deleted file mode 100755
index 62549a738..000000000
--- a/configuration/scripts/machines/env.conrad_cray
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/csh -f
-
-set inp = "undefined"
-if ($#argv == 1) then
-  set inp = $1
-endif
-
-if ("$inp" != "-nomodules") then
-
-source /opt/modules/default/init/csh
-
-module unload PrgEnv-cray
-module unload PrgEnv-gnu
-module unload PrgEnv-intel
-module unload PrgEnv-pgi
-module load PrgEnv-cray/5.2.82
-
-module unload cce
-module load cce/8.5.8
-
-module unload cray-mpich
-module unload cray-mpich2
-module load cray-mpich/7.5.3
-
-module unload netcdf
-module unload cray-netcdf
-module unload cray-hdf5
-module unload cray-hdf5-parallel
-module unload cray-netcdf-hdf5parallel
-module unload cray-parallel-netcdf
-module load cray-netcdf/4.4.1.1
-module load cray-hdf5/1.10.0.1
-
-module unload cray-libsci
-
-module load craype-haswell
-
-setenv NETCDF_PATH ${NETCDF_DIR}
-limit coredumpsize unlimited
-limit stacksize unlimited
-
-endif
-
-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
-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_BLDTHRDS 4
-setenv ICE_MACHINE_QSTAT "qstat "
diff --git a/configuration/scripts/machines/env.conrad_gnu b/configuration/scripts/machines/env.conrad_gnu
deleted file mode 100755
index f14ee33a5..000000000
--- a/configuration/scripts/machines/env.conrad_gnu
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/csh -f
-
-set inp = "undefined"
-if ($#argv == 1) then
-  set inp = $1
-endif
-
-if ("$inp" != "-nomodules") then
-
-source /opt/modules/default/init/csh
-
-module unload PrgEnv-cray
-module unload PrgEnv-gnu
-module unload PrgEnv-intel
-module unload PrgEnv-pgi
-module load PrgEnv-gnu/5.2.82
-
-module unload gcc
-module load gcc/6.3.0
-
-module unload cray-mpich
-module unload cray-mpich2
-module load cray-mpich/7.5.3
-
-module unload netcdf
-module unload cray-netcdf
-module unload cray-hdf5
-module unload cray-hdf5-parallel
-module unload cray-netcdf-hdf5parallel
-module unload cray-parallel-netcdf
-module load cray-netcdf/4.4.1.1
-module load cray-hdf5/1.10.0.1
-
-module unload cray-libsci
-
-module load craype-haswell
-
-setenv NETCDF_PATH ${NETCDF_DIR}
-limit coredumpsize unlimited
-limit stacksize unlimited
-
-endif
-
-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
-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_BLDTHRDS 4 
-setenv ICE_MACHINE_QSTAT "qstat "
-
-# For lcov
-set lcovpath = "/p/home/apcraig/bin"
-set lcovp5l  = "/p/home/apcraig/usr/lib/perl5/site_perl/5.10.0/x86_64-linux-thread-multi"
-
-if ($?PATH) then
-  if ("$PATH" !~ "*${lcovpath}*") then
-    setenv PATH ${PATH}:$lcovpath
-  endif
-else
-  setenv PATH $lcovpath
-endif
-
-if ($?PERL5LIB) then
-  if ("$PERL5LIB" !~ "*${lcovp5l}*") then
-    setenv PERL5LIB ${PERL5LIB}:$lcovp5l
-  endif
-else
-  setenv PERL5LIB $lcovp5l
-endif
diff --git a/configuration/scripts/machines/env.conrad_intel b/configuration/scripts/machines/env.conrad_intel
deleted file mode 100755
index e37ce4b1f..000000000
--- a/configuration/scripts/machines/env.conrad_intel
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/csh -f
-
-set inp = "undefined"
-if ($#argv == 1) then
-  set inp = $1
-endif
-
-if ("$inp" != "-nomodules") then
-
-source /opt/modules/default/init/csh
-
-module unload PrgEnv-cray
-module unload PrgEnv-gnu
-module unload PrgEnv-intel
-module unload PrgEnv-pgi
-module load PrgEnv-intel/5.2.40
-
-module unload intel
-module load intel/17.0.2.174
-
-module unload cray-mpich
-module unload cray-mpich2
-module load cray-mpich/7.3.2
-
-module unload netcdf
-module unload cray-netcdf
-module unload cray-hdf5
-module unload cray-hdf5-parallel
-module unload cray-netcdf-hdf5parallel
-module unload cray-parallel-netcdf
-module load cray-netcdf/4.3.2
-module load cray-hdf5/1.8.13
-
-module unload cray-libsci
-
-module load craype-haswell
-
-setenv NETCDF_PATH ${NETCDF_DIR}
-limit coredumpsize unlimited
-limit stacksize unlimited
-
-endif
-
-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
-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_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.conrad_pgi b/configuration/scripts/machines/env.conrad_pgi
deleted file mode 100755
index 2e82ea34f..000000000
--- a/configuration/scripts/machines/env.conrad_pgi
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/csh -f
-
-set inp = "undefined"
-if ($#argv == 1) then
-  set inp = $1
-endif
-
-if ("$inp" != "-nomodules") then
-
-source /opt/modules/default/init/csh
-
-module unload PrgEnv-cray
-module unload PrgEnv-gnu
-module unload PrgEnv-intel
-module unload PrgEnv-pgi
-module load PrgEnv-pgi/5.2.82
-
-module unload pgi
-module load pgi/16.10.0
-
-module unload cray-mpich
-module unload cray-mpich2
-module load cray-mpich/7.5.3
-
-module unload netcdf
-module unload cray-netcdf
-module unload cray-hdf5
-module unload cray-hdf5-parallel
-module unload cray-netcdf-hdf5parallel
-module unload cray-parallel-netcdf
-module load cray-netcdf/4.4.1.1
-module load cray-hdf5/1.10.0.1
-
-module unload cray-libsci
-
-module load craype-haswell
-
-setenv NETCDF_PATH ${NETCDF_DIR}
-limit coredumpsize unlimited
-limit stacksize unlimited
-
-endif
-
-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
-setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
-setenv ICE_MACHINE_SUBMIT "qsub "
-setenv ICE_MACHINE_ACCT ARLAP96070PET
-setenv ICE_MACHINE_QUEUE "debug"
-setenv ICE_MACHINE_TPNODE 32    # tasks per node
-setenv ICE_MACHINE_BLDTHRDS 4
-setenv ICE_MACHINE_QSTAT "qstat "
diff --git a/configuration/scripts/machines/env.daley_gnu b/configuration/scripts/machines/env.daley_gnu
index b1e379eb0..25b438e8e 100755
--- a/configuration/scripts/machines/env.daley_gnu
+++ b/configuration/scripts/machines/env.daley_gnu
@@ -19,6 +19,9 @@ module load cray-netcdf # NetCDF
 module load cray-hdf5 # HDF5
 setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesystem
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
 
 setenv ICE_MACHINE_MACHNAME daley
diff --git a/configuration/scripts/machines/env.daley_intel b/configuration/scripts/machines/env.daley_intel
index 502c71037..49178365b 100755
--- a/configuration/scripts/machines/env.daley_intel
+++ b/configuration/scripts/machines/env.daley_intel
@@ -14,6 +14,9 @@ module load cray-netcdf # NetCDF
 module load cray-hdf5 # HDF5
 setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesystem
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
 
 setenv ICE_MACHINE_MACHNAME daley
diff --git a/configuration/scripts/machines/env.fram_intel b/configuration/scripts/machines/env.fram_intel
index a7b141479..98edb3a66 100755
--- a/configuration/scripts/machines/env.fram_intel
+++ b/configuration/scripts/machines/env.fram_intel
@@ -7,6 +7,9 @@ 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)
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 setenv ICE_MACHINE_MACHNAME fram
 setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE make
diff --git a/configuration/scripts/machines/env.gaea_intel b/configuration/scripts/machines/env.gaea_intel
index d143270d7..e204c6fff 100755
--- a/configuration/scripts/machines/env.gaea_intel
+++ b/configuration/scripts/machines/env.gaea_intel
@@ -16,6 +16,9 @@ module load cray-netcdf
 module load PrgEnv-intel/6.0.5
 module list
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
  
 setenv ICE_MACHINE_MACHNAME gaea
diff --git a/configuration/scripts/machines/env.gordon_cray b/configuration/scripts/machines/env.gordon_cray
deleted file mode 100755
index d8c392d60..000000000
--- a/configuration/scripts/machines/env.gordon_cray
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/csh -f
-
-set inp = "undefined"
-if ($#argv == 1) then
-  set inp = $1
-endif
-
-if ("$inp" != "-nomodules") then
-
-source /opt/modules/default/init/csh
-
-module unload PrgEnv-cray
-module unload PrgEnv-gnu
-module unload PrgEnv-intel
-module unload PrgEnv-pgi
-module load PrgEnv-cray/5.2.82
-
-module unload cce
-module load cce/8.5.8
-
-module unload cray-mpich
-module unload cray-mpich2
-module load cray-mpich/7.5.3
-
-module unload netcdf
-module unload cray-netcdf
-module unload cray-hdf5
-module unload cray-hdf5-parallel
-module unload cray-netcdf-hdf5parallel
-module unload cray-parallel-netcdf
-module load cray-netcdf/4.4.1.1
-module load cray-hdf5/1.10.0.1
-
-module unload cray-libsci
-
-module load craype-haswell
-
-setenv NETCDF_PATH ${NETCDF_DIR}
-limit coredumpsize unlimited
-limit stacksize unlimited
-
-endif
-
-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
-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_BLDTHRDS 4
-setenv ICE_MACHINE_QSTAT "qstat "
diff --git a/configuration/scripts/machines/env.gordon_gnu b/configuration/scripts/machines/env.gordon_gnu
deleted file mode 100755
index d17923bd3..000000000
--- a/configuration/scripts/machines/env.gordon_gnu
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/csh -f
-
-set inp = "undefined"
-if ($#argv == 1) then
-  set inp = $1
-endif
-
-if ("$inp" != "-nomodules") then
-
-source /opt/modules/default/init/csh
-
-module unload PrgEnv-cray
-module unload PrgEnv-gnu
-module unload PrgEnv-intel
-module unload PrgEnv-pgi
-module load PrgEnv-gnu/5.2.82
-
-module unload gcc
-module load gcc/6.3.0
-
-module unload cray-mpich
-module unload cray-mpich2
-module load cray-mpich/7.5.3
-
-module unload netcdf
-module unload cray-netcdf
-module unload cray-hdf5
-module unload cray-hdf5-parallel
-module unload cray-netcdf-hdf5parallel
-module unload cray-parallel-netcdf
-module load cray-netcdf/4.4.1.1
-module load cray-hdf5/1.10.0.1
-
-module unload cray-libsci
-
-module load craype-haswell
-
-setenv NETCDF_PATH ${NETCDF_DIR}
-limit coredumpsize unlimited
-limit stacksize unlimited
-
-endif
-
-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
-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_BLDTHRDS 4 
-setenv ICE_MACHINE_QSTAT "qstat "
diff --git a/configuration/scripts/machines/env.gordon_intel b/configuration/scripts/machines/env.gordon_intel
deleted file mode 100755
index 67aaa9c69..000000000
--- a/configuration/scripts/machines/env.gordon_intel
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/csh -f
-
-set inp = "undefined"
-if ($#argv == 1) then
-  set inp = $1
-endif
-
-if ("$inp" != "-nomodules") then
-
-source /opt/modules/default/init/csh
-
-module unload PrgEnv-cray
-module unload PrgEnv-gnu
-module unload PrgEnv-intel
-module unload PrgEnv-pgi
-module load PrgEnv-intel/5.2.40
-
-module unload intel
-module load intel/17.0.2.174
-
-module unload cray-mpich
-module unload cray-mpich2
-module load cray-mpich/7.3.2
-
-module unload netcdf
-module unload cray-netcdf
-module unload cray-hdf5
-module unload cray-hdf5-parallel
-module unload cray-netcdf-hdf5parallel
-module unload cray-parallel-netcdf
-module load cray-netcdf/4.3.2
-module load cray-hdf5/1.8.13
-
-module unload cray-libsci
-
-module load craype-haswell
-
-setenv NETCDF_PATH ${NETCDF_DIR}
-limit coredumpsize unlimited
-limit stacksize unlimited
-
-endif
-
-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
-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_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
deleted file mode 100755
index 5885afb4b..000000000
--- a/configuration/scripts/machines/env.gordon_pgi
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/csh -f
-
-set inp = "undefined"
-if ($#argv == 1) then
-  set inp = $1
-endif
-
-if ("$inp" != "-nomodules") then
-
-source /opt/modules/default/init/csh
-
-module unload PrgEnv-cray
-module unload PrgEnv-gnu
-module unload PrgEnv-intel
-module unload PrgEnv-pgi
-module load PrgEnv-pgi/5.2.82
-
-module unload pgi
-module load pgi/16.10.0
-
-module unload cray-mpich
-module unload cray-mpich2
-module load cray-mpich/7.5.3
-
-module unload netcdf
-module unload cray-netcdf
-module unload cray-hdf5
-module unload cray-hdf5-parallel
-module unload cray-netcdf-hdf5parallel
-module unload cray-parallel-netcdf
-module load cray-netcdf/4.4.1.1
-module load cray-hdf5/1.10.0.1
-
-module unload cray-libsci
-
-module load craype-haswell
-
-setenv NETCDF_PATH ${NETCDF_DIR}
-limit coredumpsize unlimited
-limit stacksize unlimited
-
-endif
-
-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
-setenv ICE_MACHINE_BASELINE $WORKDIR/CICE_BASELINE
-setenv ICE_MACHINE_SUBMIT "qsub "
-setenv ICE_MACHINE_ACCT ARLAP96070PET
-setenv ICE_MACHINE_QUEUE "debug"
-setenv ICE_MACHINE_TPNODE 32    # tasks per node
-setenv ICE_MACHINE_BLDTHRDS 4
-setenv ICE_MACHINE_QSTAT "qstat "
diff --git a/configuration/scripts/machines/env.hera_intel b/configuration/scripts/machines/env.hera_intel
index 7330c3937..a9cf59516 100755
--- a/configuration/scripts/machines/env.hera_intel
+++ b/configuration/scripts/machines/env.hera_intel
@@ -15,6 +15,9 @@ module load impi/2018.0.4
 module load netcdf/4.7.0
 #module list
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
  
 setenv ICE_MACHINE_MACHNAME hera
diff --git a/configuration/scripts/machines/env.high_Sierra_gnu b/configuration/scripts/machines/env.high_Sierra_gnu
index 3845a91aa..0bd31181b 100755
--- a/configuration/scripts/machines/env.high_Sierra_gnu
+++ b/configuration/scripts/machines/env.high_Sierra_gnu
@@ -1,5 +1,8 @@
 #!/bin/csh -f
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 setenv ICE_MACHINE_MACHNAME high_Sierra
 setenv ICE_MACHINE_ENVNAME gnu
 setenv ICE_MACHINE_MAKE make
diff --git a/configuration/scripts/machines/env.hobart_intel b/configuration/scripts/machines/env.hobart_intel
index 2ab7a3c53..0b6c5b12c 100755
--- a/configuration/scripts/machines/env.hobart_intel
+++ b/configuration/scripts/machines/env.hobart_intel
@@ -12,6 +12,9 @@ source /usr/share/Modules/init/csh
 module purge
 module load compiler/intel/18.0.3
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
 
 setenv ICE_MACHINE_MACHNAME hobart
diff --git a/configuration/scripts/machines/env.hobart_nag b/configuration/scripts/machines/env.hobart_nag
index cae8c0fd8..6d22beca9 100755
--- a/configuration/scripts/machines/env.hobart_nag
+++ b/configuration/scripts/machines/env.hobart_nag
@@ -12,6 +12,9 @@ source /usr/share/Modules/init/csh
 module purge
 module load compiler/nag/6.2
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
 
 setenv ICE_MACHINE_MACHNAME hobart
diff --git a/configuration/scripts/machines/env.koehr_intel b/configuration/scripts/machines/env.koehr_intel
index f4d7cada2..6c1fc6811 100755
--- a/configuration/scripts/machines/env.koehr_intel
+++ b/configuration/scripts/machines/env.koehr_intel
@@ -25,6 +25,9 @@ setenv KMP_AFFINITY disabled
 limit coredumpsize unlimited
 limit stacksize unlimited
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
 
 setenv ICE_MACHINE_MACHNAME koehr
diff --git a/configuration/scripts/machines/env.millikan_intel b/configuration/scripts/machines/env.millikan_intel
index 63913166d..c0a7356ad 100755
--- a/configuration/scripts/machines/env.millikan_intel
+++ b/configuration/scripts/machines/env.millikan_intel
@@ -6,6 +6,9 @@ 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)
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 setenv ICE_MACHINE_MACHNAME millikan
 setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE make
diff --git a/configuration/scripts/machines/env.orion_intel b/configuration/scripts/machines/env.orion_intel
index 95850b6bb..bdfccdd60 100755
--- a/configuration/scripts/machines/env.orion_intel
+++ b/configuration/scripts/machines/env.orion_intel
@@ -22,6 +22,9 @@ echo "  module load netcdf/4.7.2"
 #module load netcdf/4.7.2
 ##module list
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 endif
  
 setenv ICE_MACHINE_MACHNAME orion
diff --git a/configuration/scripts/machines/env.phase3_intel b/configuration/scripts/machines/env.phase3_intel
index af8dd3e5f..f5e3e4584 100755
--- a/configuration/scripts/machines/env.phase3_intel
+++ b/configuration/scripts/machines/env.phase3_intel
@@ -13,6 +13,9 @@ module load NetCDF/4.5.0
 module load ESMF/7_1_0r
 module list
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 setenv ICE_MACHINE_MACHNAME phase3
 setenv ICE_MACHINE_ENVNAME intel
 setenv ICE_MACHINE_MAKE gmake
diff --git a/configuration/scripts/machines/env.testmachine_intel b/configuration/scripts/machines/env.testmachine_intel
index 5b52f1b07..b6f7c329e 100755
--- a/configuration/scripts/machines/env.testmachine_intel
+++ b/configuration/scripts/machines/env.testmachine_intel
@@ -1,5 +1,8 @@
 #!/bin/csh -f
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 setenv ICE_MACHINE_MACHNAME testmachine
 setenv ICE_MACHINE_MACHINFO "Undefined"
 setenv ICE_MACHINE_ENVNAME intel
diff --git a/configuration/scripts/machines/env.travisCI_gnu b/configuration/scripts/machines/env.travisCI_gnu
index b7a1b6176..aa3c1eec7 100755
--- a/configuration/scripts/machines/env.travisCI_gnu
+++ b/configuration/scripts/machines/env.travisCI_gnu
@@ -1,5 +1,8 @@
 #!/bin/csh -f
 
+# May be needed for OpenMP memory
+#setenv OMP_STACKSIZE 64M
+
 setenv ICE_MACHINE_MACHNAME travisCI
 setenv ICE_MACHINE_MACHINFO "Cloud Computing"
 setenv ICE_MACHINE_ENVNAME gnu
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 099f65403..8b9aecaa6 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -54,7 +54,7 @@
 
 # General information about the project.
 project = u'CICE'
-copyright = u'2021, Triad National Security, LLC (code) and National Center for Atmospheric Research (documentation)'
+copyright = u'2022, Triad National Security, LLC (code) and National Center for Atmospheric Research (documentation)'
 author = u'CICE-Consortium'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'6.3.0' 
+version = u'6.3.1' 
 # The full version, including alpha/beta/rc tags.
-version = u'6.3.0' 
+version = u'6.3.1' 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/source/intro/copyright.rst b/doc/source/intro/copyright.rst
index f09f6c58d..86b15b8d2 100644
--- a/doc/source/intro/copyright.rst
+++ b/doc/source/intro/copyright.rst
@@ -5,7 +5,7 @@
 Copyright
 =============================
 
-© Copyright 2021, Triad National Security LLC. All rights reserved.
+© Copyright 2022, Triad National Security LLC. All rights reserved.
 This software was produced under U.S. Government contract 
 89233218CNA000001 for Los Alamos National Laboratory (LANL), which is
 operated by Triad National Security, LLC for the U.S. Department
diff --git a/icepack b/icepack
index 152bd701e..76ecd418d 160000
--- a/icepack
+++ b/icepack
@@ -1 +1 @@
-Subproject commit 152bd701e0cf3ec4385e5ce81918ba94e7a791cb
+Subproject commit 76ecd418d2efad7e74fe35c4ec85f0830923bda6