[Dart-dev] DART/branches Revision: 11801

[dart at ucar.edu]

raeder at ucar.edu
2017-07-07 10:58:41 -0600 (Fri, 07 Jul 2017)
686
model_mod.f90:
   Put the initialization of p_col(:,:) after its allocation in get_val_pressure.
   Added credit for chemistry unit conversion tables to Barre' and Arellano.
   Removed output_state_vector.
   Fixed mistaken test against 0 instead of MISSING_I for EFGWORO and FRACLDV
      in map_kinds.
Added case_run.py to shell_scripts/cesm2_0_beta05 and .../setup*
   to fix a formatting error in def of assimilation command,
   and to put the da.log file in $rundir instead of $caseroot.
assimilate.csh: Replaced $case with $cycle in comparison against
   $DATA_ASSIMILATION_CYCLES.
Updated xmlchange commands in many places to replace '-' with '--'
   for multiletter arguments.




Modified: DART/branches/rma_trunk/models/cam-fv/model_mod.f90
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/model_mod.f90	2017-07-07 16:41:51 UTC (rev 11800)
+++ DART/branches/rma_trunk/models/cam-fv/model_mod.f90	2017-07-07 16:58:41 UTC (rev 11801)
@@ -331,7 +331,10 @@
 ! ? should phis be in grid_names_2d?
 ! character (len=8),dimension(100) :: grid_names_2d = (/(' ',iii=1,100)/)
 
-! CAM-chem 1))
+! CAM-chem 
+! These lists were provided by Jerome Barre' and/or Avelino Arellano.
+! They implemented the unit conversion in subroutine read_cam_init in Lanai (and/or earlier DARTs).
+! The Manhattan implementation at the end of model_interpolate was by Kevin Raeder.
 ! FIXME It would be better if the following 2 vectors were read from an external file....
 ! If meteorological variables (including PRESSURE), or SURFACE_ELEVATION need to have 
 ! their units converted, their names and conversion factors could be entered in these lists.
@@ -405,10 +408,6 @@
 ! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ! Namelist variables with default values follow
 
-! output_state_vector = .true.     results in a "state-vector" netCDF file
-! output_state_vector = .false.    results in a "prognostic-var" netCDF file
-logical :: output_state_vector = .false.
-
 ! Files where basic info about model configuration can be found
 character(len=128) :: &
    model_config_file = 'caminput.nc',             & ! An example cam initial file.
@@ -479,7 +478,7 @@
 logical :: print_details = .false.
 
 
-namelist /model_nml/ vert_coord, output_state_vector, model_version, cam_phis,        &
+namelist /model_nml/ vert_coord, model_version, cam_phis,        &
                        state_num_0d,   state_num_1d,   state_num_2d,   state_num_3d,  &
                      state_names_0d, state_names_1d, state_names_2d, state_names_3d,  &
                                       which_vert_1d,  which_vert_2d,  which_vert_3d,  &
@@ -1682,7 +1681,7 @@
 endif
 
 i = find_name('EFGWORO ',cflds)
-if (i/= 0) then
+if (i/= MISSING_I) then
    dart_to_cam_types(QTY_GRAV_WAVE_DRAG_EFFIC) = 'EFGWORO'
    cam_to_dart_kinds(i) = QTY_GRAV_WAVE_DRAG_EFFIC
    convert_mmr2vmr(i) = mmr2vmr(i)
@@ -1689,7 +1688,7 @@
 endif
 
 i = find_name('FRACLDV',cflds)
-if (i /= 0) then
+if (i /= MISSING_I) then
    dart_to_cam_types(QTY_GRAV_WAVE_STRESS_FRACTION) = 'FRACLDV'
    cam_to_dart_kinds(i) = QTY_GRAV_WAVE_STRESS_FRACTION
    convert_mmr2vmr(i) = mmr2vmr(i)
@@ -2903,7 +2902,7 @@
    lev_name = 'lev'
 endif
 
-! Need to get lon, lat, lev dimesion names for this field
+! Need to get lon, lat, lev dimension names for this field
 
 
 ! DART can't handle any 0d or 1d ob fields, so lump them together for elimination in this search.
@@ -3264,7 +3263,6 @@
 cur_vstatus(:) = 1
 vstatus(:) = 0 ! so you can track statuses
 val(:)     = MISSING_R8
-p_col(:,:) = MISSING_R8
 p_surf(:) = MISSING_R8
 
 ! Need to get the surface pressure at this point.
@@ -3305,6 +3303,7 @@
 !     from the grid-correct ps[_stagr] grid
 num_levs = dim_sizes(find_name('lev',dim_names))
 allocate(p_col(num_levs, ens_size))
+p_col(:,:) = MISSING_R8
 do imem = 1, ens_size
    call plevs_cam(p_surf(imem), num_levs, p_col(:, imem))
 enddo

Modified: DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/assimilate.csh
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/assimilate.csh	2017-07-07 16:41:51 UTC (rev 11800)
+++ DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/assimilate.csh	2017-07-07 16:58:41 UTC (rev 11801)
@@ -562,7 +562,8 @@
 # &filter_nml:           direct_netcdf_read      = .true.
 # &filter_nml:           direct_netcdf_write     = .true.
 # &filter_nml:           overwrite_state_input   = .true.
-# &filter_nml:           input_state_file_list       = 'restart_files.txt'
+# &filter_nml:           input_state_file_list   = 'cam_init_files'
+# &filter_nml:           output_state_file_list  = 'cam_init_files'
 # &filter_nml:           obs_sequence_in_name    = 'obs_seq.out'
 # &filter_nml:           obs_sequence_out_name   = 'obs_seq.final'
 # &filter_nml:           init_time_days          = -1,
@@ -728,7 +729,7 @@
 end
 
 # DEBUB st_archive by making a shadow copy of this directory.
-if ($case == $DATA_ASSIMILATION_CYCLES) then
+if ($cycle == $DATA_ASSIMILATION_CYCLES) then
    mkdir ../run_shadow