[Dart-dev] DART/branches Revision: 11581

[dart at ucar.edu]

thoar at ucar.edu
2017-05-02 11:55:07 -0600 (Tue, 02 May 2017)
357
The documentation for CM1 is up-to-date and consistent with Manhattan.
The advance_model.py was removed as it was never fully implemented.
The existing cm1/shell_scripts csh scripts are untested with Manhattan,
but were working with earlier versions.

Luke's test case does not test vertical interpolation.

setup_perfect_model_obs.py is not finished yet.




Modified: DART/branches/rma_trunk/models/cm1/model_mod.f90
===================================================================
--- DART/branches/rma_trunk/models/cm1/model_mod.f90	2017-05-02 17:37:44 UTC (rev 11580)
+++ DART/branches/rma_trunk/models/cm1/model_mod.f90	2017-05-02 17:55:07 UTC (rev 11581)
@@ -19,9 +19,9 @@
 
 use     location_mod, only : location_type, get_dist, query_location,          &
                              get_close_maxdist_init, get_close_type,           &
-                             set_location, get_location,                       & 
+                             set_location, get_location,                       &
                              get_close_obs_init, write_location,               &
-                             loc_get_close_obs => get_close_obs, set_periodic  
+                             loc_get_close_obs => get_close_obs, set_periodic
 
 use    utilities_mod, only : register_module, error_handler,                   &
                              E_ERR, E_WARN, E_MSG, logfileunit, get_unit,      &
@@ -52,7 +52,7 @@
 use ensemble_manager_mod, only : ensemble_type, copies_in_window
 
 use typesizes
-use netcdf 
+use netcdf
 
 implicit none
 private
@@ -105,7 +105,7 @@
 logical            :: periodic_y = .true.
 logical            :: periodic_z = .false. ! not supported at the moment
 
-!  The DART state vector may consist of things like:  
+!  The DART state vector may consist of things like:
 !
 ! float prs(nk, nj, ni) ;
 !         prs:long_name = "pressure" ;
@@ -141,7 +141,7 @@
 
 ! indices associated with variable_table columns
 integer, parameter :: VT_VARNAME_INDEX  = 1
-integer, parameter :: VT_DARTQTY_INDEX = 2
+integer, parameter :: VT_DARTQTY_INDEX  = 2
 integer, parameter :: VT_UPDATE_INDEX   = 3
 integer, parameter :: VT_MINVAL_INDEX   = 4
 integer, parameter :: VT_MAXVAL_INDEX   = 5
@@ -150,11 +150,11 @@
    assimilation_period_days,    &  ! for now, this is the timestep
    assimilation_period_seconds, &
    model_perturbation_amplitude,&
-   cm1_template_file,           & 
+   cm1_template_file,           &
    calendar,                    &
    debug,                       &
    model_variables,             &
-   periodic_x,                  & ! FIXME: should we grab this information from namelist.input
+   periodic_x,                  & !>@todo FIXME: should we grab this information from namelist.input
    periodic_y,                  & ! or have this information written as attributes to restart files?
    periodic_z
 
@@ -167,7 +167,7 @@
 ! vector grids: i+1, j+1, k+1 (3 vector grids)
 ! Also have 2d fields on scalar grid (should these be treated separately).
 integer  :: ni  =-1, nj  =-1, nk  =-1   ! scalar grid counts
-integer  :: nip1=-1, njp1=-1, nkp1=-1 ! staggered grid counts 
+integer  :: nip1=-1, njp1=-1, nkp1=-1 ! staggered grid counts
 
 ! Arrays of grid values
 
@@ -187,8 +187,8 @@
 real(r8), allocatable :: axis(:) ! this array is the length of largest axis
 
 ! full grid points
-real(r8), allocatable :: zfull(:,:,:) ! height full (w) grid points (3d array) 
-real(r8), allocatable :: zhalf(:,:,:) ! height half (scalar) grid points (3d array) 
+real(r8), allocatable :: zfull(:,:,:) ! height full (w) grid points (3d array)
+real(r8), allocatable :: zhalf(:,:,:) ! height half (scalar) grid points (3d array)
 
 ! logicals to store what grid a variable is on
 logical, allocatable :: on_ugrid(:), on_vgrid(:), on_z_full(:)
@@ -202,7 +202,7 @@
 contains
 
 !==================================================================
-! REQUIRED interfaces. the names and arguments cannot be changed 
+! REQUIRED interfaces. the names and arguments cannot be changed
 !    because these are called by DART routines.
 
 !------------------------------------------------------------------
@@ -213,7 +213,6 @@
 
 subroutine static_init_model()
 
-! FIXME:
 ! Local variables - all the important ones have module scope
 
 integer :: ncid
@@ -258,16 +257,16 @@
 ! 1) get grid dimensions
 ! 2) allocate space for the grid
 ! 3) read it from the template file
- 
+
 call get_grid_info(ncid)