From ca1bf8da6b7853cfd4088c845804096cdc47d8cb Mon Sep 17 00:00:00 2001 From: David A Minton Date: Tue, 29 Jun 2021 17:21:07 -0400 Subject: [PATCH] Improved fcomplier flags and added ability to recognize UNKNOWN as a valid OUT_STAT value --- Makefile.Defines | 5 +---- src/io/io.f90 | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile.Defines b/Makefile.Defines index 31998e38a..820ad6d7d 100644 --- a/Makefile.Defines +++ b/Makefile.Defines @@ -52,16 +52,13 @@ VTUNE_FLAGS = -g -O2 -vec -simd -shared-intel -qopenmp -debug inline-debug-info #Be sure to set the environment variable KMP_FORKJOIN_FRAMES=1 for OpenMP debuging in vtune IDEBUG = -O0 -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 -init=snan,arrays - STRICTREAL = -fp-model strict -fp-model no-except -prec-div -prec-sqrt -assume protect-parens SIMDVEC = -simd -xhost -align all -assume contiguous_assumed_shape -vecabi=cmdtarget -prec-div -prec-sqrt -assume protect-parens PAR = -parallel -qopenmp HEAPARR = -heap-arrays 1048576 OPTIMIZE = -qopt-report=5 - -#debug flags - +#gfortran flags GDEBUG = -g -O0 -fbacktrace -fbounds-check GPRODUCTION = -O3 GPAR = -fopenmp -ftree-parallelize-loops=4 diff --git a/src/io/io.f90 b/src/io/io.f90 index 69f2d82ea..a89ea3549 100644 --- a/src/io/io.f90 +++ b/src/io/io.f90 @@ -193,7 +193,7 @@ module subroutine io_param_reader(self, unit, iotype, v_list, iostat, iomsg) iostat = -1 return end if - if ((self%out_stat /= "NEW") .and. (self%out_stat /= "REPLACE") .and. (self%out_stat /= "APPEND")) then + if ((self%out_stat /= "NEW") .and. (self%out_stat /= "REPLACE") .and. (self%out_stat /= "APPEND") .and. (self%out_stat /= "UNKNOWN")) then write(iomsg,*) 'Invalid out_stat: ',trim(adjustl(self%out_stat)) iostat = -1 return @@ -784,7 +784,7 @@ module subroutine io_read_param_in(self, param_file_name) character(STRMAX) :: error_message !! Error message in UDIO procedure ! Read in name of parameter file - write(*, *) 'parameters data file is ', trim(adjustl(param_file_name)) + write(*, *) 'Parameter input file is ', trim(adjustl(param_file_name)) write(*, *) ' ' 100 format(A) open(unit = LUN, file = param_file_name, status = 'old', iostat = ierr)