[Dart-dev] DART/branches Revision: 12942

[dart at ucar.edu]

thoar at ucar.edu
2018-11-29 09:29:01 -0700 (Thu, 29 Nov 2018)
25
tracking the rma_trunk.




Index: DART/branches/cesm_clm
===================================================================
--- DART/branches/cesm_clm	2018-11-27 20:32:27 UTC (rev 12941)
+++ DART/branches/cesm_clm	2018-11-29 16:29:01 UTC (rev 12942)

Property changes on: DART/branches/cesm_clm
___________________________________________________________________
Modified: svn:mergeinfo
## -42,7 +42,7 ##
 /DART/branches/rma_sprint:8095-8166
 /DART/branches/rma_state_structure_test_dir:9472-9676
 /DART/branches/rma_state_structure_unit_test:9691-10268
-/DART/branches/rma_trunk:12108-12929
+/DART/branches/rma_trunk:12108-12941
 /DART/branches/rma_trunk_clamping:8786-8801
 /DART/branches/rma_trunk_filename:8011-8157
 /DART/branches/rma_trunk_get_state_fun:8568-8596
Modified: DART/branches/cesm_clm/assimilation_code/modules/observations/forward_operator_mod.f90
===================================================================
--- DART/branches/cesm_clm/assimilation_code/modules/observations/forward_operator_mod.f90	2018-11-27 20:32:27 UTC (rev 12941)
+++ DART/branches/cesm_clm/assimilation_code/modules/observations/forward_operator_mod.f90	2018-11-29 16:29:01 UTC (rev 12942)
@@ -520,12 +520,12 @@
    if(istatus(copy) == 0) then
       if ((assimilate_ob .or. evaluate_ob) .and. (expected_obs(copy) == missing_r8)) then
          write(msgstring, *) 'istatus was 0 (OK) but forward operator returned missing value.'
-         call error_handler(E_ERR,'filter_main', msgstring, source, revision, revdate)
+         call error_handler(E_ERR,'check_forward_operator_istatus', msgstring, source, revision, revdate)
       endif
    ! Negative istatus
    else if (istatus(copy) < 0) then
       write(msgstring, *) 'istatus must not be <0 from forward operator. 0=OK, >0 for error'
-      call error_handler(E_ERR,'filter_main', msgstring, source, revision, revdate)
+      call error_handler(E_ERR,'check_forward_operator_istatus', msgstring, source, revision, revdate)
    endif
 
 enddo

Modified: DART/branches/cesm_clm/models/null_model/work/input.nml
===================================================================
--- DART/branches/cesm_clm/models/null_model/work/input.nml	2018-11-27 20:32:27 UTC (rev 12941)
+++ DART/branches/cesm_clm/models/null_model/work/input.nml	2018-11-29 16:29:01 UTC (rev 12942)
@@ -1,7 +1,9 @@
 &perfect_model_obs_nml
-   read_input_state_from_file = .false.,
+   read_input_state_from_file = .true.,
    single_file_in             = .true.
    input_state_files          = "perfect_input.nc"
+   init_time_days             = 0,
+   init_time_seconds          = 0,
 
    write_output_state_to_file = .true.,
    single_file_out            = .true.
@@ -8,23 +10,21 @@
    output_state_files         = "perfect_output.nc"
    output_interval            = 1,
 
-   async                 = 0,
+   async                      = 0,
    adv_ens_command            = "./advance_model.csh",
 
    obs_seq_in_file_name       = "obs_seq.in",
    obs_seq_out_file_name      = "obs_seq.out",
-   init_time_days        = 0,
-   init_time_seconds     = 0,
-   first_obs_days        = -1,
-   first_obs_seconds     = -1,
-   last_obs_days         = -1,
-   last_obs_seconds      = -1,
+   first_obs_days             = -1,
+   first_obs_seconds          = -1,
+   last_obs_days              = -1,
+   last_obs_seconds           = -1,
 
-   trace_execution       = .false.,
+   trace_execution            = .false.,
    output_timestamps          = .false.,
-   print_every_nth_obs   = -1,
+   print_every_nth_obs        = -1,
    output_forward_op_errors   = .false.,
-   silence               = .false.,
+   silence                    = .false.,
    /
 
 &filter_nml
@@ -31,6 +31,8 @@
    single_file_in               = .true.,
    input_state_files            = 'filter_input.nc'
    input_state_file_list        = ''
+   init_time_days               = 0,
+   init_time_seconds            = 0,
 
    stages_to_write  = 'preassim', 'analysis', 'output'
 
@@ -55,9 +57,7 @@
 
    obs_sequence_in_name     = "obs_seq.out",
    obs_sequence_out_name    = "obs_seq.final",
-   num_output_obs_members       = 20,
-   init_time_days           = 0,
-   init_time_seconds        = 0,
+   num_output_obs_members   = 20,