[Dart-dev] DART/branches Revision: 11102

[dart at ucar.edu]

nancy at ucar.edu
2017-02-13 11:47:18 -0700 (Mon, 13 Feb 2017)
15
more updates.




Modified: DART/branches/rma_single_file/models/lorenz_04/model_mod.f90
===================================================================
--- DART/branches/rma_single_file/models/lorenz_04/model_mod.f90	2017-02-13 18:40:49 UTC (rev 11101)
+++ DART/branches/rma_single_file/models/lorenz_04/model_mod.f90	2017-02-13 18:47:18 UTC (rev 11102)
@@ -61,7 +61,7 @@
 !---------------------------------------------------------------
 ! Basic model parameters controlled by nameslist; have defaults
 !
-integer  :: model_size       = 960
+integer(i8)  :: model_size       = 960
 real(r8) :: forcing          = 15.00_r8
 real(r8) :: delta_t          = 0.001_r8
 real(r8) :: space_time_scale = 10.00_r8
@@ -106,7 +106,7 @@
 real(r8) :: ri
 real(r8) :: alpha, beta
 integer  :: i, iunit, io
-integer  :: j
+integer  :: j, dom_id
 
 ! Print module information to log file and stdout.
 call register_module(source, revision, revdate)
@@ -169,6 +169,8 @@
 ss2  = 2*smooth_steps
 sts2 = space_time_scale**2   
 
+dom_id = add_domain(model_size)
+
 end subroutine static_init_model
 
 
@@ -657,7 +659,7 @@
 !--------------------------------------------------------------------
 
 call check(nf90_def_dim(ncid=ncFileID, name="StateVariable", &
-                        len=model_size, dimid = StateVarDimID))
+                        len=int(model_size, i4), dimid = StateVarDimID))
 
 !--------------------------------------------------------------------
 ! Define the Location Variable and add Attributes
@@ -682,7 +684,7 @@
            dimids=StateVarDimID, varid=StateVarVarID))
 call check(nf90_put_att(ncFileID, StateVarVarID, "long_name", "State Variable ID"))
 call check(nf90_put_att(ncFileID, StateVarVarID, "units",     "indexical") )
-call check(nf90_put_att(ncFileID, StateVarVarID, "valid_range", (/ 1, model_size /)))
+call check(nf90_put_att(ncFileID, StateVarVarID, "valid_range", (/ 1, int(model_size, i4) /)))
 
 ! Define the actual state vector
 call check(nf90_def_var(ncid=ncFileID, name="state", xtype=nf90_double, &

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-13 18:40:49 UTC (rev 11101)
+++ DART/branches/rma_single_file/models/lorenz_04/work/input.nml	2017-02-13 18:47:18 UTC (rev 11102)
@@ -1,7 +1,19 @@
 &perfect_model_obs_nml
-   start_from_restart    = .true.,
-   output_restart        = .true.,
+   read_input_state_from_file = .true.,
+   single_file_in             = .true.
+   input_state_files          = "perfect_input.nc"
+
+   write_output_state_to_file = .true.,
+   single_file_out            = .true.
+   output_state_files         = "perfect_output.nc"
+   output_interval            = 1,
+
+   has_cycling                = .true.
    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,
@@ -8,29 +20,47 @@
    first_obs_seconds     = -1,
    last_obs_days         = -1,
    last_obs_seconds      = -1,
-   output_interval       = 1,
-   restart_in_file_name  = "perfect_ics",
-   restart_out_file_name = "perfect_restart",
-   obs_seq_in_file_name  = "obs_seq.in",
-   obs_seq_out_file_name = "obs_seq.out",
-   adv_ens_command       = "./advance_model.csh",
-   output_timestamps     = .false.,
+
    trace_execution       = .false.,
-   output_forward_op_errors = .false.,
+   output_timestamps          = .false.,
    print_every_nth_obs   = -1,
+   output_forward_op_errors   = .false.,
    silence               = .false.,
    /
 
+# these don't work yet, but will soon:
+#    input_state_files            = 'filter_input.nc'
+#   output_state_files            = 'filter_output.nc'
+
 &filter_nml