[Dart-dev] DART/branches Revision: 11549

[dart at ucar.edu]

nancy at ucar.edu
2017-04-27 13:23:49 -0600 (Thu, 27 Apr 2017)
77
updated model_mod, and updated quickbuild.
added mpi option to mkmf for pmo




Modified: DART/branches/model_mod_changes/models/simple_advection/model_mod.f90
===================================================================
--- DART/branches/model_mod_changes/models/simple_advection/model_mod.f90	2017-04-27 18:58:19 UTC (rev 11548)
+++ DART/branches/model_mod_changes/models/simple_advection/model_mod.f90	2017-04-27 19:23:49 UTC (rev 11549)
@@ -10,16 +10,23 @@
 
 use time_manager_mod, only : time_type, set_time, get_time
 
-use     location_mod, only : location_type, set_location, get_location,  &
-                             LocationDims, LocationName, LocationLName,  &
-                             get_close_maxdist_init, get_close_obs_init, &
-                             loc_get_close_obs => get_close_obs, get_close_type
-
 use    utilities_mod, only : register_module, error_handler, E_ERR, E_MSG, &
                              nmlfileunit, find_namelist_in_file,           &
                              check_namelist_read, nc_check, do_output,     &
                              do_nml_file, do_nml_term
 
+use     location_mod,      only : location_type, set_location, get_location, &
+                                  get_close_obs, get_close_state, &
+                                  convert_vertical_obs, convert_vertical_state
+
+use netcdf_utilities_mod, only : nc_add_global_attribute, nc_sync, &
+                                 nc_add_global_creation_time, nc_redef, nc_enddef
+
+use location_io_mod,      only :  nc_write_location_atts, nc_get_location_varids, &
+                                  nc_write_location
+
+use default_model_mod,     only : end_model, nc_write_model_vars
+
 use     obs_kind_mod, only : QTY_VELOCITY, QTY_TRACER_CONCENTRATION, &
                              QTY_TRACER_SOURCE, QTY_MEAN_SOURCE, QTY_SOURCE_PHASE
 
@@ -39,23 +46,29 @@
 implicit none
 private
 
+
+! these routines must be public and you cannot change the
+! arguments because they will be called *from* other DART code.
+
+!> required routines with code in this module
 public :: get_model_size, &
-          adv_1step, &
-          get_state_meta_data, &
+          get_state_meta_data,  &
           model_interpolate, &
-          get_model_time_step, &
-          end_model, &
+          shortest_time_between_assimilations, &
           static_init_model, &
+          init_conditions,    &
           init_time, &
-          init_conditions, &
-          nc_write_model_atts, &
-          nc_write_model_vars, &
+          adv_1step, &
           pert_model_copies, &
-          get_close_maxdist_init, &
-          get_close_obs_init, &
+          nc_write_model_atts
+
+!> required routines where code is in other modules
+public :: nc_write_model_vars, &
           get_close_obs, &
-          vert_convert, &
-          query_vert_localization_coord, &
+          get_close_state, &
+          end_model, &
+          convert_vertical_obs, &
+          convert_vertical_state, &
           read_model_time, &
           write_model_time
 
@@ -82,7 +95,6 @@
 real(r8), allocatable :: source_phase_offset(:)
 real(r8), allocatable :: source_random_amp(:)
 
-!---------------------------------------------------------------
 
 ! Namelist with default values
 !
@@ -137,22 +149,19 @@
                      source_diurnal_rel_amp, source_phase_noise, &
                      output_state_vector, template_file
 
-!----------------------------------------------------------------
 
 ! Define the location of the state variables in module storage
 type(location_type), allocatable :: state_loc(:)
 type(time_type)                  :: time_step
 
-!==================================================================
 
 contains
 
-subroutine static_init_model()
 !------------------------------------------------------------------
-! Initializes class data for this model. For now, simply outputs the
-! identity info, sets the location of the state variables, and initializes
-! the time type for the time stepping