[Dart-dev] DART/branches Revision: 12722

[dart at ucar.edu]

nancy at ucar.edu
2018-07-10 15:01:07 -0600 (Tue, 10 Jul 2018)
52
updating gigg branch with recent rma_trunk changes




Index: DART/branches/gigg
===================================================================
--- DART/branches/gigg	2018-07-10 20:58:49 UTC (rev 12721)
+++ DART/branches/gigg	2018-07-10 21:01:07 UTC (rev 12722)

Property changes on: DART/branches/gigg
___________________________________________________________________
Modified: svn:mergeinfo
## -39,7 +39,7 ##
 /DART/branches/rma_sprint:8093-8164
 /DART/branches/rma_state_structure_test_dir:9470-9674
 /DART/branches/rma_state_structure_unit_test:9689-10266
-/DART/branches/rma_trunk:11851-12714
+/DART/branches/rma_trunk:11851-12721
 /DART/branches/rma_trunk_clamping:8784-8799
 /DART/branches/rma_trunk_filename:8009-8155
 /DART/branches/rma_trunk_get_state_fun:8566-8594
Index: DART/branches/gigg/models/lorenz_96/work
===================================================================
--- DART/branches/gigg/models/lorenz_96/work	2018-07-10 20:58:49 UTC (rev 12721)
+++ DART/branches/gigg/models/lorenz_96/work	2018-07-10 21:01:07 UTC (rev 12722)

Property changes on: DART/branches/gigg/models/lorenz_96/work
___________________________________________________________________
Modified: svn:mergeinfo
## -39,7 +39,7 ##
 /DART/branches/rma_sprint/models/lorenz_96/work:8093-8166
 /DART/branches/rma_state_structure_test_dir/models/lorenz_96/work:9470-9676
 /DART/branches/rma_state_structure_unit_test/models/lorenz_96/work:9689-10268
-/DART/branches/rma_trunk/models/lorenz_96/work:11851-12712
+/DART/branches/rma_trunk/models/lorenz_96/work:11851-12721
 /DART/branches/rma_trunk_clamping/models/lorenz_96/work:8784-8801
 /DART/branches/rma_trunk_filename/models/lorenz_96/work:8009-8157
 /DART/branches/rma_trunk_get_state_fun/models/lorenz_96/work:8566-8596
Modified: DART/branches/gigg/models/simple_advection/model_mod.f90
===================================================================
--- DART/branches/gigg/models/simple_advection/model_mod.f90	2018-07-10 20:58:49 UTC (rev 12721)
+++ DART/branches/gigg/models/simple_advection/model_mod.f90	2018-07-10 21:01:07 UTC (rev 12722)
@@ -28,6 +28,7 @@
 
 use default_model_mod,     only : end_model, nc_write_model_vars, init_time
 
+
 use     obs_kind_mod, only : QTY_VELOCITY, QTY_TRACER_CONCENTRATION, &
                              QTY_TRACER_SOURCE, QTY_MEAN_SOURCE, QTY_SOURCE_PHASE
 
@@ -104,11 +105,6 @@
 integer  :: time_step_days          = 0
 integer  :: time_step_seconds       = 3600
 
-! if you have a template file, set the name here.
-! if you are not starting from a restart, leave this as ''
-! and the code should construct a domain from spec.
-character(len=256) :: template_file = ''
-
 ! Namelist parameters associated with wind
 ! Base velocity (expected value over time), in meters/second
 real(r8)  :: mean_wind              = 20.0_r8
@@ -144,8 +140,7 @@
                      mean_wind, wind_random_amp, wind_damping_rate, &
                      lagrangian_for_wind, destruction_rate, &
                      source_random_amp_frac, source_damping_rate, &
-                     source_diurnal_rel_amp, source_phase_noise, &
-                     template_file
+                     source_diurnal_rel_amp, source_phase_noise
 
 
 ! Define the location of the state variables in module storage
@@ -221,37 +216,19 @@
    random_seq_init = .true.
 endif
 
-! Tell the DART I/O routines how large the model data is so they
-! can read/write it.
-if (template_file /= '') then
-   dom_id = add_domain(template_file, NVARS, &
-                       (/ 'concentration', &
-                          'source       ', &
-                          'wind         ', &
-                          'mean_source  ', &
-                          'source_phase ' /))
-else 
-   !>@todo FIXME : should not need a template file if initializing members from code
+! Tell DART how many grid variables are in the model state
+dom_id = add_domain(NVARS, (/ 'concentration', &
+                              'source       ', &
+                              'wind         ', &
+                              'mean_source  ', &
+                              'source_phase ' /))
 
-   write(string1, *) 'template file is required for now'
-   call error_handler(E_ERR,'static_init_model',string1, source, revision, revdate)
+do var_id=1, NVARS
+   call add_dimension_to_variable(dom_id, var_id, 'location', int(num_grid_points, i4))
+enddo
 
-   dom_id = add_domain(NVARS, (/ 'concentration', &
-                                 'source       ', &
-                                 'wind         ', &
-                                 'mean_source  ', &
-                                 'source_phase ' /))