diff --git a/configuration/scripts/machines/Macros.cheyenne_gnu b/configuration/scripts/machines/Macros.cheyenne_gnu
index 5d3859ec8..c83f71567 100644
--- a/configuration/scripts/machines/Macros.cheyenne_gnu
+++ b/configuration/scripts/machines/Macros.cheyenne_gnu
@@ -57,7 +57,7 @@ LIB_NETCDF := $(NETCDF_PATH)/lib
 #LIB_PNETCDF := $(PNETCDF_PATH)/lib
 LIB_MPI := $(IMPILIBDIR)
 
-#SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
+#SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf
 SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
 
 ifeq ($(ICE_THREADED), true) 
@@ -72,8 +72,8 @@ ifeq ($(ICE_IOTYPE), pio1)
 endif
 
 ifeq ($(ICE_IOTYPE), pio2)
-   CPPDEFS := $(CPPDEFS) -DGPTL
+   CPPDEFS := $(CPPDEFS)
    LIB_PIO := $(PIO_LIBDIR)
-   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc -lgptl
+   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc
 endif
 
diff --git a/configuration/scripts/machines/Macros.cheyenne_intel b/configuration/scripts/machines/Macros.cheyenne_intel
index 6fb3a002a..b1726558d 100644
--- a/configuration/scripts/machines/Macros.cheyenne_intel
+++ b/configuration/scripts/machines/Macros.cheyenne_intel
@@ -46,7 +46,7 @@ LIB_NETCDF := $(NETCDF_PATH)/lib
 #LIB_PNETCDF := $(PNETCDF_PATH)/lib
 LIB_MPI := $(IMPILIBDIR)
 
-#SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
+#SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf
 SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
 
 ifeq ($(ICE_THREADED), true) 
@@ -61,8 +61,8 @@ ifeq ($(ICE_IOTYPE), pio1)
 endif
 
 ifeq ($(ICE_IOTYPE), pio2)
-   CPPDEFS := $(CPPDEFS) -DGPTL
+   CPPDEFS := $(CPPDEFS)
    LIB_PIO := $(PIO_LIBDIR)
-   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc -lgptl
+   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc
 endif
 
diff --git a/configuration/scripts/machines/Macros.cheyenne_pgi b/configuration/scripts/machines/Macros.cheyenne_pgi
index c1a8a0465..2e2fd5291 100644
--- a/configuration/scripts/machines/Macros.cheyenne_pgi
+++ b/configuration/scripts/machines/Macros.cheyenne_pgi
@@ -45,7 +45,7 @@ LIB_NETCDF := $(NETCDF_PATH)/lib
 #LIB_PNETCDF := $(PNETCDF_PATH)/lib
 LIB_MPI := $(IMPILIBDIR)
 
-#SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
+#SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf
 SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
 
 ifeq ($(ICE_THREADED), true) 
@@ -60,8 +60,8 @@ ifeq ($(ICE_IOTYPE), pio1)
 endif
 
 ifeq ($(ICE_IOTYPE), pio2)
-   CPPDEFS := $(CPPDEFS) -DGPTL
+   CPPDEFS := $(CPPDEFS)
    LIB_PIO := $(PIO_LIBDIR)
-   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc -lgptl
+   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc
 endif
 
