[Dart-dev] DART/branches Revision: 12772

[dart at ucar.edu]

thoar at ucar.edu
2018-08-13 17:27:43 -0600 (Mon, 13 Aug 2018)
351
Adding Yongfei Zhang's modifications - as she has them.

She had been using the rma_trunk:
Last Changed Rev: 12639
Last Changed Date: 2018-06-06 16:11:25 -0600 (Wed, 06 Jun 2018)

There are a couple of versions of dart_to_cice.f90.* model_mod.f90* assimilate2_0 ... etc.
and the cice observation conversion directory desperately needs documentation.




Modified: DART/branches/yz-cice/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/yz-cice/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-08-13 21:43:00 UTC (rev 12771)
+++ DART/branches/yz-cice/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2018-08-13 23:27:43 UTC (rev 12772)
@@ -438,8 +438,10 @@
   QTY_SOM_TEMPERATURE               = 353, &
   QTY_SEAICE_FY                     = 354, &
   QTY_SEAICE_AGREG_FY               = 355, &
-  QTY_SEAICE_AGREG_SURFACETEMP      = 356 
+  QTY_SEAICE_AGREG_SURFACETEMP      = 356, &
+  QTY_SEAICE_AGREG_FREEBOARD        = 357
 
+
 integer, parameter, public :: &
   QTY_SEA_SURFACE_ANOMALY           = 360
 
@@ -856,6 +858,7 @@
 obs_kind_names(354) = obs_kind_type(QTY_SEAICE_FY,             'QTY_SEAICE_FY')
 obs_kind_names(355) = obs_kind_type(QTY_SEAICE_AGREG_FY,       'QTY_SEAICE_AGREG_FY')
 obs_kind_names(356) = obs_kind_type(QTY_SEAICE_AGREG_SURFACETEMP,'QTY_SEAICE_AGREG_SURFACETEMP')
+obs_kind_names(357) = obs_kind_type(QTY_SEAICE_AGREG_FREEBOARD,'QTY_SEAICE_AGREG_FREEBOARD')
 
 obs_kind_names(360) = obs_kind_type(QTY_SEA_SURFACE_ANOMALY,   'QTY_SEA_SURFACE_ANOMALY')
 obs_kind_names(361) = obs_kind_type(QTY_LARGE_SCALE_STATE,     'QTY_LARGE_SCALE_STATE')

Modified: DART/branches/yz-cice/assimilation_code/programs/gen_sampling_err_table/work/input.nml
===================================================================
--- DART/branches/yz-cice/assimilation_code/programs/gen_sampling_err_table/work/input.nml	2018-08-13 21:43:00 UTC (rev 12771)
+++ DART/branches/yz-cice/assimilation_code/programs/gen_sampling_err_table/work/input.nml	2018-08-13 23:27:43 UTC (rev 12772)
@@ -14,7 +14,7 @@
 #
 
 &gen_sampling_error_table_nml
-   ens_sizes = 98, 128
+   ens_sizes = 30
    debug = .false.
    /
 
@@ -26,6 +26,6 @@
 # older research program, not used by filter anymore
 
 &full_error_nml
-   ens_size        = 80
+   ens_size        = 30
    output_filename = "final_full"
    /

Modified: DART/branches/yz-cice/assimilation_code/programs/system_simulation/work/input.nml
===================================================================
--- DART/branches/yz-cice/assimilation_code/programs/system_simulation/work/input.nml	2018-08-13 21:43:00 UTC (rev 12771)
+++ DART/branches/yz-cice/assimilation_code/programs/system_simulation/work/input.nml	2018-08-13 23:27:43 UTC (rev 12772)
@@ -14,7 +14,7 @@
 #
 
 &gen_sampling_error_table_nml
-   ens_sizes = 98, 128
+   ens_sizes = 30
    debug = .false.
    /
 
@@ -26,6 +26,6 @@
 # older research program, not used by filter anymore
 
 &full_error_nml
-   ens_size        = 80
+   ens_size        = 30
    output_filename = "final_full"
    /

Modified: DART/branches/yz-cice/build_templates/mkmf.template
===================================================================
--- DART/branches/yz-cice/build_templates/mkmf.template	2018-08-13 21:43:00 UTC (rev 12771)
+++ DART/branches/yz-cice/build_templates/mkmf.template	2018-08-13 23:27:43 UTC (rev 12772)
@@ -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).