Removed depreciated cpp and added gnu to freya

configuration/scripts/machines/Macros.freya_gnu

@@ -0,0 +1,40 @@
+#==============================================================================
+# Makefile macros for DMI freya
+#==============================================================================
+# For use with GNU compiler
+#==============================================================================
+
+#INCLDIR := -I. -I/usr/include
+#SLIBS   :=
+
+#--- Compiler/preprocessor ---
+FC         := ftn 
+CC         := cc
+CXX        := CC
+CPP        := /usr/bin/cpp
+CPPFLAGS   := -P -traditional  # ALLOW fortran double backslash "\\"
+SCC   := gcc
+SFC   := ftn
+
+CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
+CFLAGS     := -c -O2 
+#-xHost
+
+FREEFLAGS  := -ffree-form
+FFLAGS     := -fconvert=big-endian -fbacktrace -ffree-line-length-none
+#-xHost
+
+ifeq ($(ICE_BLDDEBUG), true)
+  FFLAGS     += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow 
+else
+  FFLAGS     += -O2 #FROM BANTING
+  #FFLAGS     := -O2 -ffloat-store -march=native -ffree-line-length-non # DMI BUILD
+endif
+LD:= $(FC)
+LDFLAGS    := $(FFLAGS) -v
+
+ifeq ($(ICE_THREADED), true) 
+   LDFLAGS += -fopenmp 
+   CFLAGS += -fopenmp 
+   FFLAGS += -fopenmp 
+endif

configuration/scripts/machines/Macros.freya_intel

@@ -18,7 +18,6 @@ SFC   := ftn
 
 CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
 CFLAGS     := -c -O2 -fp-model precise
-
 # Additional flags
 FIXEDFLAGS := -132
 FREEFLAGS  := -FR
@@ -47,11 +46,6 @@ LDFLAGS    := $(FFLAGS) -v
 
 # Additional flags
 
-ifeq ($(DITTO), yes)
-   CPPDEFS :=  $(CPPDEFS) -DREPRODUCIBLE
-endif
-
-
 ifeq ($(ICE_THREADED), true) 
    LDFLAGS += -qopenmp 
    CFLAGS += -qopenmp 

configuration/scripts/machines/env.freya_gnu

@@ -0,0 +1,39 @@
+#!/bin/csh -f
+
+set inp = "undefined"
+if ($#argv == 1) then
+  set inp = $1
+endif
+
+if ("$inp" != "-nomodules") then
+
+source /opt/modules/default/init/csh # Initialize modules for csh
+ Clear environment
+module rm PrgEnv-intel
+module rm PrgEnv-cray
+module rm PrgEnv-gnu
+module add PrgEnv-gnu
+#module load PrgEnv-intel # Intel compiler
+#module load cray-mpich # MPI (Cray MPICH)
+module add cray-netcdf # NetCDF
+module add cray-hdf5 # HDF5
+#setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesystem
+setenv HDF5_USE_FILE_LOCKING FALSE # necessary since data is on an NFS filesystem
+
+endif
+
+setenv ICE_MACHINE_MACHNAME freya
+setenv ICE_MACHINE_MACHINFO "Cray XC50, GNU Xeon Gold 6148 (Skylake) NOT SURE-TILL"
+setenv ICE_MACHINE_ENVNAME gnu
+setenv ICE_MACHINE_ENVINFO "gcc/7.2.0, cray-mpich/7.7.0, cray-netcdf/4.4.1.1.6"
+setenv ICE_MACHINE_MAKE make
+setenv ICE_MACHINE_WKDIR /data/${USER}/cice_original/run/ 
+setenv ICE_MACHINE_INPUTDATA /data/${USER}/cice_original/
+setenv ICE_MACHINE_BASELINE /data/${USER}/cice_original/dbaselines/
+setenv ICE_MACHINE_SUBMIT "qsub"
+setenv ICE_MACHINE_TPNODE 36    # tasks per node
+#setenv ICE_MACHINE_MAXRUNLENGTH 9
+setenv ICE_MACHINE_ACCT P0000000
+setenv ICE_MACHINE_QUEUE "development"
+setenv ICE_MACHINE_BLDTHRDS 18
+setenv ICE_MACHINE_QSTAT "qstat "

configuration/scripts/machines/env.freya_intel

@@ -8,6 +8,7 @@ endif
 if ("$inp" != "-nomodules") then
 
 source /opt/modules/default/init/csh # Initialize modules for csh
+ Clear environment
 module rm PrgEnv-intel
 module rm PrgEnv-cray
 module rm PrgEnv-gnu
@@ -29,8 +30,8 @@ setenv ICE_MACHINE_WKDIR /data/${USER}/cice_original/run/
 setenv ICE_MACHINE_INPUTDATA /data/${USER}/cice_original/
 setenv ICE_MACHINE_BASELINE /data/${USER}/cice_original/dbaselines/
 setenv ICE_MACHINE_SUBMIT "qsub"
-setenv ICE_MACHINE_TPNODE 40
-setenv ICE_MACHINE_MAXRUNLENGTH 3
+setenv ICE_MACHINE_TPNODE 36     # tasks per node
+#setenv ICE_MACHINE_MAXRUNLENGTH 9
 setenv ICE_MACHINE_ACCT P0000000
 setenv ICE_MACHINE_QUEUE "development"
 setenv ICE_MACHINE_BLDTHRDS 18