[Dart-dev] DART/branches Revision: 13061

[dart at ucar.edu]

nancy at ucar.edu
2019-03-25 13:36:20 -0600 (Mon, 25 Mar 2019)
196
revert changes so this code can be merged onto the
recam branch.  once we reintegrate it, pull
revision 13066 onto its own branch for testing and
code reviews.  it includes many changes we want.




Modified: DART/branches/recam/models/wrf/model_mod.f90
===================================================================
--- DART/branches/recam/models/wrf/model_mod.f90	2019-03-25 19:23:20 UTC (rev 13060)
+++ DART/branches/recam/models/wrf/model_mod.f90	2019-03-25 19:36:20 UTC (rev 13061)
@@ -36,7 +36,7 @@
 !---------------- m o d u l e   i n f o r m a t i o n ------------------
 !-----------------------------------------------------------------------
 
-use         types_mod,   only : r8, r4, i8, deg2rad, missing_r8, ps0, earth_radius, &
+use         types_mod,   only : r8, i8, deg2rad, missing_r8, ps0, earth_radius, &
                                 gas_constant, gas_constant_v, gravity, pi,      &
                                 digits12
 
@@ -60,13 +60,9 @@
 
 use netcdf_utilities_mod, only : nc_add_global_attribute, nc_synchronize_file, &
                                  nc_add_global_creation_time, nc_check, &
-                                 nc_begin_define_mode, nc_end_define_mode, &
-                                 nc_define_dimension, nc_dimension_exists, &
-                                 nc_put_variable, nc_open_file_readonly, nc_close_file, &
-                                 nc_add_attribute_to_variable, nc_define_real_variable, &
-                                 nc_define_unlimited_dimension
+                                 nc_begin_define_mode, nc_end_define_mode
 
-use  mpi_utilities_mod,  only : my_task_id, task_count, broadcast_minmax
+use  mpi_utilities_mod,  only : my_task_id, task_count, all_reduce_min_max
 
 use     random_seq_mod,  only : random_seq_type, init_random_seq, random_gaussian
 
@@ -205,9 +201,6 @@
 integer, parameter :: num_state_table_columns = 5
 integer, parameter :: num_bounds_table_columns = 4
 
-! date strings have this format:  YYYY-MM-DD_HH:mm:SS
-integer, parameter :: DATELEN = 19
-
 !-----------------------------------------------------------------------
 ! Model namelist parameters with default values.
 !
@@ -216,6 +209,7 @@
 ! center_spline_scale: coarse grid to spline interp. fine grid ratio
 !-----------------------------------------------------------------------
 
+logical :: output_state_vector     = .false.  ! output prognostic variables
 logical :: default_state_variables = .true.   ! use default state list?
 character(len=129) :: wrf_state_variables(num_state_table_columns,max_state_variables) = 'NULL'
 character(len=129) :: wrf_state_bounds(num_bounds_table_columns,max_state_variables) = 'NULL'
@@ -244,19 +238,22 @@
 !JPH -- single column model flag 
 logical :: scm        = .false.    ! using the single column model
 logical :: allow_perturbed_ics = .false.  ! should spin the model up for a while after
-logical :: write_diag_grid_info = .true.  ! add grid info to diagnostic files or not
-! i believe the new code is more correct, but make it easy to
-! compare to the original code which built pressure profiles.
-logical :: orig_pressure_profile_code  = .true.  
 
-logical :: no_normalization_of_scale_heights          = .false.    ! CSS added
-logical :: allow_surface_pressure_slightly_too_low    = .false.   ! CSS added
-real(r8) :: surface_pressure_tolerance                = 1000.0_r8 ! pascals
+! obsolete items; ignored by this code. 
+! non-backwards-compatible change. should be removed, 
+! but see note below about namelist.
+integer :: num_moist_vars
+logical :: surf_obs, soil_data, h_diab
 
 ! adv_mod_command moved to dart_to_wrf namelist; ignored here.
 character(len = 72) :: adv_mod_command = ''
 
-namelist /model_nml/ num_domains, calendar_type, &
+! num_moist_vars, surf_obs, soil_data, h_diab, and adv_mod_command
+! are IGNORED no matter what their settings in the namelist are.
+! they are obsolete, but removing them here will cause a fatal error
+! until users remove them from their input.nml files as well.
+namelist /model_nml/ num_moist_vars, &
+                     num_domains, calendar_type, surf_obs, soil_data, h_diab, &
                      default_state_variables, wrf_state_variables, &
                      wrf_state_bounds, sfc_elev_max_diff, &
                      adv_mod_command, assimilation_period_seconds, &
@@ -263,16 +260,14 @@
                      allow_obs_below_vol, vert_localization_coord, &
                      center_search_half_length, center_spline_grid_scale, &
                      circulation_pres_level, circulation_radius, polar, &
-                     periodic_x, periodic_y, scm, allow_perturbed_ics, &
-                     no_normalization_of_scale_heights, & ! CSS added
-                     allow_surface_pressure_slightly_too_low, &    ! CSS added
-                     surface_pressure_tolerance, write_diag_grid_info, &
-                     orig_pressure_profile_code
+                     periodic_x, periodic_y, scm, allow_perturbed_ics
 
 ! if you need to check backwards compatibility, set this to .true.
 ! otherwise, leave it as false to use the more correct geometric height
 logical :: use_geopotential_height = .false.
 
+character(len = 20) :: wrf_nml_file = 'namelist.input'
+logical :: have_wrf_nml_file = .false.
 integer :: num_obs_kinds = 0
 logical, allocatable :: in_state_vector(:)
 integer, allocatable  :: domain_id(:) ! Global storage to interface with state_structure_mod.
@@ -387,7 +382,6 @@
 real(r8)              :: var_bounds_table(max_state_variables,2)
 ! holds the variable names for a domain when calling add_domain