From aaaa41fab143b939c123330eddda1b98aa4b5150 Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Wed, 20 Nov 2013 18:12:50 +0000 Subject: [PATCH 1/3] xlf fixes in the makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 44afbed093..c584fbceac 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ dummy: xlf: ( $(MAKE) all \ - "FC_PARALLEL = mpxlf90" \ - "CC_PARALLEL = mpcc" \ + "FC_PARALLEL = mpixlf90" \ + "CC_PARALLEL = mpicc" \ "FC_SERIAL = xlf90" \ "CC_SERIAL = xlc" \ "FFLAGS_OPT = -O3 -qrealsize=8" \ From 9681bbee507f964b45e46bc22924270e07def469 Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Thu, 21 Nov 2013 00:39:52 +0000 Subject: [PATCH 2/3] minor syntax correction --- src/core_ocean/mpas_ocn_global_diagnostics.F | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core_ocean/mpas_ocn_global_diagnostics.F b/src/core_ocean/mpas_ocn_global_diagnostics.F index d98320434b..c2b296a68b 100644 --- a/src/core_ocean/mpas_ocn_global_diagnostics.F +++ b/src/core_ocean/mpas_ocn_global_diagnostics.F @@ -414,7 +414,7 @@ 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 + read (diagnostics % xtime % scalar, '(i4,5(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 From fc64a742102343df6b2da88ce83745d1aca0f907 Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Thu, 21 Nov 2013 02:10:46 +0000 Subject: [PATCH 3/3] revert previous change to xlf target --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c584fbceac..44afbed093 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ dummy: xlf: ( $(MAKE) all \ - "FC_PARALLEL = mpixlf90" \ - "CC_PARALLEL = mpicc" \ + "FC_PARALLEL = mpxlf90" \ + "CC_PARALLEL = mpcc" \ "FC_SERIAL = xlf90" \ "CC_SERIAL = xlc" \ "FFLAGS_OPT = -O3 -qrealsize=8" \