Update modules, add pio capability to new env.

Update compile logic to exclude debug flags when doing coverage testing. See linux-test-project/lcov#385.
CICE-Consortium · Jan 16, 2025 · 0b773e7 · 0b773e7
1 parent 736c177
commit 0b773e7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/configuration/scripts/machines/Macros.derecho_gnu b/configuration/scripts/machines/Macros.derecho_gnu
@@ -11,25 +11,26 @@ 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)
+else
+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
+else
   FFLAGS   += -O2
   CFLAGS   += -O2
 endif
 endif
 
+#ifneq ($(ICE_BLDDEBUG), true)
+#ifneq ($(ICE_COVERAGE), true)
+#endif
+#endif
+
 SCC   := gcc 
 SFC   := gfortran
 MPICC := mpicc

diff --git a/configuration/scripts/machines/env.derecho_gnu b/configuration/scripts/machines/env.derecho_gnu
@@ -11,25 +11,23 @@ source ${MODULESHOME}/init/csh
 
 module --force purge
 module load ncarenv/24.12
+module reset
 module load craype
 module load gcc/12.4.0
 module load ncarcompilers
 module load cray-mpich/8.1.29
 module load netcdf/4.9.2
-#module load hdf5/1.12.2
-#module load netcdf-mpi/4.9.2
-
 module load cray-libsci/24.03.0
 
 if ($?ICE_IOTYPE) then
 if ($ICE_IOTYPE =~ pio*) then
   module unload	netcdf
   module load netcdf-mpi/4.9.2
-  module load parallel-netcdf/1.12.3
+  module load parallel-netcdf/1.14.0
   if ($ICE_IOTYPE == "pio1") then
     module load parallelio/1.10.1
   else
-    module load parallelio/2.6.2
+    module load parallelio/2.6.3
   endif
 endif
 endif