From 71a1795923e2ece3aad44770b9093b24eca4531a Mon Sep 17 00:00:00 2001 From: Valentine Anantharaj Date: Thu, 30 Oct 2014 14:12:07 -0400 Subject: [PATCH] Cray build at titan Modified Makefile to support CCE on titan; and source code changes. --- Makefile | 28 ++++++++++++++++++++ src/core_ocean/mpas_ocn_global_diagnostics.F | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 44afbed093..772a789b7d 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,34 @@ ftn: "USE_PAPI = $(USE_PAPI)" \ "CPPFLAGS = $(MODEL_FORMULATION) -D_MPI -DUNDERSCORE" ) +titan-pgi: + ( $(MAKE) all \ + "FC_PARALLEL = ftn" \ + "CC_PARALLEL = cc" \ + "FC_SERIAL = ftn" \ + "CC_SERIAL = cc" \ + "FFLAGS_OPT = -r8 -O3 -byteswapio -Mfree" \ + "CFLAGS_OPT = -O3" \ + "LDFLAGS_OPT = " \ + "CORE = $(CORE)" \ + "DEBUG = $(DEBUG)" \ + "USE_PAPI = $(USE_PAPI)" \ + "CPPFLAGS = $(MODEL_FORMULATION) -D_MPI -DUNDERSCORE" ) + +titan-cray: + ( $(MAKE) all \ + "FC_PARALLEL = ftn" \ + "CC_PARALLEL = cc" \ + "FC_SERIAL = ftn" \ + "CC_SERIAL = gcc" \ + "FFLAGS_OPT = -s integer32 -default64 -O3 -f free -N 255 -em -ef" \ + "CFLAGS_OPT = -O3" \ + "LDFLAGS_OPT = -O3" \ + "CORE = $(CORE)" \ + "DEBUG = $(DEBUG)" \ + "USE_PAPI = $(USE_PAPI)" \ + "CPPFLAGS = $(MODEL_FORMULATION) -D_MPI -DUNDERSCORE" ) + pgi: ( $(MAKE) all \ "FC_PARALLEL = mpif90" \ diff --git a/src/core_ocean/mpas_ocn_global_diagnostics.F b/src/core_ocean/mpas_ocn_global_diagnostics.F index d98320434b..7fd8dc3c71 100644 --- a/src/core_ocean/mpas_ocn_global_diagnostics.F +++ b/src/core_ocean/mpas_ocn_global_diagnostics.F @@ -414,7 +414,8 @@ subroutine ocn_compute_global_diagnostics(domain, timeLevel, timeIndex, dt)!{{{ variableIndex = 0 ! time, in days, using a 360 day calendar - read (diagnostics % xtime % scalar, '(i4,5(a1,i2))'), timeYYYY, timeChar, timeMM, timeChar, timeDD, timeChar, timeH, timeChar, timeM, timeChar, timeS +!!-x read (diagnostics % xtime % scalar, '(i4,5(a1,i2))'), timeYYYY, timeChar, timeMM, timeChar, timeDD, timeChar, timeH, timeChar, timeM, timeChar, timeS + read (diagnostics % xtime % scalar, '(i4,10(a1,i2))') timeYYYY, timeChar, timeMM, timeChar, timeDD, timeChar, timeH, timeChar, timeM, timeChar, timeS ! subtract 31.0 because calendar starts on 00-01-01 time_days = timeYYYY*360.0 + timeMM*30.0 + timeDD + (timeH + (timeM + timeS/60.0)/60.0)/24.0 - 31.0