[Dart-dev] DART/branches Revision: 12557

[dart at ucar.edu]

thoar at ucar.edu
2018-04-25 09:45:35 -0600 (Wed, 25 Apr 2018)
147
WRF html files updated for Manhattan.
Found some inaccuracies in the template html files.
Added two fatal versions of init_time, init_conditions.




Modified: DART/branches/rma_trunk/models/template/model_mod.html
===================================================================
--- DART/branches/rma_trunk/models/template/model_mod.html	2018-04-24 20:24:01 UTC (rev 12556)
+++ DART/branches/rma_trunk/models/template/model_mod.html	2018-04-25 15:45:35 UTC (rev 12557)
@@ -764,18 +764,19 @@
 <br>
 <div class=routine>
 <em class=call>call get_close_state(gc, base_loc, base_type,
-  state_loc, state_qtys, state_indx, num_close, close_ind, dist, state_handle</em>) </em>
+  state_loc, state_qtys, state_indx, num_close, close_ind
+  <em class=optionalcode>[, dist, state_handle]</em>) </em>
 <pre>
-type(get_close_type), intent(in)    :: <em class=code>gc</em>
-type(location_type),  intent(inout) :: <em class=code>base_loc</em>
-integer,              intent(in)    :: <em class=code>base_type</em>
-type(location_type),  intent(inout) :: <em class=code>state_loc(:)</em>
-integer,              intent(in)    :: <em class=code>state_qtys(:)</em>
-integer(i8),          intent(in)    :: <em class=code>state_indx(:)</em>
-integer,              intent(out)   :: <em class=code>num_close</em>
-integer,              intent(out)   :: <em class=code>close_ind(:)</em>
-real(r8),             intent(out)   :: <em class=code>dist(:)</em>
-type(ensemble_type),  intent(in)    :: <em class=code>state_handle</em>
+type(get_close_type),          intent(in)    :: <em class=code>gc</em>
+type(location_type),           intent(inout) :: <em class=code>base_loc</em>
+integer,                       intent(in)    :: <em class=code>base_type</em>
+type(location_type),           intent(inout) :: <em class=code>state_loc(:)</em>
+integer,                       intent(in)    :: <em class=code>state_qtys(:)</em>
+integer(i8),                   intent(in)    :: <em class=code>state_indx(:)</em>
+integer,                       intent(out)   :: <em class=code>num_close</em>
+integer,                       intent(out)   :: <em class=code>close_ind(:)</em>
+real(r8),            optional, intent(out)   :: <em class=code>dist(:)</em>
+type(ensemble_type), optional, intent(in)    :: <em class=code>state_handle</em>
 </pre>
 </div>
 
@@ -783,7 +784,7 @@
 <!-- Description -->
 
 <P>
-Given a location and kind, compute the distances to all other locations 
+Given a location and quantity, compute the distances to all other locations 
 in the <em class=code>state_loc</em> list.  The return values are the number
 of items which are within maxdist of the base, the index numbers in the 
 original state_loc list, and optionally the distances.  The <em class=code>gc</em>
@@ -843,7 +844,7 @@
 
 <TR><TD valign=top><em class=code>base_loc</em></TD>
     <TD>Reference location.  The distances will be computed
-        between this location and every other location in the obs list</TD></TR>
+        between this location and every other location in the list</TD></TR>
 
 <TR><TD valign=top><em class=code>base_type</em></TD>
     <TD>The DART quantity at the  <em class=code>base_loc</em></TD></TR>
@@ -910,7 +911,7 @@
 (pressure, height) and the model is generally represented in only one 
 coordinate system. To be able to interpolate the model state to the 
 observation location, or to compute the true distance between the state 
-and the observation, it is necessary to convert everything to one 
+and the observation, it is necessary to convert everything to a single 
 coodinate system.
 </P>
 
@@ -970,12 +971,8 @@
 <P>
 Converts the state to the desired vertical localization coordinate system.
 Some models (toy models with no 'real' observations) will not need this. 
-Most (real) models have observations in one or more coordinate systems 
-(pressure, height) and the model is generally represented in only one 
-coordinate system. To be able to interpolate the model state to the 
-observation location, or to compute the true distance between the state 
-and the observation, it is necessary to convert everything to one 
-coodinate system.
+To compute the true distance between the state and the observation, 
+it is necessary to convert everything to a single coodinate system.
 </P>
 
 <TABLE width=100% border=0 summary="" cellpadding=3>

Modified: DART/branches/rma_trunk/models/utilities/default_model_mod.f90
===================================================================
--- DART/branches/rma_trunk/models/utilities/default_model_mod.f90	2018-04-24 20:24:01 UTC (rev 12556)
+++ DART/branches/rma_trunk/models/utilities/default_model_mod.f90	2018-04-25 15:45:35 UTC (rev 12557)
@@ -36,7 +36,9 @@
           end_model, &
           static_init_model, &
           init_time, &
+          fail_init_time, &
           init_conditions, &
+          fail_init_conditions, &
           nc_write_model_atts, &
           nc_write_model_vars, &
           pert_model_copies, &
@@ -74,6 +76,19 @@
 
 !------------------------------------------------------------------
 
+subroutine fail_init_conditions(x)
+real(r8), intent(out) :: x(:)
+
+call error_handler(E_ERR, 'init_conditions', 'this model cannot start from scratch', &
+                   source, revision, revdate)