diff --git a/configuration/scripts/machines/Macros.derecho_cray b/configuration/scripts/machines/Macros.derecho_cray
new file mode 100644
index 000000000..d90c7f984
--- /dev/null
+++ b/configuration/scripts/machines/Macros.derecho_cray
@@ -0,0 +1,66 @@
+#==============================================================================
+# Macros file for NCAR derecho, cray compiler
+#==============================================================================
+
+CPP        := ftn -e P
+CPPDEFS    := -DFORTRANUNDERSCORE -DNO_R16 ${ICE_CPPDEFS}
+CFLAGS     := -c -O2
+
+FIXEDFLAGS := -132
+FREEFLAGS  := 
+FFLAGS     := -hbyteswapio
+FFLAGS_NOOPT:= -O0
+LDFLAGS    := -hbyteswapio
+ 
+ifeq ($(ICE_BLDDEBUG), true)
+  FFLAGS     += -O0 -hfp0 -g -Rbcdps -Ktrap=fp
+else
+  FFLAGS     += -O2 -hfp0     # -eo
+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)
+
+#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs 
+
+#INCLDIR := $(INCLDIR)
+#INCLDIR += -I$(NETCDF_PATH)/include
+
+LIB_NETCDF := $(NETCDF)/lib
+##LIB_PNETCDF := $(PNETCDF_PATH)/lib
+
+SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
+
+ifeq ($(ICE_THREADED), true) 
+   LDFLAGS += -fopenmp
+   CFLAGS += -fopenmp
+   FFLAGS += -fopenmp
+else
+   LDFLAGS += -hnoomp
+#   CFLAGS += -hnoomp
+   FFLAGS += -hnoomp
+endif
+
+ifeq ($(ICE_IOTYPE), pio1)
+   LIB_PIO := $(PIO)/lib
+   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpio
+endif
+
+ifeq ($(ICE_IOTYPE), pio2)
+   LIB_PIO := $(PIO)/lib
+   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc
+endif
diff --git a/configuration/scripts/machines/Macros.derecho_gnu b/configuration/scripts/machines/Macros.derecho_gnu
new file mode 100644
index 000000000..e42e06f06
--- /dev/null
+++ b/configuration/scripts/machines/Macros.derecho_gnu
@@ -0,0 +1,75 @@
+#==============================================================================
+# Makefile macros for NCAR derecho, 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 -fallow-argument-mismatch
+FFLAGS_NOOPT:= -O0
+
+ifeq ($(ICE_BLDDEBUG), true)
+  FFLAGS   += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow --std f2008
+#  FFLAGS   += -O0 -g -fcheck=all -finit-real=snan -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   := gcc 
+SFC   := gfortran
+MPICC := mpicc
+MPIFC := mpif90
+
+ifeq ($(ICE_COMMDIR), mpi)
+  FC := $(MPIFC)
+  CC := $(MPICC)
+else
+  FC := $(SFC)
+  CC := $(SCC)
+endif
+LD:= $(FC)
+
+NETCDF_PATH := $(NETCDF)
+
+#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs 
+
+#INCLDIR := $(INCLDIR)
+
+LIB_NETCDF := $(NETCDF_PATH)/lib
+#LIB_PNETCDF := $(PNETCDF_PATH)/lib
+#LIB_MPI := $(IMPILIBDIR)
+
+#SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf
+SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
+
+ifeq ($(ICE_THREADED), true) 
+   LDFLAGS += -fopenmp 
+   CFLAGS += -fopenmp 
+   FFLAGS += -fopenmp 
+endif
+
+ifeq ($(ICE_IOTYPE), pio1)
+   LIB_PIO := $(PIO)/lib
+   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpio
+endif
+
+ifeq ($(ICE_IOTYPE), pio2)
+   LIB_PIO := $(PIO)/lib
+   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc
+endif
+
diff --git a/configuration/scripts/machines/Macros.derecho_intel b/configuration/scripts/machines/Macros.derecho_intel
index df0d2320e..cd349c57d 100644
--- a/configuration/scripts/machines/Macros.derecho_intel
+++ b/configuration/scripts/machines/Macros.derecho_intel
@@ -1,5 +1,5 @@
 #==============================================================================
-# Makefile macros for NCAR cheyenne, intel compiler
+# Makefile macros for NCAR derecho, intel compiler
 #==============================================================================
 
 CPP        := fpp
@@ -37,14 +37,11 @@ NETCDF_PATH := $(NETCDF)
 
 #PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs
 
-PNETCDF_PATH := $(PNETCDF)
-#PNETCDF_PATH := /glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/lib
+#PNETCDF_PATH := $(PNETCDF)
 
-INCLDIR := $(INCLDIR)
+#INCLDIR := $(INCLDIR)
 
 LIB_NETCDF := $(NETCDF)/lib
-#LIB_PNETCDF := $(PNETCDF_PATH)/lib
-#LIB_MPI := $(IMPILIBDIR)
 
 #SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
 SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
@@ -55,15 +52,11 @@ ifeq ($(ICE_THREADED), true)
    FFLAGS += -qopenmp
 endif
 
-#ifeq ($(ICE_IOTYPE), pio1)
-#   LIB_PIO := $(PIO_LIBDIR)
-#   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpio
-#endif
+ifeq ($(ICE_IOTYPE), pio1)
+   SLIBS   := $(SLIBS) -lpio
+endif
 
 ifeq ($(ICE_IOTYPE), pio2)
-#   CPPDEFS := $(CPPDEFS) -DGPTL
-#   LIB_PIO := $(PIO_LIBDIR)
-#   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc -lgptl
    SLIBS   := $(SLIBS) -lpiof -lpioc
 endif
 
