[Dart-dev] DART/branches Revision: 11686

[dart at ucar.edu]

nancy at ucar.edu
2017-05-31 14:42:33 -0600 (Wed, 31 May 2017)
232
found a few more places where QTY_RAW_STATE_VARIABLE was still
lurking.  this has changed to simply QTY_STATE_VARIABLE.
most of the changes were either in documentation, in the
model_mod_check namelist, or in comments in the code.




Modified: DART/branches/rma_trunk/developer_tests/io/test_state_structure.f90
===================================================================
--- DART/branches/rma_trunk/developer_tests/io/test_state_structure.f90	2017-05-31 16:55:50 UTC (rev 11685)
+++ DART/branches/rma_trunk/developer_tests/io/test_state_structure.f90	2017-05-31 20:42:33 UTC (rev 11686)
@@ -12,11 +12,11 @@
                                 finalize_utilities, error_handler, &
                                 E_ERR, E_MSG
 
-use        obs_kind_mod, only : get_name_for_quantity,   &
+use        obs_kind_mod, only : get_name_for_quantity,  &
                                 QTY_U_WIND_COMPONENT,   &
                                 QTY_V_WIND_COMPONENT,   &
                                 QTY_SURFACE_PRESSURE,   &
-                                QTY_RAW_STATE_VARIABLE, &
+                                QTY_STATE_VARIABLE,     &
                                 QTY_TEMPERATURE,        &
                                 QTY_SALINITY
 
@@ -275,8 +275,8 @@
 call test_variable_info(did1, VAR1, &
                         exp_var_size    = b1sz, &
                         exp_num_dims    = 1, &
-                        exp_kind_indx   =  QTY_RAW_STATE_VARIABLE, &
-                        exp_kind_string = 'QTY_RAW_STATE_VARIABLE',&
+                        exp_kind_indx   =  QTY_STATE_VARIABLE, &
+                        exp_kind_string = 'QTY_STATE_VARIABLE',&
                         exp_var_name    = 'state')
 
 write(*,*)' ... Testing Domain 2'
@@ -283,8 +283,8 @@
 call test_variable_info(did2, VAR1, &
                         exp_var_size    = b2sz, &
                         exp_num_dims    = 1, &
-                        exp_kind_indx   =  QTY_RAW_STATE_VARIABLE, &
-                        exp_kind_string = 'QTY_RAW_STATE_VARIABLE',&
+                        exp_kind_indx   =  QTY_STATE_VARIABLE, &
+                        exp_kind_string = 'QTY_STATE_VARIABLE',&
                         exp_var_name    = 'state')
 
 write(*,*)' ... Testing Domain 3 Var 1'
@@ -291,8 +291,8 @@
 call test_variable_info(did3, VAR1, &
                         exp_var_size    = f1d1, &
                         exp_num_dims    = 1, &
-                        exp_kind_indx   =  QTY_RAW_STATE_VARIABLE, &
-                        exp_kind_string = 'QTY_RAW_STATE_VARIABLE',&
+                        exp_kind_indx   =  QTY_STATE_VARIABLE, &
+                        exp_kind_string = 'QTY_STATE_VARIABLE',&
                         exp_var_name    = 'A')
 
 write(*,*)' ... Testing Domain 3 Var 4'
@@ -307,8 +307,8 @@
 call test_variable_info(did4, VAR1, &
                         exp_var_size    = f2d1, &
                         exp_num_dims    = 1, &
-                        exp_kind_indx   =  QTY_RAW_STATE_VARIABLE, &
-                        exp_kind_string = 'QTY_RAW_STATE_VARIABLE',&
+                        exp_kind_indx   =  QTY_STATE_VARIABLE, &
+                        exp_kind_string = 'QTY_STATE_VARIABLE',&
                         exp_var_name    = 'B')
 
 call test_variable_info(did4, VAR3, &
@@ -639,8 +639,8 @@
                          exp_kloc =  1, &
                          exp_varid = 1, &
                          exp_domid = dom, &
-                         exp_kind_index  =  QTY_RAW_STATE_VARIABLE, &
-                         exp_kind_string = 'QTY_RAW_STATE_VARIABLE')
+                         exp_kind_index  =  QTY_STATE_VARIABLE, &
+                         exp_kind_string = 'QTY_STATE_VARIABLE')
 
 ! DOMAIN2
 state_indx = 109_i8
@@ -652,8 +652,8 @@
                          exp_kloc =  1, &
                          exp_varid = 1, &
                          exp_domid = dom, &
-                         exp_kind_index  =  QTY_RAW_STATE_VARIABLE, &
-                         exp_kind_string = 'QTY_RAW_STATE_VARIABLE')
+                         exp_kind_index  =  QTY_STATE_VARIABLE, &
+                         exp_kind_string = 'QTY_STATE_VARIABLE')
 
 ! DOMAIN3
 state_indx = 112_i8
@@ -665,8 +665,8 @@
                          exp_kloc =  1, &
                          exp_varid = 1, &
                          exp_domid = dom, &
-                         exp_kind_index  =  QTY_RAW_STATE_VARIABLE, &
-                         exp_kind_string = 'QTY_RAW_STATE_VARIABLE')
+                         exp_kind_index  =  QTY_STATE_VARIABLE, &
+                         exp_kind_string = 'QTY_STATE_VARIABLE')
 
 ! DOMAIN3
 state_indx = 115_i8
@@ -678,8 +678,8 @@
                          exp_kloc =  1, &
                          exp_varid = 2, &
                          exp_domid = dom, &
-                         exp_kind_index  =  QTY_RAW_STATE_VARIABLE, &
-                         exp_kind_string = 'QTY_RAW_STATE_VARIABLE')