[Dart-dev] [5863] DART/branches/development/models/noah: Better terminology for the NOAH variables that should remain

[nancy at ucar.edu]

Revision: 5863
Author:   thoar
Date:     2012-09-07 14:39:51 -0600 (Fri, 07 Sep 2012)
Log Message:
-----------
Better terminology for the NOAH variables that should remain
unchanged when pushing the updated DART variables into the 
NOAH RESTART* file.

Modified Paths:
--------------
    DART/branches/development/models/noah/dart_to_noah.f90
    DART/branches/development/models/noah/dart_to_noah.nml
    DART/branches/development/models/noah/model_mod.f90
    DART/branches/development/models/noah/work/input.nml

-------------- next part --------------
Modified: DART/branches/development/models/noah/dart_to_noah.f90
===================================================================
--- DART/branches/development/models/noah/dart_to_noah.f90	2012-09-06 22:21:07 UTC (rev 5862)
+++ DART/branches/development/models/noah/dart_to_noah.f90	2012-09-07 20:39:51 UTC (rev 5863)
@@ -52,12 +52,12 @@
 
 character (len = 128) :: dart_to_noah_input_file = 'dart_restart'
 character (len = 128) :: noah_reqd_file_list = 'ldasin_files_needed'
-character (len=obstypelength), dimension(40) :: do_not_update_variables = ' '
+character (len=obstypelength), dimension(40) :: skip_variables = ' '
 logical               :: advance_time_present   = .true.
 
 namelist /dart_to_noah_nml/ dart_to_noah_input_file, &
                             noah_reqd_file_list,     &
-                            do_not_update_variables, &
+                            skip_variables, &
                             advance_time_present
 
 !----------------------------------------------------------------------
@@ -122,7 +122,7 @@
 !----------------------------------------------------------------------
 
 call dart_vector_to_model_file(statevector, noah_restart_filename, model_time, &
-                               do_not_update_variables)
+                               skip_variables)
 
 !----------------------------------------------------------------------
 ! Convey adv_to_time to noah by updating kday or khour in the namelist.

Modified: DART/branches/development/models/noah/dart_to_noah.nml
===================================================================
--- DART/branches/development/models/noah/dart_to_noah.nml	2012-09-06 22:21:07 UTC (rev 5862)
+++ DART/branches/development/models/noah/dart_to_noah.nml	2012-09-07 20:39:51 UTC (rev 5863)
@@ -1,6 +1,6 @@
 &dart_to_noah_nml
-   dart_to_noah_input_file  = 'dart_restart',
-   do_not_update_variables  = ' '
-   advance_time_present     = .true.,
+   dart_to_noah_input_file = 'dart_restart',
+   skip_variables          = ' '
+   advance_time_present    = .true.,
   /
 

Modified: DART/branches/development/models/noah/model_mod.f90
===================================================================
--- DART/branches/development/models/noah/model_mod.f90	2012-09-06 22:21:07 UTC (rev 5862)
+++ DART/branches/development/models/noah/model_mod.f90	2012-09-07 20:39:51 UTC (rev 5863)
@@ -1759,7 +1759,7 @@
 
 
 
-subroutine dart_vector_to_model_file(state_vector, filename, dart_time, do_not_update_variables)
+subroutine dart_vector_to_model_file(state_vector, filename, dart_time, skip_variables)
 !------------------------------------------------------------------
 ! Writes the current time and state variables from a dart state
 ! vector (1d array) into a noah netcdf restart file.
@@ -1770,7 +1770,7 @@
 real(r8),         intent(in) :: state_vector(:)
 character(len=*), intent(in) :: filename
 type(time_type),  intent(in) :: dart_time
-character(len=*), intent(in) :: do_not_update_variables(:)
+character(len=*), intent(in) :: skip_variables(:)
 
 integer, dimension(NF90_MAX_VAR_DIMS) :: dimIDs, mystart, mycount
 character(len=NF90_MAX_NAME)          :: varname
@@ -1837,9 +1837,9 @@
 
    ! If this variable is on the skip list ... skip it.
 
-   SKIPME : do i = 1,size(do_not_update_variables)
-      if (len_trim(do_not_update_variables(i)) < 1) cycle SKIPME
-      if (trim(do_not_update_variables(i)) == trim(varname)) cycle UPDATE
+   SKIPME : do i = 1,size(skip_variables)
+      if (len_trim(skip_variables(i)) < 1) cycle SKIPME
+      if (trim(skip_variables(i)) == trim(varname)) cycle UPDATE
    enddo SKIPME
 
    ! Ensure netCDF variable is conformable with DART progvar quantity.

Modified: DART/branches/development/models/noah/work/input.nml
===================================================================
--- DART/branches/development/models/noah/work/input.nml	2012-09-06 22:21:07 UTC (rev 5862)
+++ DART/branches/development/models/noah/work/input.nml	2012-09-07 20:39:51 UTC (rev 5863)
@@ -24,9 +24,9 @@
   /
 
 &dart_to_noah_nml
-   dart_to_noah_input_file   = 'dart_restart',
-   do_not_update_variables   = 'QFX','HFX',
-   advance_time_present      = .true.
+   dart_to_noah_input_file = 'dart_restart',
+   skip_variables          = 'QFX','HFX',
+   advance_time_present    = .true.
   /
 
 &perfect_model_obs_nml
@@ -213,12 +213,12 @@
   /
 
 &obs_diag_nml
-   obs_sequence_name = 'obs_seq.final',
+   obs_sequence_name = '../../shell_scripts/bob/obs_seq.final',
    obs_sequence_list = '',
-   first_bin_center =  1601, 1, 1, 0, 0, 0 ,
-   last_bin_center  =  1601, 1, 1, 3, 0, 0 ,
-   bin_separation   =     0, 0, 0, 0, 3, 0 ,
-   bin_width        =     0, 0, 0, 0, 3, 0 ,
+   first_bin_center =  2009, 1, 1, 0, 0, 0 ,
+   last_bin_center  =  2009, 1, 1,12, 0, 0 ,
+   bin_separation   =     0, 0, 0, 1, 0, 0 ,
+   bin_width        =     0, 0, 0, 1, 0, 0 ,
    time_to_skip     =     0, 0, 0, 0, 0, 0 ,
    max_num_bins     = 1000,
    rat_cri            = 3.0,
@@ -230,8 +230,8 @@
    latlim2    =  90.0,
    reg_names  = 'Earth',
    print_mismatched_locs = .false.,
-   print_obs_locations   = .true.,
    verbose               = .false.
+   hlevel = 0.0, -0.25, -0.7, -1.5, -10.0
   /