diff --git a/configuration/scripts/machines/Macros.derecho_intelclassic b/configuration/scripts/machines/Macros.derecho_intelclassic
new file mode 100644
index 000000000..e0ffd44e4
--- /dev/null
+++ b/configuration/scripts/machines/Macros.derecho_intelclassic
@@ -0,0 +1,62 @@
+#==============================================================================
+# Makefile macros for NCAR derecho, intel compiler
+#==============================================================================
+
+CPP        := fpp
+CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
+CFLAGS     := -c -O2 -fp-model precise -march=core-avx2
+
+FIXEDFLAGS := -fixed -132
+FREEFLAGS  := -free
+FFLAGS     := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -march=core-avx2
+FFLAGS_NOOPT:= -O0
+
+ifeq ($(ICE_BLDDEBUG), true)
+  FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -link_mpi=dbg
+#  FFLAGS     += -O0 -g -check all -fpe0 -ftrapuv -fp-model except -check noarg_temp_created -link_mpi=dbg -stand f08
+#  FFLAGS     += -O0 -g -check all -fpe0 -ftrapuv -fp-model except -check noarg_temp_created -init=snan,arrays -link_mpi=dbg
+else
+  FFLAGS     += -O2
+endif
+
+SCC   := icc
+SFC   := ifort
+MPICC := mpicc
+MPIFC := mpif90
+
+ifeq ($(ICE_COMMDIR), mpi)
+  FC := $(MPIFC)
+  CC := $(MPICC)
+else
+  FC := $(SFC)
+  CC := $(SCC)
+endif
+LD:= $(FC)
+
+NETCDF_PATH := $(NETCDF)
+
+#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs
+
+#PNETCDF_PATH := $(PNETCDF)
+
+#INCLDIR := $(INCLDIR)
+
+LIB_NETCDF := $(NETCDF)/lib
+
+#SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
+SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
+
+ifeq ($(ICE_THREADED), true)
+   LDFLAGS += -qopenmp
+   CFLAGS += -qopenmp
+   FFLAGS += -qopenmp
+endif
+
+ifeq ($(ICE_IOTYPE), pio1)
+   SLIBS   := $(SLIBS) -lpio
+endif
+
+ifeq ($(ICE_IOTYPE), pio2)
+   SLIBS   := $(SLIBS) -lpiof -lpioc
+endif
+
diff --git a/configuration/scripts/machines/Macros.derecho_inteloneapi b/configuration/scripts/machines/Macros.derecho_inteloneapi
new file mode 100644
index 000000000..ae6640388
--- /dev/null
+++ b/configuration/scripts/machines/Macros.derecho_inteloneapi
@@ -0,0 +1,62 @@
+#==============================================================================
+# Makefile macros for NCAR derecho, intel compiler
+#==============================================================================
+
+CPP        := fpp
+CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
+CFLAGS     := -c -O2 -fp-model precise -march=core-avx2
+
+FIXEDFLAGS := -fixed -132
+FREEFLAGS  := -free
+FFLAGS     := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -march=core-avx2
+FFLAGS_NOOPT:= -O0
+
+ifeq ($(ICE_BLDDEBUG), true)
+  FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -link_mpi=dbg
+#  FFLAGS     += -O0 -g -check all -fpe0 -ftrapuv -fp-model except -check noarg_temp_created -link_mpi=dbg -stand f08
+#  FFLAGS     += -O0 -g -check all -fpe0 -ftrapuv -fp-model except -check noarg_temp_created -init=snan,arrays -link_mpi=dbg
+else
+  FFLAGS     += -O2
+endif
+
+SCC   := icx
+SFC   := ifx
+MPICC := mpicc
+MPIFC := mpif90
+
+ifeq ($(ICE_COMMDIR), mpi)
+  FC := $(MPIFC)
+  CC := $(MPICC)
+else
+  FC := $(SFC)
+  CC := $(SCC)
+endif
+LD:= $(FC)
+
+NETCDF_PATH := $(NETCDF)
+
+#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs
+
+#PNETCDF_PATH := $(PNETCDF)
+
+#INCLDIR := $(INCLDIR)
+
+LIB_NETCDF := $(NETCDF)/lib
+
+#SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
+SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
+
+ifeq ($(ICE_THREADED), true)
+   LDFLAGS += -qopenmp
+   CFLAGS += -qopenmp
+   FFLAGS += -qopenmp
+endif
+
+ifeq ($(ICE_IOTYPE), pio1)
+   SLIBS   := $(SLIBS) -lpio
+endif
+
+ifeq ($(ICE_IOTYPE), pio2)
+   SLIBS   := $(SLIBS) -lpiof -lpioc
+endif
+
diff --git a/configuration/scripts/machines/Macros.derecho_nvhpc b/configuration/scripts/machines/Macros.derecho_nvhpc
new file mode 100644
index 000000000..015010bcd
--- /dev/null
+++ b/configuration/scripts/machines/Macros.derecho_nvhpc
@@ -0,0 +1,68 @@
+#==============================================================================
+# Makefile macros for NCAR derecho, nvhpc compiler
+#==============================================================================
+
+CPP        := nvc -Mcpp
+CPPDEFS    := -DFORTRANUNDERSCORE -DNO_R16 ${ICE_CPPDEFS}
+CFLAGS     := -c -Kieee
+
+FIXEDFLAGS := -Mfixed
+FREEFLAGS  := -Mfree
+FFLAGS     := -Kieee -byteswapio -traceback 
+FFLAGS_NOOPT:= -O0
+
+ifeq ($(ICE_BLDDEBUG), true)
+#  FFLAGS   += -O0 -g -Ktrap=fp -Mbounds -Mchkptr
+#  FFLAGS   += -O0 -g -Ktrap=fp -Mbounds
+#  FFLAGS   += -O0 -Ktrap=fp -Mbounds -Mchkptr
+  FFLAGS   += -O0 -Ktrap=fp
+  CFLAGS   += -O0
+else
+#  FFLAGS   += -O2 -Mnofma -target=zen3
+  FFLAGS   += -O2
+  CFLAGS   += -O2
+endif
+
+SCC   := nvc
+SFC   := nvfortran
+MPICC := mpicc
+MPIFC := mpif90
+
+ifeq ($(ICE_COMMDIR), mpi)
+  FC := $(MPIFC)
+  CC := $(MPICC)
+else
+  FC := $(SFC)
+  CC := $(SCC)
+endif
+LD:= $(FC)
+
+NETCDF_PATH := $(NETCDF)
+
+#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs 
+
+#INCLDIR := $(INCLDIR)
+
+LIB_NETCDF := $(NETCDF_PATH)/lib
+#LIB_PNETCDF := $(PNETCDF_PATH)/lib
+#LIB_MPI := $(IMPILIBDIR)
+
+#SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf
+SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
+
+ifeq ($(ICE_THREADED), true) 
+   LDFLAGS += -mp 
+   CFLAGS += -mp 
+   FFLAGS += -mp 
+endif
+
+ifeq ($(ICE_IOTYPE), pio1)
+   LIB_PIO := $(PIO)/lib
+   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpio
+endif
+
+ifeq ($(ICE_IOTYPE), pio2)
+   LIB_PIO := $(PIO)/lib
+   SLIBS   := $(SLIBS) -L$(LIB_PIO) -lpiof -lpioc
+endif
+
diff --git a/configuration/scripts/machines/env.cheyenne_gnu b/configuration/scripts/machines/env.cheyenne_gnu
index fb29543f8..1c0da68b0 100644
--- a/configuration/scripts/machines/env.cheyenne_gnu
+++ b/configuration/scripts/machines/env.cheyenne_gnu
@@ -7,24 +7,24 @@ endif
 
 if ("$inp" != "-nomodules") then
 
