From c495f5823f2f0a0f198d6960feab62bf651b6321 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 21 Oct 2021 10:45:25 -0400 Subject: [PATCH 1/4] Restored production compiler flags --- Makefile.Defines | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.Defines b/Makefile.Defines index 443284a86..c2d0258d5 100644 --- a/Makefile.Defines +++ b/Makefile.Defines @@ -66,13 +66,12 @@ GMEM = -fsanitize-address-use-after-scope -fstack-check -fsanitize=bounds-stri GWARNINGS = -Wall -Warray-bounds -Wimplicit-interface -Wextra -Warray-temporaries GPRODUCTION = -O3 -ffree-line-length-none $(GPAR) - MKL_ROOT = /apps/spack/bell/apps/intel-parallel-studio/cluster.2019.5-intel-19.0.5-4brgqlf/mkl/lib IMKL = -I$(MKLROOT)/include LMKL = -L$(MKLROOT)/lib/intel64 -qopt-matmul -FSTRICTFLAGS = $(IDEBUG) #$(SIMDVEC) $(PAR) -FFLAGS = $(IDEBUG) #$(SIMDVEC) $(PAR) +FSTRICTFLAGS = $(IPRODUCTION) $(STRICTREAL) +FFLAGS = $(IPRODUCTION) -fp-model=fast FORTRAN = ifort AR = xiar CC = icc From 1bd61ce897074a25a28e60df026a81858910adb9 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 4 Nov 2021 16:16:37 -0400 Subject: [PATCH 2/4] Removed -parallel flag, as it seems like it may actually be slowing the runs down --- Makefile.Defines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.Defines b/Makefile.Defines index c2d0258d5..0da15157f 100644 --- a/Makefile.Defines +++ b/Makefile.Defines @@ -54,7 +54,7 @@ VTUNE_FLAGS = -g -O2 -qopt-report=5 -simd -shared-intel -qopenmp -debug inline-d IDEBUG = -O0 -init=snan,arrays -nogen-interfaces -no-pie -no-ftz -fpe-all=0 -g -traceback -mp1 -fp-model strict -fpe0 -debug all -align all -pad -ip -prec-div -prec-sqrt -assume protect-parens -CB -no-wrap-margin STRICTREAL = -fp-model=precise -prec-div -prec-sqrt -assume protect-parens SIMDVEC = -simd -xhost -align all -assume contiguous_assumed_shape -vecabi=cmdtarget -fp-model no-except -fma -PAR = -qopenmp -parallel +PAR = -qopenmp HEAPARR = -heap-arrays 4194304 OPTREPORT = -qopt-report=5 IPRODUCTION = -no-wrap-margin -O3 -qopt-prefetch=0 -sox $(PAR) $(SIMDVEC) #$(HEAPARR) From e99c418d996f363be7bb0606c0417be3affbf0b9 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 5 Nov 2021 10:50:54 -0400 Subject: [PATCH 3/4] Put back parallel flag --- Makefile.Defines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.Defines b/Makefile.Defines index 0da15157f..e3f1696e5 100644 --- a/Makefile.Defines +++ b/Makefile.Defines @@ -54,7 +54,7 @@ VTUNE_FLAGS = -g -O2 -qopt-report=5 -simd -shared-intel -qopenmp -debug inline-d IDEBUG = -O0 -init=snan,arrays -nogen-interfaces -no-pie -no-ftz -fpe-all=0 -g -traceback -mp1 -fp-model strict -fpe0 -debug all -align all -pad -ip -prec-div -prec-sqrt -assume protect-parens -CB -no-wrap-margin STRICTREAL = -fp-model=precise -prec-div -prec-sqrt -assume protect-parens SIMDVEC = -simd -xhost -align all -assume contiguous_assumed_shape -vecabi=cmdtarget -fp-model no-except -fma -PAR = -qopenmp +PAR = -qopenmp -parallel HEAPARR = -heap-arrays 4194304 OPTREPORT = -qopt-report=5 IPRODUCTION = -no-wrap-margin -O3 -qopt-prefetch=0 -sox $(PAR) $(SIMDVEC) #$(HEAPARR) From 79a42f3684c6964405ce2ba6b842229dd2550ca9 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 5 Nov 2021 17:31:05 -0400 Subject: [PATCH 4/4] Fixed memory leak caused by multiple opening of NetCDF file on a restart --- src/io/io.f90 | 1 - 1 file changed, 1 deletion(-) diff --git a/src/io/io.f90 b/src/io/io.f90 index 62e77e38b..ebdd68531 100644 --- a/src/io/io.f90 +++ b/src/io/io.f90 @@ -2151,7 +2151,6 @@ module subroutine io_write_frame_system(self, param) errmsg = param%outfile // " not found! You must specify OUT_STAT = NEW, REPLACE, or UNKNOWN" goto 667 end if - call param%nciu%open(param) case('NEW') if (fileExists) then errmsg = param%outfile // " Alread Exists! You must specify OUT_STAT = APPEND, REPLACE, or UNKNOWN"