[Dart-dev] [6285] DART/trunk/observations: make sure all namelist variables in the code have
nancy at ucar.edu
nancy at ucar.edu
Mon Jul 1 10:02:45 MDT 2013
Revision: 6285
Author: nancy
Date: 2013-07-01 10:02:44 -0600 (Mon, 01 Jul 2013)
Log Message:
-----------
make sure all namelist variables in the code have
initial values. in cases where there is no obvious
default make it something illegal (like year = -1)
so we can catch if the user doesn't give it a value
in their input.nml file.
make the html files use the contents of the .nml
files, and make them match the values in the code.
(the input.nml file in the work directory will continue
to have values that run with the example data)
rename an _nml file to .nml
Modified Paths:
--------------
DART/trunk/observations/Ameriflux/level4_to_obs.f90
DART/trunk/observations/Ameriflux/level4_to_obs.html
DART/trunk/observations/Ameriflux/level4_to_obs.nml
DART/trunk/observations/COSMOS/COSMOS_development.f90
DART/trunk/observations/COSMOS/COSMOS_development.nml
DART/trunk/observations/COSMOS/COSMOS_to_obs.nml
DART/trunk/observations/MIDAS/MIDAS_to_obs.f90
Added Paths:
-----------
DART/trunk/observations/MIDAS/MIDAS_to_obs.nml
Removed Paths:
-------------
DART/trunk/observations/MIDAS/MIDAS_to_obs_nml
-------------- next part --------------
Modified: DART/trunk/observations/Ameriflux/level4_to_obs.f90
===================================================================
--- DART/trunk/observations/Ameriflux/level4_to_obs.f90 2013-07-01 15:32:57 UTC (rev 6284)
+++ DART/trunk/observations/Ameriflux/level4_to_obs.f90 2013-07-01 16:02:44 UTC (rev 6285)
@@ -54,13 +54,13 @@
character(len=128) :: text_input_file = 'textdata.input'
character(len=128) :: obs_out_file = 'obs_seq.out'
-integer :: year
-real(r8) :: timezoneoffset
-real(r8) :: latitude
-real(r8) :: longitude
-real(r8) :: elevation
-real(r8) :: flux_height
-real(r8) :: maxgoodqc = 3
+integer :: year = -1
+real(r8) :: timezoneoffset = -1.0_r8
+real(r8) :: latitude = -1.0_r8
+real(r8) :: longitude = -1.0_r8
+real(r8) :: elevation = -1.0_r8
+real(r8) :: flux_height = -1.0_r8
+real(r8) :: maxgoodqc = 3.0_r8
logical :: verbose = .false.
namelist /level4_to_obs_nml/ text_input_file, obs_out_file, year, &
Modified: DART/trunk/observations/Ameriflux/level4_to_obs.html
===================================================================
--- DART/trunk/observations/Ameriflux/level4_to_obs.html 2013-07-01 15:32:57 UTC (rev 6284)
+++ DART/trunk/observations/Ameriflux/level4_to_obs.html 2013-07-01 16:02:44 UTC (rev 6285)
@@ -99,12 +99,12 @@
&level4_to_obs_nml
text_input_file = 'textdata.input',
obs_out_file = 'obs_seq.out',
- year = 2000,
- timezoneoffset = 0,
- latitude = 0,
- longitude = 0,
- elevation = 0,
- flux_height = 0,
+ year = -1,
+ timezoneoffset = -1,
+ latitude = -1.0,
+ longitude = -1.0,
+ elevation = -1.0,
+ flux_height = -1.0,
maxgoodqc = 3,
verbose = .false.
/
Modified: DART/trunk/observations/Ameriflux/level4_to_obs.nml
===================================================================
--- DART/trunk/observations/Ameriflux/level4_to_obs.nml 2013-07-01 15:32:57 UTC (rev 6284)
+++ DART/trunk/observations/Ameriflux/level4_to_obs.nml 2013-07-01 16:02:44 UTC (rev 6285)
@@ -1,13 +1,13 @@
&level4_to_obs_nml
- text_input_file = '../data/AMF_USHa1_2003_L4_h_V002.txt',
+ text_input_file = 'textdata.input',
obs_out_file = 'obs_seq.out',
- year = 2003,
- timezoneoffset = -5,
- latitude = 42.5378,
- longitude = -72.1715,
- elevation = 340,
- flux_height = 29,
+ year = -1,
+ timezoneoffset = -1,
+ latitude = -1.0,
+ longitude = -1.0,
+ elevation = -1.0,
+ flux_height = -1.0,
maxgoodqc = 3,
- verbose = .TRUE.
+ verbose = .false.
/
Modified: DART/trunk/observations/COSMOS/COSMOS_development.f90
===================================================================
--- DART/trunk/observations/COSMOS/COSMOS_development.f90 2013-07-01 15:32:57 UTC (rev 6284)
+++ DART/trunk/observations/COSMOS/COSMOS_development.f90 2013-07-01 16:02:44 UTC (rev 6285)
@@ -72,8 +72,8 @@
character(len=128) :: text_input_file = 'textdata.input'
character(len=128) :: obs_out_file = 'obs_seq.out'
character(len=128) :: sitename = 'missing'
-integer :: year
-real(r8) :: maxgoodqc = 3
+integer :: year = -1
+real(r8) :: maxgoodqc = 3.0_r8
logical :: verbose = .false.
namelist /COSMOS_development_nml/ site_metadata_file, text_input_file, &
Modified: DART/trunk/observations/COSMOS/COSMOS_development.nml
===================================================================
--- DART/trunk/observations/COSMOS/COSMOS_development.nml 2013-07-01 15:32:57 UTC (rev 6284)
+++ DART/trunk/observations/COSMOS/COSMOS_development.nml 2013-07-01 16:02:44 UTC (rev 6285)
@@ -1,10 +1,10 @@
&COSMOS_development_nml
- site_metadata_file = '../data/COSMIC_parlist.nc'
- text_input_file = '../data/COSMOS_SantaRita_2011.dat'
- obs_out_file = 'SantaRita.obs_seq.out',
- sitename = 'Santa_Rita_Creosote',
- year = 2011,
- maxgoodqc = 1,
- verbose = .TRUE.
+ site_metadata_file = 'COSMIC_parlist.nc'
+ text_input_file = 'textdata.input',
+ obs_out_file = 'obs_seq.out',
+ sitename = 'missing',
+ year = -1,
+ maxgoodqc = 3,
+ verbose = .false.
/
Modified: DART/trunk/observations/COSMOS/COSMOS_to_obs.nml
===================================================================
--- DART/trunk/observations/COSMOS/COSMOS_to_obs.nml 2013-07-01 15:32:57 UTC (rev 6284)
+++ DART/trunk/observations/COSMOS/COSMOS_to_obs.nml 2013-07-01 16:02:44 UTC (rev 6285)
@@ -1,9 +1,9 @@
&COSMOS_to_obs_nml
- site_metadata_file = '../data/COSMIC_parlist.nc'
- text_input_file = '../data/SantaRita.corcounts.txt'
- obs_out_file = 'SantaRita.obs_seq.out',
- sitename = 'Santa_Rita_Creosote',
- maxgoodqc = 1,
- verbose = .TRUE.
+ site_metadata_file = 'COSMIC_parlist.nc'
+ text_input_file = 'corcounts.txt'
+ obs_out_file = 'obs_seq.out',
+ sitename = 'missing',
+ maxgoodqc = 3,
+ verbose = .false.
/
Modified: DART/trunk/observations/MIDAS/MIDAS_to_obs.f90
===================================================================
--- DART/trunk/observations/MIDAS/MIDAS_to_obs.f90 2013-07-01 15:32:57 UTC (rev 6284)
+++ DART/trunk/observations/MIDAS/MIDAS_to_obs.f90 2013-07-01 16:02:44 UTC (rev 6285)
@@ -51,7 +51,7 @@
! Namelist with default values
!-----------------------------------------------------------------------
-character(len=256) :: input_file = '../data/Test.nc'
+character(len=256) :: input_file = 'infile.nc'
character(len=256) :: obs_out_file = 'obs_seq.out'
logical :: verbose = .false.
Copied: DART/trunk/observations/MIDAS/MIDAS_to_obs.nml (from rev 6280, DART/trunk/observations/MIDAS/MIDAS_to_obs_nml)
===================================================================
--- DART/trunk/observations/MIDAS/MIDAS_to_obs.nml (rev 0)
+++ DART/trunk/observations/MIDAS/MIDAS_to_obs.nml 2013-07-01 16:02:44 UTC (rev 6285)
@@ -0,0 +1,6 @@
+&MIDAS_to_obs_nml
+ input_file = 'infile.nc'
+ obs_out_file = 'obs_seq.out',
+ verbose = .false.
+ /
+
Deleted: DART/trunk/observations/MIDAS/MIDAS_to_obs_nml
===================================================================
--- DART/trunk/observations/MIDAS/MIDAS_to_obs_nml 2013-07-01 15:32:57 UTC (rev 6284)
+++ DART/trunk/observations/MIDAS/MIDAS_to_obs_nml 2013-07-01 16:02:44 UTC (rev 6285)
@@ -1,6 +0,0 @@
-&MIDAS_to_obs_nml
- input_file = '../data/Test.nc'
- obs_out_file = 'obs_seq.out',
- verbose = .false.
- /
-
More information about the Dart-dev
mailing list