-source /glade/u/apps/ch/opt/lmod/7.2.1/lmod/7.2.1/init/csh
+source ${MODULESHOME}/init/csh
 
 module purge
-module load ncarenv/1.2
-module load gnu/8.3.0
-module load mpt/2.19
+module load ncarenv/1.3
+module load gnu/10.1.0
+module load mpt/2.25
 module load ncarcompilers/0.5.0
-module load netcdf/4.6.3
+module load netcdf/4.8.1
 
 if ($?ICE_IOTYPE) then
 if ($ICE_IOTYPE =~ pio*) then
-  module unload netcdf
-  module load netcdf-mpi/4.6.3
-  module load pnetcdf/1.11.1
+  module load pnetcdf/1.12.2
   if ($ICE_IOTYPE == "pio1") then
     module load pio/1.10.1
   else
-    module load pio/2.4.4
+    module unload netcdf
+    module load netcdf-mpi/4.8.1
+    module load pio/2.5.4
   endif
 endif
 endif
@@ -49,7 +49,7 @@ limit stacksize unlimited
 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_ENVINFO "GNU Fortran (GCC) 10.1.0, mpt2.25, netcdf4.8.1, pnetcdf1.12.2, pio1.10.1, pio2.5.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 2c6eedec6..572460f04 100644
--- a/configuration/scripts/machines/env.cheyenne_intel
+++ b/configuration/scripts/machines/env.cheyenne_intel
@@ -7,24 +7,24 @@ endif
 
 if ("$inp" != "-nomodules") then
 
-source /glade/u/apps/ch/opt/lmod/7.2.1/lmod/7.2.1/init/csh
+source ${MODULESHOME}/init/csh
 
 module purge
-module load ncarenv/1.2
-module load intel/19.0.2
-module load mpt/2.19
+module load ncarenv/1.3
+module load intel/19.1.1
+module load mpt/2.25
 module load ncarcompilers/0.5.0
