[Dart-dev] [5836] DART/branches/development/models/noah: All reference to "1D" structures/variables have been removed.

nancy at ucar.edu nancy at ucar.edu
Mon Aug 6 20:33:30 MDT 2012


Revision: 5836
Author:   thoar
Date:     2012-08-06 20:33:30 -0600 (Mon, 06 Aug 2012)
Log Message:
-----------
All reference to "1D" structures/variables have been removed.
Everything is in place for model_mod development via model_mod_check.
Lots of stuff still works from the previous incantation.

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.nml
    DART/branches/development/models/noah/work/input.nml
    DART/branches/development/models/noah/work/mkmf_dart_to_noah
    DART/branches/development/models/noah/work/mkmf_noah_to_dart
    DART/branches/development/models/noah/work/path_names_dart_to_noah
    DART/branches/development/models/noah/work/path_names_noah_to_dart

-------------- next part --------------
Modified: DART/branches/development/models/noah/dart_to_noah.f90
===================================================================
--- DART/branches/development/models/noah/dart_to_noah.f90	2012-08-07 02:01:56 UTC (rev 5835)
+++ DART/branches/development/models/noah/dart_to_noah.f90	2012-08-07 02:33:30 UTC (rev 5836)
@@ -2,7 +2,7 @@
 ! provided by UCAR, "as is", without charge, subject to all terms of use at
 ! http://www.image.ucar.edu/DAReS/DART/DART_download
 
-program dart_to_noah1D
+program dart_to_noah
 
 ! <next few lines under version control, do not edit>
 ! $URL$
@@ -26,7 +26,7 @@
 ! author: Tim Hoar 12 July 2011
 !----------------------------------------------------------------------
 
-use        types_mod, only : r8
+use        types_mod, only : r8, obstypelength
 use    utilities_mod, only : initialize_utilities, timestamp, &
                              find_namelist_in_file, check_namelist_read, &
                              logfileunit, open_file, close_file, &
@@ -49,10 +49,12 @@
 !------------------------------------------------------------------
 
 character (len = 128) :: dart_to_noah_input_file = 'dart_restart'
-logical               :: advance_time_present   = .false.
+character (len=obstypelength), dimension(40) :: do_not_update_variables = ' '
+logical               :: advance_time_present   = .true.
 
 namelist /dart_to_noah_nml/ dart_to_noah_input_file, &
-                           advance_time_present
+                            do_not_update_variables, &
+                            advance_time_present
 
 !----------------------------------------------------------------------
 
@@ -129,4 +131,4 @@
 ! When called with 'end', timestamp will call finalize_utilities()
 call timestamp(string1=source, pos='end')
 
-end program dart_to_noah1D
+end program dart_to_noah

Modified: DART/branches/development/models/noah/dart_to_noah.nml
===================================================================
--- DART/branches/development/models/noah/dart_to_noah.nml	2012-08-07 02:01:56 UTC (rev 5835)
+++ DART/branches/development/models/noah/dart_to_noah.nml	2012-08-07 02:33:30 UTC (rev 5836)
@@ -1,5 +1,6 @@
 &dart_to_noah_nml
-   dart_to_noah_output_file   = 'dart_restart',
-   advance_time_present         = .true.,
+   dart_to_noah_input_file  = 'dart_restart',
+   do_not_update_variables  = ' '
+   advance_time_present     = .true.,
   /
 

Modified: DART/branches/development/models/noah/model_mod.nml
===================================================================
--- DART/branches/development/models/noah/model_mod.nml	2012-08-07 02:01:56 UTC (rev 5835)
+++ DART/branches/development/models/noah/model_mod.nml	2012-08-07 02:33:30 UTC (rev 5836)
@@ -7,11 +7,12 @@
      output_state_vector          = .false.
      debug                        = 9,
      calendar                     = 'Gregorian'
