From 2d557cb29b6f78b4e5956a893bfe9621a3f4d4fb Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 20 Sep 2018 16:56:05 +0000 Subject: [PATCH] update pgi optimzation to address reproducibility problems --- cicecore/cicedynB/general/ice_init.F90 | 5 +++-- configuration/scripts/machines/Macros.conrad_pgi | 2 +- configuration/scripts/machines/Macros.gordon_pgi | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index e88d2320b..47c7076e3 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/cicecore/cicedynB/general/ice_init.F90 @@ -880,9 +880,9 @@ subroutine input_data write(nu_diag,1020) ' kcatbound = ', & kcatbound if (kdyn == 1) then - write(nu_diag,1020) ' kdyn = evp ', kdyn + write(nu_diag,1021) ' kdyn = ','evp ', kdyn elseif (kdyn == 2) then - write(nu_diag,1020) ' kdyn = eap ', kdyn + write(nu_diag,1021) ' kdyn = ','eap ', kdyn else write(nu_diag,1020) ' kdyn = ', kdyn endif @@ -1121,6 +1121,7 @@ subroutine input_data 1005 format (a30,2x,f9.6) ! float 1010 format (a30,2x,l6) ! logical 1020 format (a30,2x,i6) ! integer + 1021 format (a30,2x,a8,i6) ! char, int 1030 format (a30, a8) ! character 1040 format (a30,2x,6i6) ! integer 1050 format (a30,2x,6a6) ! character diff --git a/configuration/scripts/machines/Macros.conrad_pgi b/configuration/scripts/machines/Macros.conrad_pgi index 702c84a8d..be6fb1ef2 100644 --- a/configuration/scripts/machines/Macros.conrad_pgi +++ b/configuration/scripts/machines/Macros.conrad_pgi @@ -14,7 +14,7 @@ FFLAGS_NOOPT:= -O0 ifeq ($(ICE_BLDDEBUG), true) FFLAGS += -O0 -g -Mbounds -Mchkptr else - FFLAGS += -O2 + FFLAGS += -O -g endif ifeq ($(ICE_COMMDIR), mpi) diff --git a/configuration/scripts/machines/Macros.gordon_pgi b/configuration/scripts/machines/Macros.gordon_pgi index ea0c4ee58..1403cf13a 100644 --- a/configuration/scripts/machines/Macros.gordon_pgi +++ b/configuration/scripts/machines/Macros.gordon_pgi @@ -14,7 +14,7 @@ FFLAGS_NOOPT:= -O0 ifeq ($(ICE_BLDDEBUG), true) FFLAGS += -O0 -g -Mbounds -Mchkptr else - FFLAGS += -O2 + FFLAGS += -O -g endif ifeq ($(ICE_COMMDIR), mpi)