Merge pull request #244 from NCAR/build_fixes

Build fixes

Author: hkershaw-brown

CHANGELOG.rst

@@ -22,6 +22,12 @@ individual files.
 
 The changes are now listed with the most recent at the top.
 
+**June 18 2021 :: build fixes for PGI compiler and intel compiler osx. Tag: v9.11.1**
+
+- mkmf.templates fixes for intel.osx and pgi
+- input.nml fix for obs_total_error
+- path_names fix for test_quad_*_interp 
+
 **June 8 2021 :: New observation converter for Solar Induced Fluorescence (SIF).  Tag: v9.11.0**
 
 - Converter for harmonized SIF retrievals

assimilation_code/programs/obs_total_error/work/input.nml

@@ -20,7 +20,7 @@
    output_obs_def_mod_file = '../../../../observations/forward_operators/obs_def_mod.f90'
    input_obs_qty_mod_file  = '../../../../assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90'
    output_obs_qty_mod_file = '../../../../assimilation_code/modules/observations/obs_kind_mod.f90'
-   obs_types_files         = '../../../../observations/forward_operators/obs_def_AIRS_mod.f90',
+   obs_type_files          = '../../../../observations/forward_operators/obs_def_AIRS_mod.f90',
                              '../../../../observations/forward_operators/obs_def_AOD_mod.f90',
                              '../../../../observations/forward_operators/obs_def_AURA_mod.f90',
                              '../../../../observations/forward_operators/obs_def_COSMOS_mod.f90',

build_templates/mkmf.template.intel.osx

@@ -25,17 +25,14 @@
 #     -check <keywords>    enables/disables more specific runtime checks.
 #           keywords:  [arg_temp_created,bounds,overflow,format,pointers,uninit]
 #     -warn <keywords>  the level of warning messages issued.
-#           keywords:  [alignments, argument_checking, declarations,
+#           keywords:  [alignments, declarations,
 #                      errors, fileopt, general, ignore_loc,
 #                      stderrors, truncated_source, uncalled,
 #                      uninitialized, unused, usage, all]
 #     -fp-stack-check  catches conditions where the FP stack is not correct.
 #           Typically this is when a real function is called as if it were a
 #           subroutine, OR a subroutine is called as if it were a function (return
 #           values left of FP stack OR too much data is taken off the FP stack)
-#     -vec-reportN  controls how much diagnostic output is printed about
-#                   loops vectorized by the compiler. N = 0 is silent,
-#                   N can have values up to 5.
 #     -traceback    tells the compiler to generate extra information in the
 #                   object file to provide source file traceback information
 #                   when a severe error occurs at run time
@@ -141,13 +138,13 @@ LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf
 #LDFLAGS = $(INCS) -Wl,-stack_size,10000000 $(LIBS)
 
 # for Intel 10.x and beyond:
-FFLAGS  = $(INCS) -O2 -m64 -heap-arrays -vec-report0  -assume buffered_io
+FFLAGS  = $(INCS) -O2 -m64 -heap-arrays -assume buffered_io
 LDFLAGS = $(INCS) $(LIBS)
 
 # for development or debugging, use this instead:
-# FFLAGS = -g -C -check noarg_temp_created -fpe0 -vec-report0 \
+# FFLAGS = -g -C -check noarg_temp_created -fpe0 \
 #          -fp-model precise  -ftrapuv -traceback \
-#          -warn argument_checking,declarations,uncalled,unused $(INCS)
+#          -warn declarations,uncalled,unused $(INCS)
 #
 # If you get this error: libimf.so: warning: warning: feupdateenv is not implemented
 # try adding: -limf -lm to your LIBS line.

build_templates/mkmf.template.pgi.linux

@@ -87,13 +87,13 @@ LD = pgf90
 
 INCS = -I$(NETCDF)/include
 LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf
-FFLAGS  = -O $(INCS)
+FFLAGS  = -O -Mbackslash $(INCS)
 LDFLAGS = $(FFLAGS) $(LIBS)
 
 # for development or debugging, use this for flags:
 # FFLAGS = -g -gopt -Mbounds -Mchkfpstk -Mchkptr -Mchkstk -Mpgicoff  \
 #         -Mdclchk -Meh_frame -traceback -Minform=inform \
-#         -Mflushz -Ktrap=fp -pc 64 $(INCS)
+#         -Mflushz -Ktrap=fp -pc 64 -Mbackslash $(INCS)
 
 # <next few lines under version control, do not edit>
 # $URL$

build_templates/mkmf.template.pgi.osx

@@ -68,11 +68,11 @@ LD = pgf90
 
 INCS = -I$(NETCDF)/include
 LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf
-FFLAGS  = -O $(INCS) 
+FFLAGS  = -O -Mbackslash  $(INCS) 
 LDFLAGS = $(FFLAGS) $(LIBS)
 
 # for development or debugging, use this for flags:
-#FFLAGS = -g -Ktrap=fp -pc 64 $(INCS)
+#FFLAGS = -g -Mbackslash -Ktrap=fp -pc 64 $(INCS)
 
 # <next few lines under version control, do not edit>
 # $URL$

conf.py

@@ -21,7 +21,7 @@
 author = 'Data Assimilation Research Section'
 
 # The full version, including alpha/beta/rc tags
-release = '9.11.0'
+release = '9.11.1'
 master_doc = 'README'
 
 # -- General configuration ---------------------------------------------------

models/model_mod_tools/work/path_names_test_quad_irreg_interp

@@ -6,6 +6,7 @@ assimilation_code/modules/observations/obs_kind_mod.f90
 assimilation_code/modules/utilities/ensemble_manager_mod.f90
 assimilation_code/modules/utilities/netcdf_utilities_mod.f90
 assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
+assimilation_code/modules/utilities/options_mod.f90
 assimilation_code/modules/utilities/parse_args_mod.f90
 assimilation_code/modules/utilities/random_seq_mod.f90
 assimilation_code/modules/utilities/sort_mod.f90

models/model_mod_tools/work/path_names_test_quad_reg_interp

@@ -6,6 +6,7 @@ assimilation_code/modules/observations/obs_kind_mod.f90
 assimilation_code/modules/utilities/ensemble_manager_mod.f90
 assimilation_code/modules/utilities/netcdf_utilities_mod.f90
 assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
+assimilation_code/modules/utilities/options_mod.f90
 assimilation_code/modules/utilities/parse_args_mod.f90
 assimilation_code/modules/utilities/random_seq_mod.f90
 assimilation_code/modules/utilities/sort_mod.f90