[Dart-dev] DART/branches Revision: 11784

[dart at ucar.edu]

hendric at ucar.edu
2017-06-29 11:07:54 -0600 (Thu, 29 Jun 2017)
45

merging recent changes from the rma trunk.




Index: DART/branches/rma_file_list_nml
===================================================================
--- DART/branches/rma_file_list_nml	2017-06-29 16:21:18 UTC (rev 11783)
+++ DART/branches/rma_file_list_nml	2017-06-29 17:07:54 UTC (rev 11784)

Property changes on: DART/branches/rma_file_list_nml
___________________________________________________________________
Modified: svn:mergeinfo
## -32,7 +32,7 ##
 /DART/branches/rma_sprint:8101-8172
 /DART/branches/rma_state_structure_test_dir:9478-9682
 /DART/branches/rma_state_structure_unit_test:9697-10274
-/DART/branches/rma_trunk:11729-11781
+/DART/branches/rma_trunk:11729-11783
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
Modified: DART/branches/rma_file_list_nml/assimilation_code/programs/model_mod_check/model_mod_check.f90
===================================================================
--- DART/branches/rma_file_list_nml/assimilation_code/programs/model_mod_check/model_mod_check.f90	2017-06-29 16:21:18 UTC (rev 11783)
+++ DART/branches/rma_file_list_nml/assimilation_code/programs/model_mod_check/model_mod_check.f90	2017-06-29 17:07:54 UTC (rev 11784)
@@ -178,7 +178,7 @@
 
 ! Initialize input file info
 call io_filenames_init(file_info_input,             &
-                       num_copies   = num_ens,      &
+                       ncopies      = num_ens,      &
                        cycling      = single_file,  &
                        single_file  = single_file,  & 
                        restart_list = input_state_files)
@@ -199,7 +199,7 @@
 
 ! Initialize output file info
 call io_filenames_init(file_info_output,           &
-                       num_copies   = num_ens,     &
+                       ncopies      = num_ens,     &
                        cycling      = single_file, &
                        single_file  = single_file, &
                        restart_list = output_state_files)

Modified: DART/branches/rma_file_list_nml/build_templates/mkmf.template
===================================================================
--- DART/branches/rma_file_list_nml/build_templates/mkmf.template	2017-06-29 16:21:18 UTC (rev 11783)
+++ DART/branches/rma_file_list_nml/build_templates/mkmf.template	2017-06-29 17:07:54 UTC (rev 11784)
@@ -1,4 +1,4 @@
-# Template for GNU gfortran on Linux or Mac OSX
+# Template for Intel Fortran Compiler on Linux clusters and workstations.
 #
 # DART software - Copyright UCAR. This open source software is provided
 # by UCAR, "as is", without charge, subject to all terms of use at
@@ -9,57 +9,107 @@
 # typical use with mkmf
 # mkmf -t mkmf.template.xxxx ...
 #
-# Suggested (perhaps required) flags:
-# -ffree-line-length-none   handles "long" lines - i.e. longer than 72 chars
+# FFLAGS   useful for DEBUGGING. NOTE: The intel compiler can provide a lot more
+#          information if you LEAVE the object and module files intact.
+#          Do not remove the *.o and *.mod files when debugging code.
 #
-# Suggested debugging flags:
-#  -g                  add debugging information to executable
-#  -Wuninitialized     catch uninitialized variables
-#  -Wunused            issue warning for unused variables - keeps code clean
-#  -fbacktrace         runtime errors try to print out a stack backtrace
-#  -fbounds-check      add runtime-checking for out-of-range array indices
-#  -ffpe-trap=invalid,zero,overflow
-#                      stop on floating point errors
+#     -g       include debugging information.  these are all synonyms.
+#     -debug full
+#     -debug all
+#     -O0      setting -g will make this the default (no optimization).
+#              it is possible to set -g and then explicitly set -O2 if
+#              the behavior being debugged depends on optimization changes.
+#     -ftrapuv   traps if a local variable is used before being set
+#     -C       enables all runtime checks.  -C and -check all are synonyms.
+#     -check all
+#     -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,
+#                      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
 #
-#  earlier versions of this mkmf file listed 'precision' as one of the options on
-#  the fpe-trap line.  this is not recommended anymore as some of the gfortran internal
-#  routines will trap, as well as some perfectly valid DART computations.
+# FFLAGS   useful for bitwise reproducibility and accuracy control
+#          (these will slow down performance to various degrees)
+#     -fp-model precise    control how floating point roundoff is done so it is