Merge pull request #44 from COSIMA/gadi-transition

Gadi transition
COSIMA · Feb 17, 2020 · e151c8b · e151c8b
2 parents dd02b01 + 5f85e70
commit e151c8b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 21 deletions.
diff --git a/bld/Macros.nci b/bld/Macros.nci
@@ -1,7 +1,5 @@
 #==============================================================================
-# Makefile macros for xe.nci.org.au, an SGI ALTIX system running Linux
-# Note:  Use the -mp flag if precision is critical.   It slows down the 
-#        code by 25% (or more).
+# Makefile macros for gadi.nci.org.au
 #==============================================================================
 
 INCLDIR    := -I.
@@ -16,11 +14,15 @@ CFLAGS     := -c -O2
 FIXEDFLAGS := -132
 FREEFLAGS  :=
 
+NCI_INTEL_FLAGS := -r8 -i4 -traceback -w -fpe0 -ftz -convert big_endian -assume byterecl -check noarg_temp_created
+NCI_REPRO_FLAGS := -fp-model precise -fp-model source -align all
 ifeq ($(DEBUG), 1)
-    FFLAGS     := -r8 -i4 -O0 -traceback -g -debug all -check all -no-vec -align all -w -fpe0 -ftz -convert big_endian -assume byterecl -assume nobuffered_io -check noarg_temp_created
-    CPPDEFS    := $(CPPDEFS) -DDEBUG=$(DEBUG)
+    NCI_DEBUG_FLAGS := -g3 -O0 -debug all -check all -no-vec -assume nobuffered_io
+    FFLAGS          := $(NCI_INTEL_FLAGS) $(NCI_REPRO_FLAGS) $(NCI_DEBUG_FLAGS)
+    CPPDEFS         := $(CPPDEFS) -DDEBUG=$(DEBUG)
 else
-    FFLAGS     := -r8 -i4 -O2 -traceback -g -align all -xHost -fpe0 -w -ftz -convert big_endian -assume byterecl -assume buffered_io -check noarg_temp_created
+    NCI_OPTIM_FLAGS := -g3 -O2 -axCORE-AVX2 -debug all -check none -qopt-report=5 -qopt-report-annotate -assume buffered_io
+    FFLAGS          := $(NCI_INTEL_FLAGS) $(NCI_REPRO_FLAGS) $(NCI_OPTIM_FLAGS)
 endif
 
 MOD_SUFFIX := mod

diff --git a/bld/config.nci.auscom.1440x1080 b/bld/config.nci.auscom.1440x1080
@@ -9,8 +9,6 @@ setenv BLCKY `expr $NYGLOB / 40`         # y-dimension of blocks (  ghost cells
 
 source /etc/profile.d/nf_csh_modules
 module purge
-module load intel-fc/17.0.1.132
-module load intel-cc/17.0.1.132
-module load netcdf/4.3.2
-module load openmpi/1.10.2
-
+module load intel-compiler/2019.5.281
+module load netcdf/4.7.1
+module load openmpi/4.0.2
diff --git a/bld/config.nci.auscom.3600x2700 b/bld/config.nci.auscom.3600x2700
@@ -17,7 +17,6 @@ setenv BLCKY `expr $NYGLOB / 90`         # y-dimension of blocks (  ghost cells
 
 source /etc/profile.d/nf_csh_modules
 module purge
-module load intel-fc/17.0.1.132
-module load intel-cc/17.0.1.132
-module load netcdf/4.3.2
-module load openmpi/1.10.2
+module load intel-compiler/2019.5.281
+module load netcdf/4.7.1
+module load openmpi/4.0.2
diff --git a/bld/config.nci.auscom.360x300 b/bld/config.nci.auscom.360x300
@@ -7,9 +7,8 @@ set NYGLOB = `echo $RES | sed s/.\*x//`
 setenv BLCKX `expr $NXGLOB / 24`       # x-dimension of blocks ( not including )
 setenv BLCKY `expr $NYGLOB / 1`        # y-dimension of blocks (  ghost cells  )
 
-source /etc/profile.d/nf_csh_modules
+source /etc/profile.d/modules.csh
 module purge
-module load intel-fc/17.0.1.132
-module load intel-cc/17.0.1.132
-module load netcdf/4.3.2
-module load openmpi/1.10.2
+module load intel-compiler/2019.5.281
+module load netcdf/4.7.1
+module load openmpi/4.0.2
diff --git a/drivers/auscom/CICE_InitMod.F90 b/drivers/auscom/CICE_InitMod.F90
@@ -133,7 +133,7 @@ subroutine cice_init(accessom2)
       call accessom2%sync_config(coupler)
 
       ! Use accessom2 configuration
-      call input_data(accessom2%get_cur_exp_date_array(), &
+      call input_data(accessom2%get_forcing_start_date_array(), &
                       accessom2%get_seconds_since_cur_exp_year(), &
                       accessom2%get_total_runtime_in_seconds(), &
                       accessom2%get_ice_ocean_timestep(), &