-module load netcdf/4.6.3
+module load netcdf/4.8.1
 
 if ($?ICE_IOTYPE) then
 if ($ICE_IOTYPE =~ pio*) then
-  module unload netcdf
-  module load netcdf-mpi/4.6.3
-  module load pnetcdf/1.11.1
+  module load pnetcdf/1.12.2
   if ($ICE_IOTYPE == "pio1") then
     module load pio/1.10.1
   else
-    module load pio/2.4.4
+    module unload netcdf
+    module load netcdf-mpi/4.8.1
+    module load pio/2.5.4
   endif
 endif
 endif
@@ -49,7 +49,7 @@ limit stacksize unlimited
 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_ENVINFO "ifort 19.1.1.217 20200306, mpt2.25, netcdf4.8.1, pnetcdf1.12.2, pio1.10.1, pio2.5.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 e6e339f08..2959d12e6 100644
--- a/configuration/scripts/machines/env.cheyenne_pgi
+++ b/configuration/scripts/machines/env.cheyenne_pgi
@@ -7,24 +7,24 @@ endif
 
 if ("$inp" != "-nomodules") then
 
-source /glade/u/apps/ch/opt/lmod/7.2.1/lmod/7.2.1/init/csh
+source ${MODULESHOME}/init/csh
 
 module purge
-module load ncarenv/1.2
-module load pgi/19.9
-module load mpt/2.21
+module load ncarenv/1.3
+module load pgi/20.4
+module load mpt/2.22
 module load ncarcompilers/0.5.0
-module load netcdf/4.7.3
+module load netcdf/4.7.4
 
 if ($?ICE_IOTYPE) then
 if ($ICE_IOTYPE =~ pio*) then
-  module unload netcdf
-  module load netcdf-mpi/4.7.3
-  module load pnetcdf/1.12.1
+  module load pnetcdf/1.12.2
   if ($ICE_IOTYPE == "pio1") then
     module load pio/1.10.1
   else
-    module load pio/2.4.4
+    module unload netcdf
+    module load netcdf-mpi/4.7.4
+    module load pio/2.5.4
   endif
 endif
 endif
@@ -49,7 +49,7 @@ limit stacksize unlimited
 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_ENVINFO "pgf90 20.4-0, mpt2.22, netcdf4.7.4, pnetcdf1.12.2,  pio1.10.1, pio2.5.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.chicoma_intel b/configuration/scripts/machines/env.chicoma_intel