-     noah_variables               = 'STC',    'KIND_SOIL_TEMPERATURE',
-                                    'SMC',    'KIND_SOIL_MOISTURE',
-                                    'SH2O',   'KIND_SOIL_LIQUID_WATER',
-                                    'T1',     'KIND_SKIN_TEMPERATURE',
-                                    'SNOWH',  'KIND_SNOW_THICKNESS',
-                                    'SNEQV',  'KIND_SNOW_WATER',
-                                    'CMC',    'KIND_CANOPY_WATER',
+     noah_variables               = 'SOIL_T',   'KIND_SOIL_TEMPERATURE',
+                                    'SOIL_M',   'KIND_SOIL_MOISTURE',
+                                    'SOIL_W',   'KIND_SOIL_LIQUID_WATER',
+                                    'SKINTEMP', 'KIND_SKIN_TEMPERATURE',
+                                    'SNODEP',   'KIND_SNOW_THICKNESS',
+                                    'WEASD',    'KIND_SNOW_WATER',
+                                    'CANWAT',   'KIND_CANOPY_WATER',
+                                    'QFX',      'KIND_LATENT_HEAT_FLUX',
   /

Modified: DART/branches/development/models/noah/work/input.nml
===================================================================
--- DART/branches/development/models/noah/work/input.nml	2012-08-07 02:01:56 UTC (rev 5835)
+++ DART/branches/development/models/noah/work/input.nml	2012-08-07 02:33:30 UTC (rev 5836)
@@ -27,7 +27,6 @@
    dart_to_noah_input_file   = 'dart_restart',
    do_not_update_variables   = 'QFX'
    advance_time_present      = .true.
-   single_forcing_file_in    = .true.
   /
 
 &perfect_model_obs_nml

Modified: DART/branches/development/models/noah/work/mkmf_dart_to_noah
===================================================================
--- DART/branches/development/models/noah/work/mkmf_dart_to_noah	2012-08-07 02:01:56 UTC (rev 5835)
+++ DART/branches/development/models/noah/work/mkmf_dart_to_noah	2012-08-07 02:33:30 UTC (rev 5836)
@@ -7,7 +7,7 @@
 # $Id$
 
 ../../../mkmf/mkmf -p dart_to_noah -t ../../../mkmf/mkmf.template -c"-Duse_netCDF" \
- -a "../../.." path_names_dart_to_noah1D
+ -a "../../.." path_names_dart_to_noah
 
 exit $status
 

Modified: DART/branches/development/models/noah/work/mkmf_noah_to_dart
===================================================================
--- DART/branches/development/models/noah/work/mkmf_noah_to_dart	2012-08-07 02:01:56 UTC (rev 5835)
+++ DART/branches/development/models/noah/work/mkmf_noah_to_dart	2012-08-07 02:33:30 UTC (rev 5836)
@@ -7,7 +7,7 @@
 # $Id$
 
 ../../../mkmf/mkmf -p noah_to_dart -t ../../../mkmf/mkmf.template -c"-Duse_netCDF" \
- -a "../../.." path_names_noah1D_to_dart
+ -a "../../.." path_names_noah_to_dart
 
 exit $status
 

Modified: DART/branches/development/models/noah/work/path_names_dart_to_noah
===================================================================
--- DART/branches/development/models/noah/work/path_names_dart_to_noah	2012-08-07 02:01:56 UTC (rev 5835)
+++ DART/branches/development/models/noah/work/path_names_dart_to_noah	2012-08-07 02:33:30 UTC (rev 5836)
@@ -5,7 +5,7 @@
 cov_cutoff/cov_cutoff_mod.f90
 ensemble_manager/ensemble_manager_mod.f90
 location/threed_sphere/location_mod.f90
-models/noah/dart_to_noah1D.f90
+models/noah/dart_to_noah.f90
 models/noah/model_mod.f90
 mpi_utilities/null_mpi_utilities_mod.f90
 obs_def/obs_def_mod.f90

Modified: DART/branches/development/models/noah/work/path_names_noah_to_dart
===================================================================
--- DART/branches/development/models/noah/work/path_names_noah_to_dart	2012-08-07 02:01:56 UTC (rev 5835)
+++ DART/branches/development/models/noah/work/path_names_noah_to_dart	2012-08-07 02:33:30 UTC (rev 5836)
@@ -6,7 +6,7 @@
 ensemble_manager/ensemble_manager_mod.f90
 location/threed_sphere/location_mod.f90
 models/noah/model_mod.f90
-models/noah/noah1D_to_dart.f90
+models/noah/noah_to_dart.f90
 mpi_utilities/null_mpi_utilities_mod.f90
 obs_def/obs_def_mod.f90
 obs_kind/obs_kind_mod.f90


More information about the Dart-dev mailing list