[Dart-dev] DART/branches Revision: 12064

[dart at ucar.edu]

nancy at ucar.edu
2017-11-08 09:32:44 -0700 (Wed, 08 Nov 2017)
291
keep plugging away at moving the nc_check reference from utilities
to netcdf_utilities.  once we finish that we can remove the 'use netcdf'
from the utilities mod.

rename the original cam model_mod to original_model_mod and rename
the one we've been working on to the basic model_mod.f90.




Modified: DART/branches/recam/assimilation_code/programs/obs_diag/threed_sphere/obs_diag.f90
===================================================================
--- DART/branches/recam/assimilation_code/programs/obs_diag/threed_sphere/obs_diag.f90	2017-11-07 23:18:13 UTC (rev 12063)
+++ DART/branches/recam/assimilation_code/programs/obs_diag/threed_sphere/obs_diag.f90	2017-11-08 16:32:44 UTC (rev 12064)
@@ -47,8 +47,9 @@
                              file_exist, error_handler, E_ERR, E_WARN, E_MSG,  &
                              initialize_utilities, logfileunit, nmlfileunit,   &
                              find_namelist_in_file, check_namelist_read,       &
-                             nc_check, do_nml_file, do_nml_term, finalize_utilities, &
+                             do_nml_file, do_nml_term, finalize_utilities, &
                              next_file, get_next_filename
+use netcdf_utilities_mod, only : nc_check
 use         sort_mod, only : sort
 use   random_seq_mod, only : random_seq_type, init_random_seq, several_random_gaussians
 

Modified: DART/branches/recam/assimilation_code/programs/obs_seq_to_netcdf/obs_seq_to_netcdf.f90
===================================================================
--- DART/branches/recam/assimilation_code/programs/obs_seq_to_netcdf/obs_seq_to_netcdf.f90	2017-11-07 23:18:13 UTC (rev 12063)
+++ DART/branches/recam/assimilation_code/programs/obs_seq_to_netcdf/obs_seq_to_netcdf.f90	2017-11-08 16:32:44 UTC (rev 12064)
@@ -33,9 +33,10 @@
 use    utilities_mod, only : register_module, &
                              file_exist, error_handler, E_ERR, E_MSG, &
                              initialize_utilities, finalize_utilities, nmlfileunit, &
-                             find_namelist_in_file, check_namelist_read, nc_check, &
+                             find_namelist_in_file, check_namelist_read, &
                              next_file, get_next_filename, find_textfile_dims, &
                              file_to_text, do_nml_file, do_nml_term
+use netcdf_utilities_mod, only : nc_check
 
 use typeSizes
 use netcdf

Deleted: DART/branches/recam/models/cam-fv/model_mod.f90
===================================================================
--- DART/branches/recam/models/cam-fv/model_mod.f90	2017-11-07 23:18:13 UTC (rev 12063)
+++ DART/branches/recam/models/cam-fv/model_mod.f90	2017-11-08 16:32:44 UTC (rev 12064)
@@ -1,5504 +0,0 @@
-! DART software - Copyright UCAR. This open source software is provided
-! by UCAR, "as is", without charge, subject to all terms of use at
-! http://www.image.ucar.edu/DAReS/DART/DART_download
-
-! $Id$
-
-! > > > This version has NOT been updated to describe RMA changes.
-!       See RMA-KR for changes to Helen's original RMA version.
-!       Some comments in here are meant to connect with comments in 
-!       the trunk (non-RMA) version as of 2016-7.  These comments
-!       and the sections in the trunk may be helpful in tracing the
-!       development of the RMA for FV, and help with the development
-!       of the RMA SE version.
-
-
-!>  This is the interface module between remote memory access capable DART (RMA) 
-!>  and the atmospheric components of CESM; CAM, WACCM, CAM-Chem (, ...?).  
-!>  It contains the required 16 interface procedures, as specified by DART.  
-!>  It also contains several utility routines which help translate between CAM and DART 
-!>  formats, and deal with time.
-!>  It is used by filter and perfect_model_obs.
-!>
-!>  This module handles the finite volume dynamical core version of CAM.
-!>  A separate model_mod will handle CAM-SE, the spectral element dycore.
-!>  CAM-FV uses a logically rectangular grid,
-!>  while CAM-SE uses the cubed sphere (non-rectangular) horizontal grid.
-!>
-!>  There is a perturburbation routine for generating and initial ensemble.
-!>  This routine is activated by the filter namelist logical perturb_from_single_instance
-!>  and the model_mod namelist variable pert_names.
-!>  The module does not provide adv_1step or init_conditions because CAM 
-!>  is a separate executable and cannot be called as a subroutine.
-!>
-!>  This module intercepts the get_close_obs() calls and can alter the distances
-!>  for obs near the top of the model to reduce the impact on the state near the
-!>  top.
-!>
-!>  The coordinate orders of fields are preserved from the CAM initial file order.
-!>
-!>  The RMA model_mod does not refer to TYPE_s, since they were replaced by association
-!>  with CAM variables and use of find_name. 
-!>  In the future, DART QTYs will be associated with CAM variables by the ${comp}_variables
-!>  mechanism as in models/clm.
-!>  If a user wants to add new CAM variables to the state vector,
-!>  then more QTY_s may be needed in the 'use obs_kind_mod' statement and maybe the obs_kind_mod.
-!> 
-!>  Observations below the lowest model level (including surface observations) and above
-!>  the highest model level cannot be assimilated (yet).  The spatial extent of observations
-!>  can be further restricted using model_nml namelist variables.
-!> 
-!>  MODULE ORGANIZATION (search for the following strings to find the corresponding section)
-!>
-!>      'use' statements
-!>       Global storage for describing cam model class
-!>       Namelist variables with default values
-!>       Derived parameters
-!>       static_init_model section
-!>       Module I/O to/from DART and files
-!>       model_interpolate section
-!>       Vector-field translations
-!>       get_close section
-!>       Utility routines; called by several main subroutines
-!>       Stubs not used by cam/model_mod (this is not all of them)