old mode 100755
new mode 100644
diff --git a/configuration/scripts/machines/env.derecho_cray b/configuration/scripts/machines/env.derecho_cray
new file mode 100644
index 000000000..5c4542840
--- /dev/null
+++ b/configuration/scripts/machines/env.derecho_cray
@@ -0,0 +1,72 @@
+#!/bin/csh -f
+
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
+source ${MODULESHOME}/init/csh
+
+module --force purge
+module load ncarenv/23.06
+module load craype
+module load cce/15.0.1
+module load ncarcompilers
+module load cray-mpich/8.1.25
+module load netcdf/4.9.2
+#module load hdf5/1.12.2
+#module load netcdf-mpi/4.9.2
+
+module load cray-libsci/23.02.1.1
+
+if ($?ICE_IOTYPE) then
+if ($ICE_IOTYPE =~ pio*) then
+  module load parallel-netcdf/1.12.3
+  if ($ICE_IOTYPE == "pio1") then
+    module load parallelio/1.10.1
+  else
+    module load parallelio/2.6.1
+  endif
+endif
+endif
+
+if ($?ICE_BFBTYPE) then
+if ($ICE_BFBTYPE =~ qcchk*) then
+  module load conda
+# conda env create -f ../../configuration/scripts/tests/qctest.yml
+  conda activate qctest
+endif
+endif
+
+# For perftools with mpiexec
+# module load perftools-base
+# module load perftools
+#setenv PALS_TRANSFER FALSE
+
+endif
+
+limit coredumpsize unlimited
+limit stacksize unlimited
+setenv PALS_QUIET TRUE
+
+# May be needed for OpenMP memory
+setenv OMP_STACKSIZE 64M
+# OMP runtime diagnostics
+#setenv OMP_DISPLAY_ENV TRUE
+
+setenv ICE_MACHINE_MACHNAME derecho
+setenv ICE_MACHINE_MACHINFO "HPE Cray EX Milan Slingshot 11"
+setenv ICE_MACHINE_ENVNAME cray
+setenv ICE_MACHINE_ENVINFO "cce 15.0.1, cray-mpich 8.1.25, netcdf4.9.2, pnetcdf1.12.3, pio1.10.1, pio2.6.1"
+setenv ICE_MACHINE_MAKE gmake
+setenv ICE_MACHINE_WKDIR /glade/derecho/scratch/$user/CICE_RUNS
+setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev
+setenv ICE_MACHINE_BASELINE /glade/derecho/scratch/$user/CICE_BASELINE
+setenv ICE_MACHINE_SUBMIT "qsub"
+setenv ICE_MACHINE_ACCT P00000000
+setenv ICE_MACHINE_QUEUE "main"
+setenv ICE_MACHINE_TPNODE 128
+setenv ICE_MACHINE_BLDTHRDS 8
+setenv ICE_MACHINE_QSTAT "qstat "
diff --git a/configuration/scripts/machines/env.derecho_gnu b/configuration/scripts/machines/env.derecho_gnu
new file mode 100644
index 000000000..d6378fa05
--- /dev/null
+++ b/configuration/scripts/machines/env.derecho_gnu
@@ -0,0 +1,72 @@
+#!/bin/csh -f
+
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
+source ${MODULESHOME}/init/csh
+
+module --force purge
+module load ncarenv/23.06
+module load craype
+module load gcc/12.2.0
+module load ncarcompilers
+module load cray-mpich/8.1.25
+module load netcdf/4.9.2
+#module load hdf5/1.12.2
+#module load netcdf-mpi/4.9.2
+
+module load cray-libsci/23.02.1.1
+
+if ($?ICE_IOTYPE) then
+if ($ICE_IOTYPE =~ pio*) then
+  module load parallel-netcdf/1.12.3
+  if ($ICE_IOTYPE == "pio1") then
+    module load parallelio/1.10.1
+  else
+    module load parallelio/2.6.2
+  endif
+endif
+endif
+
+if ($?ICE_BFBTYPE) then
+if ($ICE_BFBTYPE =~ qcchk*) then
+  module load conda
+# conda env create -f ../../configuration/scripts/tests/qctest.yml
+  conda activate qctest
+endif
+endif
+
+# For perftools with mpiexec
+# module load perftools-base
+# module load perftools
+#setenv PALS_TRANSFER FALSE
+
+endif
+
+limit coredumpsize unlimited
+limit stacksize unlimited
+setenv PALS_QUIET TRUE
+
+# May be needed for OpenMP memory
+setenv OMP_STACKSIZE 64M
+# OMP runtime diagnostics
+#setenv OMP_DISPLAY_ENV TRUE
+
+setenv ICE_MACHINE_MACHNAME derecho
+setenv ICE_MACHINE_MACHINFO "HPE Cray EX Milan Slingshot 11"
+setenv ICE_MACHINE_ENVNAME gnu
+setenv ICE_MACHINE_ENVINFO "gcc 12.2.0 20220819, cray-mpich 8.1.25, netcdf4.9.2, pnetcdf1.12.3, pio1.10.1, pio2.6.2"
+setenv ICE_MACHINE_MAKE gmake
+setenv ICE_MACHINE_WKDIR /glade/derecho/scratch/$user/CICE_RUNS
+setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev
+setenv ICE_MACHINE_BASELINE /glade/derecho/scratch/$user/CICE_BASELINE
+setenv ICE_MACHINE_SUBMIT "qsub"
+setenv ICE_MACHINE_ACCT P00000000
+setenv ICE_MACHINE_QUEUE "main"
+setenv ICE_MACHINE_TPNODE 128
+setenv ICE_MACHINE_BLDTHRDS 8
+setenv ICE_MACHINE_QSTAT "qstat "
diff --git a/configuration/scripts/machines/env.derecho_intel b/configuration/scripts/machines/env.derecho_intel
index baa053e75..5c3e593d4 100644
--- a/configuration/scripts/machines/env.derecho_intel
+++ b/configuration/scripts/machines/env.derecho_intel
@@ -15,8 +15,10 @@ module load craype
 module load intel/2023.0.0
 module load ncarcompilers
 module load cray-mpich/8.1.25
+module load netcdf/4.9.2
 #module load hdf5/1.12.2
-module load netcdf-mpi/4.9.2
+#module load netcdf-mpi/4.9.2
+
 module load cray-libsci/23.02.1.1
 
 if ($?ICE_IOTYPE) then
@@ -25,7 +27,7 @@ if ($ICE_IOTYPE =~ pio*) then
   if ($ICE_IOTYPE == "pio1") then
     module load parallelio/1.10.1
   else
-    module load parallelio/2.6.0
+    module load parallelio/2.6.1
   endif
 endif
 endif
@@ -57,7 +59,7 @@ setenv OMP_STACKSIZE 64M
 setenv ICE_MACHINE_MACHNAME derecho
 setenv ICE_MACHINE_MACHINFO "HPE Cray EX Milan Slingshot 11"
 setenv ICE_MACHINE_ENVNAME intel
