[Dart-dev] DART/branches Revision: 11111

[dart at ucar.edu]

thoar at ucar.edu
2017-02-14 12:00:12 -0700 (Tue, 14 Feb 2017)
79
Reverting bad commit.
These got committed at r11104 and should not have been.




Modified: DART/branches/rma_single_file/mkmf/mkmf.template
===================================================================
--- DART/branches/rma_single_file/mkmf/mkmf.template	2017-02-14 18:01:38 UTC (rev 11110)
+++ DART/branches/rma_single_file/mkmf/mkmf.template	2017-02-14 19:00:12 UTC (rev 11111)
@@ -80,15 +80,15 @@
 # uncomment the following line and set value to where lib and include
 # are found for the netcdf files that match this compiler.
 #
-NETCDF = /opt/local
+# NETCDF = /opt/local
 
 INCS = -I$(NETCDF)/include
 LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf
-# FFLAGS  = -O2 -ffree-line-length-none $(INCS)
+FFLAGS  = -O2 -ffree-line-length-none $(INCS)
 LDFLAGS = $(FFLAGS) $(LIBS)
 
- FFLAGS = -g -Wuninitialized -Wunused -ffree-line-length-none -fbounds-check \
-          -fbacktrace -ffpe-trap=invalid,zero,overflow $(INCS)
+# FFLAGS = -g -Wuninitialized -Wunused -ffree-line-length-none -fbounds-check \
+#          -fbacktrace -ffpe-trap=invalid,zero,overflow $(INCS)
 
 # <next few lines under version control, do not edit>
 # $URL$

Modified: DART/branches/rma_single_file/models/lorenz_04/work/input.nml
===================================================================
--- DART/branches/rma_single_file/models/lorenz_04/work/input.nml	2017-02-14 18:01:38 UTC (rev 11110)
+++ DART/branches/rma_single_file/models/lorenz_04/work/input.nml	2017-02-14 19:00:12 UTC (rev 11111)
@@ -91,9 +91,6 @@
 &ensemble_manager_nml
    /
 
-# the localization cutoff in this file is distributed is too
-# large for the model to converge.  to test that the model is 
-# doing a successful assimilation, change cutoff to 0.02 and rerun.
 &assim_tools_nml
    filter_kind                     = 1,
    cutoff                          = 1000000.0,

Modified: DART/branches/rma_single_file/models/lorenz_63/work/input.nml
===================================================================
--- DART/branches/rma_single_file/models/lorenz_63/work/input.nml	2017-02-14 18:01:38 UTC (rev 11110)
+++ DART/branches/rma_single_file/models/lorenz_63/work/input.nml	2017-02-14 19:00:12 UTC (rev 11111)
@@ -36,7 +36,7 @@
    input_state_files            = ''
    input_state_file_list        = 'filter_input_list.txt'
 
-   stages_to_write  = 'preassim', 'postassim', 'output'
+   stages_to_write  = 'preassim', 'output'
 
    single_file_out              = .true.,
    output_state_files           = ''
@@ -68,7 +68,7 @@
    last_obs_days                = -1,
    last_obs_seconds             = -1,
 
-   inf_flavor                  = 0,                       0,
+   inf_flavor                  = 2,                       0,
    inf_initial_from_restart    = .false.,                 .false.,
    inf_sd_initial_from_restart = .false.,                 .false.,
    inf_deterministic           = .true.,                  .true.,
@@ -98,7 +98,7 @@
 
 &assim_tools_nml
    filter_kind                     = 1,
-   cutoff                          = 0.00001,
+   cutoff                          = 0.001,
    sort_obs_inc                    = .false.,
    spread_restoration              = .false.,
    sampling_error_correction       = .false.,

Modified: DART/branches/rma_single_file/models/lorenz_96/work/input.nml
===================================================================
--- DART/branches/rma_single_file/models/lorenz_96/work/input.nml	2017-02-14 18:01:38 UTC (rev 11110)
+++ DART/branches/rma_single_file/models/lorenz_96/work/input.nml	2017-02-14 19:00:12 UTC (rev 11111)
@@ -37,7 +37,7 @@
    input_state_files            = ''
    input_state_file_list        = 'filter_input_list.txt'
 
-   stages_to_write  = 'preassim', 'postassim', 'output'
+   stages_to_write  = 'preassim', 'output'
 
    single_file_out              = .true.,
    output_state_files           = ''
@@ -68,7 +68,7 @@
    last_obs_days                = -1,
    last_obs_seconds             = -1,
 
-   inf_flavor                  = 0,                       0,
+   inf_flavor                  = 2,                       0,
    inf_initial_from_restart    = .false.,                 .false.,
    inf_sd_initial_from_restart = .false.,                 .false.,
    inf_deterministic           = .true.,                  .true.,
@@ -96,12 +96,9 @@
 &ensemble_manager_nml
    /
 
-# the localization cutoff in this file is distributed is too
-# large for the model to converge.  to test that the model is 
-# doing a successful assimilation, change cutoff to 0.02 and rerun.