[Dart-dev] DART/branches Revision: 12855

[dart at ucar.edu]

thoar at ucar.edu
2018-09-25 14:52:36 -0600 (Tue, 25 Sep 2018)
149
enforcing DART style guide in the model_mod.f90
removing test_grid (and the test_roms_interpolate module) - not needed - model_mod_check does this.




Modified: DART/branches/roms_interpolation/models/ROMS/model_mod.f90
===================================================================
--- DART/branches/roms_interpolation/models/ROMS/model_mod.f90	2018-09-25 20:35:38 UTC (rev 12854)
+++ DART/branches/roms_interpolation/models/ROMS/model_mod.f90	2018-09-25 20:52:36 UTC (rev 12855)
@@ -85,9 +85,9 @@
                                   get_long_name, get_xtype, get_has_missing_value, &
                                   get_dim_lengths
 
-use netcdf_utilities_mod, only : nc_add_global_attribute, nc_synchronize_file, nc_check, &
+use netcdf_utilities_mod, only : nc_add_global_attribute, nc_synchronize_file, &
                                  nc_add_global_creation_time, nc_begin_define_mode, &
-                                 nc_end_define_mode
+                                 nc_end_define_mode, nc_check
 
 use location_io_mod,      only : nc_write_location_atts, nc_get_location_varids, &
                                  nc_write_location
@@ -95,9 +95,9 @@
 use default_model_mod,    only : pert_model_copies, nc_write_model_vars, init_conditions, &
                                  init_time, adv_1step
 
-use quad_utils_mod,       only : quad_interp_handle, init_quad_interp, &
-                                 finalize_quad_interp, set_quad_coords, quad_lon_lat_locate, &
-                                 quad_lon_lat_evaluate, print_quad_handle, &
+use quad_utils_mod,       only : quad_interp_handle, print_quad_handle, set_quad_coords, &
+                                 init_quad_interp, finalize_quad_interp, &
+                                 quad_lon_lat_locate, quad_lon_lat_evaluate, &
                                  GRID_QUAD_FULLY_IRREGULAR, QUAD_LOCATED_CELL_CENTERS, &
                                  QUAD_LOCATED_LON_EDGES, QUAD_LOCATED_LAT_EDGES
 
@@ -137,10 +137,10 @@
 !          get_location_from_ijk
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
+character(len=*), parameter :: source   = &
    "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: revision = "$Revision$"
+character(len=*), parameter :: revdate  = "$Date$"
 
 character(len=512) :: string1, string2, string3
 logical, save :: module_initialized = .false.
@@ -149,7 +149,6 @@
 
 ! things which can/should be in the model_nml
 !>@todo FIXME ... replace remaining references to VERTISHEIGHT with vert_localization_coord
-logical  :: output_state_vector          = .false.
 integer  :: assimilation_period_days     = 1
 integer  :: assimilation_period_seconds  = 0
 integer  :: vert_localization_coord      = VERTISHEIGHT
@@ -182,14 +181,7 @@
 
 integer :: domain_id ! global variable for state_structure_mod routines
 
-!> Everything needed to describe a variable. Basically all the metadata from
-!> a netCDF file is stored here as well as all the information about where
-!> the variable is stored in the DART state vector.
-!>
-
-! Grid parameters - the values will be read from a
-! standard ROMS namelist and filled in here.
-
+! Grid parameters
 ! nx, ny and nz are the size of the rho grids.
 integer :: Nx = -1, Ny = -1, Nz = -1
 
@@ -206,7 +198,6 @@
 real(r8) :: theta_s, theta_b
 real(r8) :: Tcline,  hc
  
-
 !>@todo FIXME ... nancy suggested creating pointers for each of these so
 !    we could simply use the myvarid as the index in the pointer ...
 
@@ -225,10 +216,6 @@
 
 integer :: model_size    ! the state vector length
 
-!> Reshapes a part of the DART vector back to the original variable shape.
-!>@todo FIXME Replaces the DART MISSING value with the original _FillValue value.
-
-
 contains
 
 
@@ -297,7 +284,7 @@
 elseif (myqty == QTY_V_CURRENT_COMPONENT) then
    mybathy = 0.5*(BATHY(iloc,jloc)+BATHY(iloc,jloc+1))
    call get_depths(mybathy, 0.0_r8, depths, 1, Ns_rho)
-   location = set_location(VLON(iloc,jloc), VLAT(iloc,jloc), depths(vloc),VERTISHEIGHT)
+   location = set_location(VLON(iloc,jloc), VLAT(iloc,jloc), depths(vloc), VERTISHEIGHT)
 
 elseif (myqty == QTY_SEA_SURFACE_HEIGHT) then
    location = set_location(TLON(iloc,jloc), TLAT(iloc,jloc), 0.0_r8, VERTISSURFACE)
@@ -333,7 +320,8 @@
 !> @param istatus interpolation status ... 0 == success, /=0 is a failure
 !>
 
-subroutine model_interpolate(state_handle, ens_size, location, obs_type, expected_obs, istatus)
+subroutine model_interpolate(state_handle, ens_size, location, obs_type, &