-setenv ICE_MACHINE_ENVINFO "ifort 2021.8.0 20221119, cray-mpich 2.25, netcdf-mpi4.9.2, pnetcdf1.12.3, pio2.6.0"
+setenv ICE_MACHINE_ENVINFO "ifort 2021.8.0 20221119, oneAPI DPC++/C++ 2023.0.0.20221201), cray-mpich 8.1.25, netcdf4.9.2, pnetcdf1.12.3, pio1.10.1, pio2.6.1"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /glade/derecho/scratch/$user/CICE_RUNS
 setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev
diff --git a/configuration/scripts/machines/env.derecho_intelclassic b/configuration/scripts/machines/env.derecho_intelclassic
new file mode 100644
index 000000000..39b08e1bc
--- /dev/null
+++ b/configuration/scripts/machines/env.derecho_intelclassic
@@ -0,0 +1,72 @@
+#!/bin/csh -f
+
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
+source ${MODULESHOME}/init/csh
+
+module --force purge
+module load ncarenv/23.06
+module load craype
+module load intel-classic/2023.0.0
+module load ncarcompilers
+module load cray-mpich/8.1.25
+module load netcdf/4.9.2
+#module load hdf5/1.12.2
+#module load netcdf-mpi/4.9.2
+
+#module load cray-libsci/23.02.1.1
+
+if ($?ICE_IOTYPE) then
+if ($ICE_IOTYPE =~ pio*) then
+  module load parallel-netcdf/1.12.3
+  if ($ICE_IOTYPE == "pio1") then
+    module load parallelio/1.10.1
+  else
+    module load parallelio/2.6.2
+  endif
+endif
+endif
+
+if ($?ICE_BFBTYPE) then
+if ($ICE_BFBTYPE =~ qcchk*) then
+  module load conda
+# conda env create -f ../../configuration/scripts/tests/qctest.yml
+  conda activate qctest
+endif
+endif
+
+# For perftools with mpiexec
+# module load perftools-base
+# module load perftools
+#setenv PALS_TRANSFER FALSE
+
+endif
+
+limit coredumpsize unlimited
+limit stacksize unlimited
+setenv PALS_QUIET TRUE
+
+# May be needed for OpenMP memory
+setenv OMP_STACKSIZE 64M
+# OMP runtime diagnostics
+#setenv OMP_DISPLAY_ENV TRUE
+
+setenv ICE_MACHINE_MACHNAME derecho
+setenv ICE_MACHINE_MACHINFO "HPE Cray EX Milan Slingshot 11"
+setenv ICE_MACHINE_ENVNAME intelclassic
+setenv ICE_MACHINE_ENVINFO "icc/ifort 2021.8.0 20221119, cray-mpich 8.1.25, netcdf4.9.2, pnetcdf1.12.3, pio1.10.1, pio2.6.2"
+setenv ICE_MACHINE_MAKE gmake
+setenv ICE_MACHINE_WKDIR /glade/derecho/scratch/$user/CICE_RUNS
+setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev
+setenv ICE_MACHINE_BASELINE /glade/derecho/scratch/$user/CICE_BASELINE
+setenv ICE_MACHINE_SUBMIT "qsub"
+setenv ICE_MACHINE_ACCT P00000000
+setenv ICE_MACHINE_QUEUE "main"
+setenv ICE_MACHINE_TPNODE 128
+setenv ICE_MACHINE_BLDTHRDS 8
+setenv ICE_MACHINE_QSTAT "qstat "
diff --git a/configuration/scripts/machines/env.derecho_inteloneapi b/configuration/scripts/machines/env.derecho_inteloneapi
new file mode 100644
index 000000000..a4f173404
--- /dev/null
+++ b/configuration/scripts/machines/env.derecho_inteloneapi
@@ -0,0 +1,72 @@
+#!/bin/csh -f
+
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
+source ${MODULESHOME}/init/csh
+
+module --force purge
+module load ncarenv/23.06
+module load craype
+module load intel-oneapi/2023.0.0
+module load ncarcompilers
+module load cray-mpich/8.1.25
+module load netcdf/4.9.2
+#module load hdf5/1.12.2
+#module load netcdf-mpi/4.9.2
+
+module load cray-libsci/23.02.1.1
+
+if ($?ICE_IOTYPE) then
+if ($ICE_IOTYPE =~ pio*) then
+  module load parallel-netcdf/1.12.3
+  if ($ICE_IOTYPE == "pio1") then
+    module load parallelio/1.10.1
+  else
+    module load parallelio/2.6.1
+  endif
+endif
+endif
+
+if ($?ICE_BFBTYPE) then
+if ($ICE_BFBTYPE =~ qcchk*) then
+  module load conda
+# conda env create -f ../../configuration/scripts/tests/qctest.yml
+  conda activate qctest
+endif
+endif
+
+# For perftools with mpiexec
+# module load perftools-base
+# module load perftools
+#setenv PALS_TRANSFER FALSE
+
+endif
+
+limit coredumpsize unlimited
+limit stacksize unlimited
+setenv PALS_QUIET TRUE
+
+# May be needed for OpenMP memory
+setenv OMP_STACKSIZE 64M
+# OMP runtime diagnostics
+#setenv OMP_DISPLAY_ENV TRUE
+
+setenv ICE_MACHINE_MACHNAME derecho
+setenv ICE_MACHINE_MACHINFO "HPE Cray EX Milan Slingshot 11"
+setenv ICE_MACHINE_ENVNAME inteloneapi
+setenv ICE_MACHINE_ENVINFO "ifx 2023.0.0 20221201, oneAPI DPC++/C++ 2023.0.0.20221201, cray-mpich 8.1.25, netcdf4.9.2, pnetcdf1.12.3, pio1.10.1, pio2.6.1"
+setenv ICE_MACHINE_MAKE gmake
+setenv ICE_MACHINE_WKDIR /glade/derecho/scratch/$user/CICE_RUNS
+setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev
+setenv ICE_MACHINE_BASELINE /glade/derecho/scratch/$user/CICE_BASELINE
+setenv ICE_MACHINE_SUBMIT "qsub"
+setenv ICE_MACHINE_ACCT P00000000
+setenv ICE_MACHINE_QUEUE "main"
+setenv ICE_MACHINE_TPNODE 128
+setenv ICE_MACHINE_BLDTHRDS 8
+setenv ICE_MACHINE_QSTAT "qstat "
diff --git a/configuration/scripts/machines/env.derecho_nvhpc b/configuration/scripts/machines/env.derecho_nvhpc
new file mode 100644
index 000000000..52702d4f7
--- /dev/null
+++ b/configuration/scripts/machines/env.derecho_nvhpc
@@ -0,0 +1,72 @@
+#!/bin/csh -f
+
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
+source ${MODULESHOME}/init/csh
+
+module --force purge
+module load ncarenv/23.06
+module load craype
+module load nvhpc/23.5
+module load ncarcompilers
+module load cray-mpich/8.1.25
+module load netcdf/4.9.2
+#module load hdf5/1.12.2
+#module load netcdf-mpi/4.9.2
+
+module load cray-libsci/23.02.1.1
+
+if ($?ICE_IOTYPE) then
+if ($ICE_IOTYPE =~ pio*) then
+  module load parallel-netcdf/1.12.3
+  if ($ICE_IOTYPE == "pio1") then
+    module load parallelio/1.10.1
+  else
+    module load parallelio/2.6.0
+  endif
+endif
+endif
+
+if ($?ICE_BFBTYPE) then
+if ($ICE_BFBTYPE =~ qcchk*) then
+  module load conda
+# conda env create -f ../../configuration/scripts/tests/qctest.yml
+  conda activate qctest
+endif
+endif
+
+# For perftools with mpiexec
+# module load perftools-base
+# module load perftools
+#setenv PALS_TRANSFER FALSE
+
+endif
+
+limit coredumpsize unlimited
+limit stacksize unlimited
+setenv PALS_QUIET TRUE
+
+# May be needed for OpenMP memory
+setenv OMP_STACKSIZE 64M
+# OMP runtime diagnostics
+#setenv OMP_DISPLAY_ENV TRUE
+
+setenv ICE_MACHINE_MACHNAME derecho
+setenv ICE_MACHINE_MACHINFO "HPE Cray EX Milan Slingshot 11"
+setenv ICE_MACHINE_ENVNAME nvhpc
+setenv ICE_MACHINE_ENVINFO "nvc 23.5-0, cray-mpich 8.1.25, netcdf4.9.2, pnetcdf1.12.3, pio1.10.1, pio2.6.0"
+setenv ICE_MACHINE_MAKE gmake
+setenv ICE_MACHINE_WKDIR /glade/derecho/scratch/$user/CICE_RUNS
+setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev
+setenv ICE_MACHINE_BASELINE /glade/derecho/scratch/$user/CICE_BASELINE
+setenv ICE_MACHINE_SUBMIT "qsub"
+setenv ICE_MACHINE_ACCT P00000000
+setenv ICE_MACHINE_QUEUE "main"
+setenv ICE_MACHINE_TPNODE 128
+setenv ICE_MACHINE_BLDTHRDS 8
+setenv ICE_MACHINE_QSTAT "qstat "