From a1e541ca973866c174cb673cd9ccdfd9032225ed Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 12 Nov 2021 15:57:47 -0500 Subject: [PATCH 1/2] Updated debug compiler flags --- Makefile.Defines | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.Defines b/Makefile.Defines index 8339f5617..cdfae9240 100644 --- a/Makefile.Defines +++ b/Makefile.Defines @@ -66,11 +66,13 @@ 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) -INCLUDES = -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include -I$(MKLROOT)/include -I$(ADVISOR_2019_DIR)/include/intel64 -LINKS = -L$(MKLROOT)/lib/intel64 -L$(NETCDF_FORTRAN_HOME)/lib -L$(ADVISOR_2019_DIR)/lib64 -lswiftest -lnetcdf -lnetcdff -ladvisor -qopt-matmul $(PAR) +INCLUDES = -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include -I$(MKLROOT)/include +LINKS = -L$(MKLROOT)/lib/intel64 -L$(NETCDF_FORTRAN_HOME)/lib -lswiftest -lnetcdf -lnetcdff -qopt-matmul $(PAR) FSTRICTFLAGS = $(IDEBUG) $(SIMDVEC) $(PAR) FFLAGS = $(IDEBUG) $(SIMDVEC) $(PAR) +#FSTRICTFLAGS = $(IPRODUCTION) $(STRICTREAL) -g -traceback +#FFLAGS = $(IPRODUCTION) -fp-model=fast -g -traceback FORTRAN = ifort AR = xiar From 7b848c287399977ccd1ff0d3e723a662bdda9956 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Mon, 15 Nov 2021 09:41:46 -0500 Subject: [PATCH 2/2] Added check for OUT_STAT=='APPEND' in symba_io_param_reader in order to correctly set the param%lrestart flag in SyMBA runs prior to calling the main io_param_reader subroutine --- src/symba/symba_io.f90 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/symba/symba_io.f90 b/src/symba/symba_io.f90 index 80354e064..3e217bc6a 100644 --- a/src/symba/symba_io.f90 +++ b/src/symba/symba_io.f90 @@ -44,6 +44,9 @@ module subroutine symba_io_param_reader(self, unit, iotype, v_list, iostat, ioms ifirst = ilast + 1 param_value = io_get_token(line_trim, ifirst, ilast, iostat) select case (param_name) + case ("OUT_STAT") ! We need to duplicate this from the standard io_param_reader in order to make sure that the restart flag gets set properly in SyMBA + call io_toupper(param_value) + param%out_stat = param_value case ("FRAGMENTATION") call io_toupper(param_value) if (param_value == "YES" .or. param_value == "T") self%lfragmentation = .true. @@ -80,6 +83,8 @@ module subroutine symba_io_param_reader(self, unit, iotype, v_list, iostat, ioms 1 continue close(unit) + param%lrestart = (param%out_stat == "APPEND") + if (self%GMTINY < 0.0_DP) then write(iomsg,*) "GMTINY invalid or not set: ", self%GMTINY iostat = -1