[Dart-dev] [3216] DART/branches/nancy_work: My test branch:
in spite of the number of files this update
nancy at subversion.ucar.edu
nancy at subversion.ucar.edu
Thu Feb 7 09:48:22 MST 2008
An HTML attachment was scrubbed...
URL: http://mailman.ucar.edu/pipermail/dart-dev/attachments/20080207/b8bb2cce/attachment-0001.html
-------------- next part --------------
Modified: DART/branches/nancy_work/models/9var/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/nancy_work/models/9var/work/path_names_create_fixed_network_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/9var/work/path_names_create_fixed_network_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/9var/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/9var/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/nancy_work/models/9var/work/path_names_create_obs_sequence 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/9var/work/path_names_create_obs_sequence 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/9var/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/9var/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/9var/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/9var/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,7 +10,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/9var/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/9var/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/9var/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/9var/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/9var/model_mod.f90
Modified: DART/branches/nancy_work/models/9var/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/9var/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/9var/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
location/oned/location_mod.f90
time_manager/time_manager_mod.f90
utilities/utilities_mod.f90
Modified: DART/branches/nancy_work/models/9var/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/nancy_work/models/9var/work/path_names_perfect_model_obs 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/9var/work/path_names_perfect_model_obs 2008-02-07 16:48:22 UTC (rev 3216)
@@ -9,7 +9,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/9var/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/MITgcm_annulus/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/MITgcm_annulus/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/MITgcm_annulus/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/MITgcm_annulus/model_mod.f90
Modified: DART/branches/nancy_work/models/PBL_1d/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/PBL_1d/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/PBL_1d/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,7 +10,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_dew_point_mod.f90
assim_model/assim_model_mod.f90
models/PBL_1d/model_mod.f90
models/PBL_1d/module_map_utils.f90
Modified: DART/branches/nancy_work/models/PBL_1d/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/PBL_1d/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/PBL_1d/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -3,7 +3,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_dew_point_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/PBL_1d/model_mod.f90
Modified: DART/branches/nancy_work/models/cam/work/input.nml
===================================================================
--- DART/branches/nancy_work/models/cam/work/input.nml 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/cam/work/input.nml 2008-02-07 16:48:22 UTC (rev 3216)
@@ -122,6 +122,8 @@
output_obs_def_mod_file = '../../../obs_def/obs_def_mod.f90',
input_files = '../../../obs_def/obs_def_gps_mod.f90',
'../../../obs_def/obs_def_QuikSCAT_mod.f90',
+ '../../../obs_def/obs_def_GWD_mod.f90',
+ '../../../obs_def/obs_def_wrf_mod.f90',
'../../../obs_def/obs_def_reanalysis_bufr_mod.f90'/
&obs_kind_nml
Modified: DART/branches/nancy_work/models/cam/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/nancy_work/models/cam/work/path_names_create_fixed_network_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/cam/work/path_names_create_fixed_network_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_gps_mod.f90
assim_model/assim_model_mod.f90
models/cam/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/cam/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/nancy_work/models/cam/work/path_names_create_obs_sequence 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/cam/work/path_names_create_obs_sequence 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_kind/obs_kind_mod.f90
obs_model/obs_model_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_gps_mod.f90
assim_model/assim_model_mod.f90
models/cam/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/cam/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/cam/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/cam/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,7 +10,6 @@
obs_kind/obs_kind_mod.f90
obs_model/obs_model_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_gps_mod.f90
assim_model/assim_model_mod.f90
models/cam/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/cam/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/cam/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/cam/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_gps_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/cam/model_mod.f90
Modified: DART/branches/nancy_work/models/cam/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/cam/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/cam/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -3,9 +3,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_gps_mod.f90
-obs_def/obs_def_radar_mod.f90
-obs_def/obs_def_dew_point_mod.f90
assim_model/assim_model_mod.f90
random_seq/random_seq_mod.f90
random_nr/random_nr_mod.f90
Modified: DART/branches/nancy_work/models/cam/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/nancy_work/models/cam/work/path_names_perfect_model_obs 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/cam/work/path_names_perfect_model_obs 2008-02-07 16:48:22 UTC (rev 3216)
@@ -9,7 +9,6 @@
obs_kind/obs_kind_mod.f90
obs_model/obs_model_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_gps_mod.f90
assim_model/assim_model_mod.f90
models/cam/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/cam/work/path_names_restart_file_utility
===================================================================
--- DART/branches/nancy_work/models/cam/work/path_names_restart_file_utility 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/cam/work/path_names_restart_file_utility 2008-02-07 16:48:22 UTC (rev 3216)
@@ -8,7 +8,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_gps_mod.f90
assim_model/assim_model_mod.f90
models/cam/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_create_fixed_network_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_create_fixed_network_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/forced_lorenz_96/model_mod.f90
Modified: DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_create_obs_sequence 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_create_obs_sequence 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/forced_lorenz_96/model_mod.f90
Modified: DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,7 +10,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/forced_lorenz_96/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/forced_lorenz_96/model_mod.f90
Modified: DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -3,7 +3,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
location/oned/location_mod.f90
time_manager/time_manager_mod.f90
Modified: DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_perfect_model_obs 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/forced_lorenz_96/work/path_names_perfect_model_obs 2008-02-07 16:48:22 UTC (rev 3216)
@@ -9,7 +9,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/forced_lorenz_96/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/ikeda/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/nancy_work/models/ikeda/work/path_names_create_fixed_network_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/ikeda/work/path_names_create_fixed_network_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/ikeda/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/ikeda/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/nancy_work/models/ikeda/work/path_names_create_obs_sequence 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/ikeda/work/path_names_create_obs_sequence 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/ikeda/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/ikeda/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/ikeda/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/ikeda/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,7 +10,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/ikeda/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/ikeda/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/ikeda/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/ikeda/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/ikeda/model_mod.f90
Modified: DART/branches/nancy_work/models/ikeda/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/ikeda/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/ikeda/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
location/oned/location_mod.f90
time_manager/time_manager_mod.f90
utilities/utilities_mod.f90
Modified: DART/branches/nancy_work/models/ikeda/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/nancy_work/models/ikeda/work/path_names_perfect_model_obs 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/ikeda/work/path_names_perfect_model_obs 2008-02-07 16:48:22 UTC (rev 3216)
@@ -9,7 +9,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/ikeda/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_04/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_04/work/path_names_create_fixed_network_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_04/work/path_names_create_fixed_network_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_04/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_04/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/nancy_work/models/lorenz_04/work/path_names_create_obs_sequence 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_04/work/path_names_create_obs_sequence 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_04/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_04/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/lorenz_04/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_04/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,7 +10,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_04/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_04/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_04/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_04/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_04/model_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_04/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/lorenz_04/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_04/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
location/oned/location_mod.f90
time_manager/time_manager_mod.f90
utilities/utilities_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_04/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/nancy_work/models/lorenz_04/work/path_names_perfect_model_obs 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_04/work/path_names_perfect_model_obs 2008-02-07 16:48:22 UTC (rev 3216)
@@ -9,7 +9,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_04/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_63/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_63/work/path_names_create_fixed_network_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_63/work/path_names_create_fixed_network_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_63/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_63/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/nancy_work/models/lorenz_63/work/path_names_create_obs_sequence 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_63/work/path_names_create_obs_sequence 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_63/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_63/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/lorenz_63/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_63/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,7 +10,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_63/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_63/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_63/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_63/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_63/model_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_63/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/lorenz_63/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_63/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
location/oned/location_mod.f90
time_manager/time_manager_mod.f90
utilities/utilities_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_63/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/nancy_work/models/lorenz_63/work/path_names_perfect_model_obs 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_63/work/path_names_perfect_model_obs 2008-02-07 16:48:22 UTC (rev 3216)
@@ -9,7 +9,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_63/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_84/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_84/work/path_names_create_fixed_network_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_84/work/path_names_create_fixed_network_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_84/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_84/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/nancy_work/models/lorenz_84/work/path_names_create_obs_sequence 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_84/work/path_names_create_obs_sequence 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_84/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_84/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/lorenz_84/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_84/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,7 +10,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_84/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_84/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_84/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_84/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_84/model_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_84/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/lorenz_84/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_84/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
location/oned/location_mod.f90
time_manager/time_manager_mod.f90
utilities/utilities_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_84/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/nancy_work/models/lorenz_84/work/path_names_perfect_model_obs 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_84/work/path_names_perfect_model_obs 2008-02-07 16:48:22 UTC (rev 3216)
@@ -9,7 +9,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_84/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_create_fixed_network_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_create_fixed_network_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_96_2scale/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_create_obs_sequence 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_create_obs_sequence 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_96_2scale/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,7 +10,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_96_2scale/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_96_2scale/model_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
location/oned/location_mod.f90
time_manager/time_manager_mod.f90
utilities/utilities_mod.f90
Modified: DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_perfect_model_obs 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/lorenz_96_2scale/work/path_names_perfect_model_obs 2008-02-07 16:48:22 UTC (rev 3216)
@@ -9,7 +9,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/lorenz_96_2scale/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/null_model/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/nancy_work/models/null_model/work/path_names_create_fixed_network_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/null_model/work/path_names_create_fixed_network_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/null_model/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/null_model/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/nancy_work/models/null_model/work/path_names_create_obs_sequence 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/null_model/work/path_names_create_obs_sequence 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/null_model/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/null_model/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/null_model/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/null_model/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,7 +10,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/null_model/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/null_model/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/null_model/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/null_model/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/null_model/model_mod.f90
Modified: DART/branches/nancy_work/models/null_model/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/null_model/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/null_model/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
location/oned/location_mod.f90
time_manager/time_manager_mod.f90
utilities/utilities_mod.f90
Modified: DART/branches/nancy_work/models/null_model/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/nancy_work/models/null_model/work/path_names_perfect_model_obs 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/null_model/work/path_names_perfect_model_obs 2008-02-07 16:48:22 UTC (rev 3216)
@@ -9,7 +9,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/null_model/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/rose/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/rose/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/rose/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -3,8 +3,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_radar_mod.f90
-obs_def/obs_def_dew_point_mod.f90
assim_model/assim_model_mod.f90
random_seq/random_seq_mod.f90
random_nr/random_nr_mod.f90
Modified: DART/branches/nancy_work/models/template/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/nancy_work/models/template/work/path_names_create_fixed_network_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/template/work/path_names_create_fixed_network_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/template/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/template/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/nancy_work/models/template/work/path_names_create_obs_sequence 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/template/work/path_names_create_obs_sequence 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/template/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/template/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/template/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/template/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,7 +10,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/template/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/template/work/path_names_integrate_model
===================================================================
--- DART/branches/nancy_work/models/template/work/path_names_integrate_model 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/template/work/path_names_integrate_model 2008-02-07 16:48:22 UTC (rev 3216)
@@ -9,7 +9,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/template/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/template/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/template/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/template/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,7 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/template/model_mod.f90
Modified: DART/branches/nancy_work/models/template/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/template/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/template/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -4,7 +4,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
location/oned/location_mod.f90
time_manager/time_manager_mod.f90
utilities/utilities_mod.f90
Modified: DART/branches/nancy_work/models/template/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/nancy_work/models/template/work/path_names_perfect_model_obs 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/template/work/path_names_perfect_model_obs 2008-02-07 16:48:22 UTC (rev 3216)
@@ -9,7 +9,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_1d_state_mod.f90
assim_model/assim_model_mod.f90
models/template/model_mod.f90
common/types_mod.f90
Modified: DART/branches/nancy_work/models/wrf/work/input.nml
===================================================================
--- DART/branches/nancy_work/models/wrf/work/input.nml 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/wrf/work/input.nml 2008-02-07 16:48:22 UTC (rev 3216)
@@ -89,6 +89,7 @@
'../../../obs_def/obs_def_dew_point_mod.f90',
'../../../obs_def/obs_def_altimeter_mod.f90',
'../../../obs_def/obs_def_gps_mod.f90',
+ '../../../obs_def/obs_def_wrf_mod.f90',
'../../../obs_def/obs_def_vortex_mod.f90' /
&obs_kind_nml
Modified: DART/branches/nancy_work/models/wrf/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/nancy_work/models/wrf/work/path_names_create_fixed_network_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/wrf/work/path_names_create_fixed_network_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,11 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_radar_mod.f90
-obs_def/obs_def_altimeter_mod.f90
-obs_def/obs_def_dew_point_mod.f90
-obs_def/obs_def_gps_mod.f90
-obs_def/obs_def_vortex_mod.f90
assim_model/assim_model_mod.f90
models/wrf/model_mod.f90
models/wrf/module_map_utils.f90
Modified: DART/branches/nancy_work/models/wrf/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/nancy_work/models/wrf/work/path_names_create_obs_sequence 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/wrf/work/path_names_create_obs_sequence 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,11 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_radar_mod.f90
-obs_def/obs_def_altimeter_mod.f90
-obs_def/obs_def_dew_point_mod.f90
-obs_def/obs_def_gps_mod.f90
-obs_def/obs_def_vortex_mod.f90
assim_model/assim_model_mod.f90
models/wrf/model_mod.f90
models/wrf/module_map_utils.f90
Modified: DART/branches/nancy_work/models/wrf/work/path_names_filter
===================================================================
--- DART/branches/nancy_work/models/wrf/work/path_names_filter 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/wrf/work/path_names_filter 2008-02-07 16:48:22 UTC (rev 3216)
@@ -8,11 +8,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_radar_mod.f90
-obs_def/obs_def_altimeter_mod.f90
-obs_def/obs_def_dew_point_mod.f90
-obs_def/obs_def_gps_mod.f90
-obs_def/obs_def_vortex_mod.f90
assim_model/assim_model_mod.f90
models/wrf/model_mod.f90
models/wrf/module_map_utils.f90
Modified: DART/branches/nancy_work/models/wrf/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/wrf/work/path_names_merge_obs_seq 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/wrf/work/path_names_merge_obs_seq 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,11 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_radar_mod.f90
-obs_def/obs_def_altimeter_mod.f90
-obs_def/obs_def_dew_point_mod.f90
-obs_def/obs_def_gps_mod.f90
-obs_def/obs_def_vortex_mod.f90
cov_cutoff/cov_cutoff_mod.f90
assim_model/assim_model_mod.f90
models/wrf/model_mod.f90
Modified: DART/branches/nancy_work/models/wrf/work/path_names_obs_diag
===================================================================
--- DART/branches/nancy_work/models/wrf/work/path_names_obs_diag 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/wrf/work/path_names_obs_diag 2008-02-07 16:48:22 UTC (rev 3216)
@@ -3,11 +3,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_radar_mod.f90
-obs_def/obs_def_altimeter_mod.f90
-obs_def/obs_def_dew_point_mod.f90
-obs_def/obs_def_gps_mod.f90
-obs_def/obs_def_vortex_mod.f90
assim_model/assim_model_mod.f90
models/wrf/model_mod.f90
models/wrf/module_map_utils.f90
Modified: DART/branches/nancy_work/models/wrf/work/path_names_perfect_model_obs
===================================================================
--- DART/branches/nancy_work/models/wrf/work/path_names_perfect_model_obs 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/wrf/work/path_names_perfect_model_obs 2008-02-07 16:48:22 UTC (rev 3216)
@@ -10,11 +10,6 @@
obs_model/obs_model_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_radar_mod.f90
-obs_def/obs_def_altimeter_mod.f90
-obs_def/obs_def_dew_point_mod.f90
-obs_def/obs_def_gps_mod.f90
-obs_def/obs_def_vortex_mod.f90
assim_model/assim_model_mod.f90
common/types_mod.f90
location/threed_sphere/location_mod.f90
Modified: DART/branches/nancy_work/models/wrf/work/path_names_restart_file_utility
===================================================================
--- DART/branches/nancy_work/models/wrf/work/path_names_restart_file_utility 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/wrf/work/path_names_restart_file_utility 2008-02-07 16:48:22 UTC (rev 3216)
@@ -8,11 +8,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_radar_mod.f90
-obs_def/obs_def_altimeter_mod.f90
-obs_def/obs_def_dew_point_mod.f90
-obs_def/obs_def_gps_mod.f90
-obs_def/obs_def_vortex_mod.f90
assim_model/assim_model_mod.f90
models/wrf/model_mod.f90
models/wrf/module_map_utils.f90
Modified: DART/branches/nancy_work/models/wrf/work/path_names_select
===================================================================
--- DART/branches/nancy_work/models/wrf/work/path_names_select 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/models/wrf/work/path_names_select 2008-02-07 16:48:22 UTC (rev 3216)
@@ -2,11 +2,6 @@
obs_sequence/obs_sequence_mod.f90
obs_kind/obs_kind_mod.f90
obs_def/obs_def_mod.f90
-obs_def/obs_def_radar_mod.f90
-obs_def/obs_def_altimeter_mod.f90
-obs_def/obs_def_dew_point_mod.f90
-obs_def/obs_def_gps_mod.f90
-obs_def/obs_def_vortex_mod.f90
location/threed_sphere/location_mod.f90
time_manager/time_manager_mod.f90
random_seq/random_seq_mod.f90
Modified: DART/branches/nancy_work/obs_def/obs_def_1d_state_mod.html
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_1d_state_mod.html 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_1d_state_mod.html 2008-02-07 16:48:22 UTC (rev 3216)
@@ -95,90 +95,117 @@
specially formatted commented code that is used to guide the preprocessor
in constructing the obs_def_mod.f90 and obs_kind_mod.f90. These specially
formatted comments are most conveniently placed at the beginning of the module
-and comprise six sections, each beginning and ending with a special F90
-comment line that must be included VERBATIM. The six sections and there
-specific instance for the 1d_raw_state_mod are:
+and comprise seven sections, each beginning and ending with a special F90
+comment line that must be included VERBATIM. The seven sections and their
+specific instances for the 1d_raw_state_mod are:
<P>
-1. A list of all observation kinds defined by this module and their associated
+1. A list of all observation types defined by this module and their associated
generic kinds (see obs_kind module). The header line is followed by lines
-that have the observation kind name (an all caps Fortran 90 identifier) and
-their associated generic kind identifier from the obs_kind module.<BR>
-<P>
-! BEGIN DART PREPROCESS KIND LIST <BR>
-! RAW_STATE_VARIABLE, KIND_RAW_STATE_VARIABLE <BR>
-! RAW_STATE_1D_INTEGRAL, KIND_1D_INTEGRAL <BR>
-! END DART PREPROCESS KIND LIST <BR>
+that have the observation type name (an all caps Fortran 90 identifier) and
+their associated generic kind identifier from the obs_kind module.
+</P>
+<pre>
+! BEGIN DART PREPROCESS KIND LIST
+! RAW_STATE_VARIABLE, KIND_RAW_STATE_VARIABLE
+! RAW_STATE_1D_INTEGRAL, KIND_1D_INTEGRAL
+! END DART PREPROCESS KIND LIST
+</pre>
<P>
2. A list of all the use statements that the completed obs_def_mod.f90
must have in order to use the public interfaces provided by this special
-obs_def module. <BR>
-<P>
-! BEGIN DART PREPROCESS USE OF SPECIAL OBS_DEF MODULE <BR>
+obs_def module. This is optional if there are no external interfaces.
+<pre>
+! BEGIN DART PREPROCESS USE OF SPECIAL OBS_DEF MODULE
! use obs_def_1d_state_mod, only : write_1d_integral, read_1d_integral,
-! interactive_1d_integral, get_expected_1d_integral <BR>
-! END DART PREPROCESS USE OF SPECIAL OBS_DEF MODULE <BR>
+! interactive_1d_integral, get_expected_1d_integral
+! END DART PREPROCESS USE OF SPECIAL OBS_DEF MODULE
+</pre>
<P>
3. Case statement entries for each observation kind defined by this special
-obs_def module stating how to compute the forward observation operator. Note that
-there must be a case statement entry for each
-type obs observation defined even if no special action (just put in a
-continue) is required.
-<BR>
-<P>
-! BEGIN DART PREPROCESS GET_EXPECTED_OBS_FROM_DEF <BR>
-! case(RAW_STATE_VARIABLE) <BR>
-! call interpolate(state, location, 1, obs_val, istatus) <BR>
-! case(RAW_STATE_1D_INTEGRAL) <BR>
-! call get_expected_1d_integral(state, location, obs_def%key, obs_val, istatus) <BR>
-! END DART PREPROCESS GET_EXPECTED_OBS_FROM_DEF <BR>
+obs_def module stating how to compute the forward observation operator.
+Note that there must be a case statement entry for each
+type obs observation defined even if no special action is required.
+(Just put in a continue.)
+</P>
+<pre>
+! BEGIN DART PREPROCESS GET_EXPECTED_OBS_FROM_DEF
+! case(RAW_STATE_VARIABLE)
+! call interpolate(state, location, 1, obs_val, istatus)
+! case(RAW_STATE_1D_INTEGRAL)
+! call get_expected_1d_integral(state, location, obs_def%key, obs_val, istatus)
+! END DART PREPROCESS GET_EXPECTED_OBS_FROM_DEF
+</pre>
<P>
4. Case statement entries for each observation kind defined by this special
obs_def module stating how to read any extra required information from an
-obs sequence file. Note that there must be a case statement entry for each
-type obs observation defined even if no special action (just put in a
-continue) is required. <BR>
+obs sequence file.
+Note that there must be a case statement entry for each
+type obs observation defined even if no special action is required.
+(Just put in a continue.)
+</P>
+<pre>
+! BEGIN DART PREPROCESS READ_OBS_DEF
+! case(RAW_STATE_VARIABLE)
+! continue
+! case(RAW_STATE_1D_INTEGRAL)
+! call read_1d_integral(obs_def%key, ifile, fileformat)
+! END DART PREPROCESS READ_OBS_DEF
+</pre>
+
<P>
-! BEGIN DART PREPROCESS READ_OBS_DEF <BR>
-! case(RAW_STATE_VARIABLE) <BR>
-! continue <BR>
-! case(RAW_STATE_1D_INTEGRAL) <BR>
-! call read_1d_integral(obs_def%key, ifile, fileformat) <BR>
-! END DART PREPROCESS READ_OBS_DEF <BR>
-<P>
5. Case statement entries for each observation kind defined by this special
obs_def module stating how to write any extra required information to an
-obs sequence file. Note that there must be a case statement entry for each
-type obs observation defined even if no special action (just put in a
-continue) is required. <BR>
-! BEGIN DART PREPROCESS WRITE_OBS_DEF <BR>
-! case(RAW_STATE_VARIABLE) <BR>
-! continue <BR>
-! case(RAW_STATE_1D_INTEGRAL) <BR>
-! call write_1d_integral(obs_def%key, ifile, fileformat) <BR>
-! END DART PREPROCESS WRITE_OBS_DEF <BR>
+obs sequence file.
+Note that there must be a case statement entry for each
+type obs observation defined even if no special action is required.
+(Just put in a continue.)
+</P>
+<pre>
+! BEGIN DART PREPROCESS WRITE_OBS_DEF
+! case(RAW_STATE_VARIABLE)
+! continue
+! case(RAW_STATE_1D_INTEGRAL)
+! call write_1d_integral(obs_def%key, ifile, fileformat)
+! END DART PREPROCESS WRITE_OBS_DEF
+</pre>
<P>
6. Case statement entries for each observation kind defined by this special
obs_def module stating how to interactively create any extra required information.
Note that there must be a case statement entry for each
-type obs observation defined even if no special action (just put in a
-continue) is required. <BR>
+type obs observation defined even if no special action is required.
+(Just put in a continue.)
+</P>
+<pre>
+! BEGIN DART PREPROCESS INTERACTIVE_OBS_DEF
+! case(RAW_STATE_VARIABLE)
+! continue
+! case(RAW_STATE_1D_INTEGRAL)
+! call interactive_1d_integral(obs_def%key)
+! END DART PREPROCESS INTERACTIVE_OBS_DEF
+</pre>
+
+
<P>
-! BEGIN DART PREPROCESS INTERACTIVE_OBS_DEF <BR>
-! case(RAW_STATE_VARIABLE) <BR>
-! continue <BR>
-! case(RAW_STATE_1D_INTEGRAL) <BR>
-! call interactive_1d_integral(obs_def%key) <BR>
-! END DART PREPROCESS INTERACTIVE_OBS_DEF <BR>
+7. Any executable F90 module code must be tagged with the following
+comments. All lines between these markers will be copied, verbatim,
+to obs_def_mod.f90. This section is not required if there are no
+observation-specific subroutines.
+</P>
+<pre>
+! BEGIN DART PREPROCESS MODULE CODE
+module obs_def_1d_state_mod
+... (module executable code)
+end module obs_def_1d_state_mod
+! END DART PREPROCESS MODULE CODE
+</pre>
-<P>
-
<BR>
<!--==================================================================-->
Modified: DART/branches/nancy_work/obs_def/obs_def_GWD_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_GWD_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_GWD_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -39,3 +39,7 @@
! case(EFGWORO,FRACLDV)
! continue
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+
+! BEGIN DART PREPROCESS MODULE CODE
+! No module code needed for the GWD obs_def module
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_QuikSCAT_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_QuikSCAT_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_QuikSCAT_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -51,3 +51,6 @@
! continue
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+! BEGIN DART PREPROCESS MODULE CODE
+! No module code needed for the QuikSCAT obs_def module
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_altimeter_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_altimeter_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_altimeter_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -1,5 +1,9 @@
-module obs_def_altimeter_mod
+! Data Assimilation Research Testbed -- DART
+! Copyright 2004-2008, Data Assimilation Research Section
+! University Corporation for Atmospheric Research
+! Licensed under the GPL -- www.gpl.org/licenses/gpl.html
+
! BEGIN DART PREPROCESS KIND LIST
! RADIOSONDE_SURFACE_ALTIMETER, KIND_SURFACE_PRESSURE
! MARINE_SFC_ALTIMETER, KIND_SURFACE_PRESSURE
@@ -30,6 +34,8 @@
! continue
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+! BEGIN DART PREPROCESS MODULE CODE
+module obs_def_altimeter_mod
use types_mod, only : r8, missing_r8, t_kelvin
use utilities_mod, only : register_module, error_handler, E_ERR, E_MSG
@@ -120,3 +126,4 @@
!----------------------------------------------------------------------------
end module obs_def_altimeter_mod
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_dew_point_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_dew_point_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_dew_point_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -3,7 +3,6 @@
! University Corporation for Atmospheric Research
! Licensed under the GPL -- www.gpl.org/licenses/gpl.html
-module obs_def_dew_point_mod
! <next five lines automatically updated by CVS, do not edit>
! $Source: /home/thoar/CVS.REPOS/DART/obs_def/obs_def_dew_point_mod.f90,v $
@@ -43,6 +42,9 @@
! continue
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+! BEGIN DART PREPROCESS MODULE CODE
+module obs_def_dew_point_mod
+
use types_mod, only : r8, missing_r8, t_kelvin
use utilities_mod, only : register_module, error_handler, E_ERR, E_MSG
use location_mod, only : location_type, set_location, get_location , write_location, &
@@ -142,3 +144,4 @@
!----------------------------------------------------------------------------
end module obs_def_dew_point_mod
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_eval_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_eval_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_eval_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -53,3 +53,6 @@
! continue
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+! BEGIN DART PREPROCESS MODULE CODE
+! No module code needed for the Eval obs_def module
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_gps_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_gps_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_gps_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -3,7 +3,6 @@
! University Corporation for Atmospheric Research
! Licensed under the GPL -- www.gpl.org/licenses/gpl.html
-module obs_def_gps_mod
! <next few lines under version control, do not edit>
! $URL$
@@ -46,6 +45,9 @@
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+! BEGIN DART PREPROCESS MODULE CODE
+module obs_def_gps_mod
+
use types_mod, only : r8, missing_r8, RAD2DEG, DEG2RAD, PI
use utilities_mod, only : register_module, error_handler, E_ERR, E_MSG, file_exist, &
open_file, logfileunit, close_file
@@ -502,3 +504,4 @@
end subroutine carte2geo
end module obs_def_gps_mod
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_gts_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_gts_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_gts_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -138,3 +138,6 @@
! continue
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+! BEGIN DART PREPROCESS MODULE CODE
+! No module code needed for the gts obs_def module
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_metar_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_metar_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_metar_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -57,3 +57,7 @@
! METAR_POT_TEMP_2_METER)
! continue
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+
+! BEGIN DART PREPROCESS MODULE CODE
+! No module code needed for the metar obs_def module
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_pe2lyr_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_pe2lyr_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_pe2lyr_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -44,3 +44,6 @@
! continue
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+! BEGIN DART PREPROCESS MODULE CODE
+! No module code needed for the pe2lyr obs_def module
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_radar_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_radar_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_radar_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -3,8 +3,6 @@
! University Corporation for Atmospheric Research
! Licensed under the GPL -- www.gpl.org/licenses/gpl.html
-module obs_def_radar_mod
-
! <next few lines under version control, do not edit>
! $URL$
! $Id$
@@ -14,6 +12,11 @@
! BEGIN DART PREPROCESS KIND LIST
! DOPPLER_RADIAL_VELOCITY, KIND_VELOCITY
! RADAR_REFLECTIVITY, KIND_RADAR_REFLECTIVITY
+! VERTICAL_VELOCITY, KIND_VERTICAL_VELOCITY
+! RAINWATER_MIXING_RATIO, KIND_RAINWATER_MIXING_RATIO
+! DENSITY, KIND_DENSITY
+! GRAUPEL_MIXING_RATIO, KIND_GRAUPEL_MIXING_RATIO
+! SNOW_MIXING_RATIO, KIND_SNOW_MIXING_RATIO
! END DART PREPROCESS KIND LIST
! BEGIN DART PREPROCESS USE OF SPECIAL OBS_DEF MODULE
@@ -51,6 +54,9 @@
! call interactive_rad_ref(obs_def%key)
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+! BEGIN DART PREPROCESS MODULE CODE
+module obs_def_radar_mod
+
use types_mod, only : r8, missing_r8, ps0, PI, gravity, DEG2RAD
use utilities_mod, only : register_module, error_handler, E_ERR, E_MSG, &
check_namelist_read, find_namelist_in_file, &
@@ -1036,5 +1042,5 @@
end function read_reftype
-
end module obs_def_radar_mod
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_reanalysis_bufr_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_reanalysis_bufr_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_reanalysis_bufr_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -106,3 +106,6 @@
! continue
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+! BEGIN DART PREPROCESS MODULE CODE
+! No module code needed for the reanalysis obs_def module
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_simple_advection_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_simple_advection_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_simple_advection_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -48,3 +48,7 @@
!case(VELOCITY, TRACER_CONCENTRATION, TRACER_SOURCE, MEAN_SOURCE, SOURCE_PHASE)
! continue
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+
+! BEGIN DART PREPROCESS MODULE CODE
+! No module code needed for the simple_advection obs_def module
+! END DART PREPROCESS MODULE CODE
Modified: DART/branches/nancy_work/obs_def/obs_def_vortex_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_vortex_mod.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_def/obs_def_vortex_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -3,8 +3,6 @@
! University Corporation for Atmospheric Research
! Licensed under the GPL -- www.gpl.org/licenses/gpl.html
-module obs_def_vortex_mod
-
! <next few lines under version control, do not edit>
! $URL$
! $Id$
@@ -66,6 +64,9 @@
! continue
! END DART PREPROCESS INTERACTIVE_OBS_DEF
+! BEGIN DART PREPROCESS MODULE CODE
+module obs_def_vortex_mod
+
use types_mod, only : r8, missing_r8, ps0, PI, gravity
use utilities_mod, only : register_module, error_handler, E_ERR
use location_mod, only : location_type, write_location, read_location
@@ -73,7 +74,6 @@
use obs_kind_mod, only : KIND_U_WIND_COMPONENT, KIND_V_WIND_COMPONENT, &
KIND_TEMPERATURE, KIND_VERTICAL_VELOCITY, &
KIND_RAINWATER_MIXING_RATIO, KIND_DENSITY, &
- KIND_GRAUPEL_MIXING_RATIO, KIND_SNOW_MIXING_RATIO, &
KIND_VORTEX_LAT, KIND_VORTEX_LON, KIND_VORTEX_PMIN, &
KIND_VORTEX_WMAX
@@ -142,3 +142,4 @@
end subroutine get_expected_vortex_info
end module obs_def_vortex_mod
+! END DART PREPROCESS MODULE CODE
Added: DART/branches/nancy_work/obs_def/obs_def_wrf_mod.f90
===================================================================
--- DART/branches/nancy_work/obs_def/obs_def_wrf_mod.f90 (rev 0)
+++ DART/branches/nancy_work/obs_def/obs_def_wrf_mod.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -0,0 +1,77 @@
+! Data Assimilation Research Testbed -- DART
+! Copyright 2004-2007, Data Assimilation Research Section
+! University Corporation for Atmospheric Research
+! Licensed under the GPL -- www.gpl.org/licenses/gpl.html
+
+! <next few lines under version control, do not edit>
+! $URL$
+! $Id: $
+! $Revision$
+! $Date: $
+
+! BEGIN DART PREPROCESS KIND LIST
+!GEOPOTENTIAL_HEIGHT, KIND_GEOPOTENTIAL_HEIGHT
+!PRESSURE, KIND_PRESSURE
+!VAPOR_MIXING_RATIO, KIND_VAPOR_MIXING_RATIO
+!CLOUD_LIQUID_WATER, KIND_CLOUD_LIQUID_WATER
+!CLOUD_LIQUID_ICE, KIND_CLOUD_LIQUID_ICE
+!CLOUD_ICE, KIND_CLOUD_ICE
+!ICE_NUMBER_CONCENTRATION, KIND_ICE_NUMBER_CONCENTRATION
+!SOIL_MOISTURE, KIND_SOIL_MOISTURE
+!CONDENSATIONAL_HEATING, KIND_CONDENSATIONAL_HEATING
+!SURFACE_ELEVATION, KIND_SURFACE_ELEVATION
+! END DART PREPROCESS KIND LIST
+
+! BEGIN DART PREPROCESS USE OF SPECIAL OBS_DEF MODULE
+!! No use statements are required for the wrf obs_def module
+! END DART PREPROCESS USE OF SPECIAL OBS_DEF MODULE
+
+! BEGIN DART PREPROCESS GET_EXPECTED_OBS_FROM_DEF
+! case(GEOPOTENTIAL_HEIGHT)
+! call interpolate(state, location, KIND_GEOPOTENTIAL_HEIGHT, obs_val, istatus)
+! case(PRESSURE)
+! call interpolate(state, location, KIND_PRESSURE, obs_val, istatus)
+! case(VAPOR_MIXING_RATIO)
+! call interpolate(state, location, KIND_VAPOR_MIXING_RATIO, obs_val, istatus)
+! case(CLOUD_LIQUID_WATER)
+! call interpolate(state, location, KIND_CLOUD_LIQUID_WATER, obs_val, istatus)
+! case(CLOUD_LIQUID_ICE)
+! call interpolate(state, location, KIND_CLOUD_LIQUID_ICE, obs_val, istatus)
+! case(CLOUD_ICE)
+! call interpolate(state, location, KIND_CLOUD_ICE, obs_val, istatus)
+! case(ICE_NUMBER_CONCENTRATION)
+! call interpolate(state, location, KIND_ICE_NUMBER_CONCENTRATION, obs_val, istatus)
+! case(SOIL_MOISTURE)
+! call interpolate(state, location, KIND_SOIL_MOISTURE, obs_val, istatus)
+! case(CONDENSATIONAL_HEATING)
+! call interpolate(state, location, KIND_CONDENSATIONAL_HEATING, obs_val, istatus)
+! case(SURFACE_ELEVATION)
+! call interpolate(state, location, KIND_SURFACE_ELEVATION, obs_val, istatus)
+!
+! END DART PREPROCESS GET_EXPECTED_OBS_FROM_DEF
+
+! BEGIN DART PREPROCESS READ_OBS_DEF
+!case(GEOPOTENTIAL_HEIGHT, PRESSURE, VAPOR_MIXING_RATIO, CLOUD_LIQUID_WATER, &
+! CLOUD_LIQUID_ICE, CLOUD_ICE, ICE_NUMBER_CONCENTRATION, SOIL_MOISTURE, &
+! CONDENSATIONAL_HEATING, SURFACE_ELEVATION)
+! continue
+! END DART PREPROCESS READ_OBS_DEF
+
+! BEGIN DART PREPROCESS WRITE_OBS_DEF
+!case(GEOPOTENTIAL_HEIGHT, PRESSURE, VAPOR_MIXING_RATIO, CLOUD_LIQUID_WATER, &
+! CLOUD_LIQUID_ICE, CLOUD_ICE, ICE_NUMBER_CONCENTRATION, SOIL_MOISTURE, &
+! CONDENSATIONAL_HEATING, SURFACE_ELEVATION)
+! continue
+! END DART PREPROCESS WRITE_OBS_DEF
+
+! BEGIN DART PREPROCESS INTERACTIVE_OBS_DEF
+!case(GEOPOTENTIAL_HEIGHT, PRESSURE, VAPOR_MIXING_RATIO, CLOUD_LIQUID_WATER, &
+! CLOUD_LIQUID_ICE, CLOUD_ICE, ICE_NUMBER_CONCENTRATION, SOIL_MOISTURE, &
+! CONDENSATIONAL_HEATING, SURFACE_ELEVATION)
+! continue
+! END DART PREPROCESS INTERACTIVE_OBS_DEF
+
+! BEGIN DART PREPROCESS MODULE CODE
+! No module code needed for the wrf obs_def module
+! END DART PREPROCESS MODULE CODE
+
Property changes on: DART/branches/nancy_work/obs_def/obs_def_wrf_mod.f90
___________________________________________________________________
Name: svn:keywords
+ "Date Rev Author URL Id"
Modified: DART/branches/nancy_work/obs_kind/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/nancy_work/obs_kind/DEFAULT_obs_kind_mod.F90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/obs_kind/DEFAULT_obs_kind_mod.F90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -26,24 +26,6 @@
evaluate_this_obs_kind, get_obs_kind_var_type, get_obs_kind_index, &
write_obs_kind, read_obs_kind, get_kind_from_menu, map_def_index
-! Public access to the raw variable types
-public :: KIND_RAW_STATE_VARIABLE, KIND_U_WIND_COMPONENT, &
- KIND_V_WIND_COMPONENT, KIND_SURFACE_PRESSURE, &
- KIND_TEMPERATURE, KIND_SPECIFIC_HUMIDITY, KIND_PRESSURE, &
- KIND_VERTICAL_VELOCITY, KIND_RAINWATER_MIXING_RATIO, &
- KIND_DEW_POINT_TEMPERATURE, KIND_DENSITY, KIND_VELOCITY, &
- KIND_RADAR_REFLECTIVITY, KIND_1D_INTEGRAL, &
- KIND_GRAUPEL_MIXING_RATIO, KIND_SNOW_MIXING_RATIO, &
- KIND_GPSRO, KIND_CLOUD_LIQUID_WATER, KIND_CLOUD_ICE, &
- KIND_CONDENSATIONAL_HEATING, KIND_VAPOR_MIXING_RATIO, &
- KIND_ICE_NUMBER_CONCENTRATION, KIND_GEOPOTENTIAL_HEIGHT, &
- KIND_POTENTIAL_TEMPERATURE, KIND_SOIL_MOISTURE, &
- KIND_GRAV_WAVE_DRAG_EFFIC, KIND_GRAV_WAVE_STRESS_FRACTION, &
- KIND_TRACER_SOURCE, KIND_TRACER_CONCENTRATION, &
- KIND_MEAN_SOURCE, KIND_SOURCE_PHASE, &
- KIND_VORTEX_LON, KIND_VORTEX_LAT, &
- KIND_VORTEX_PMIN, KIND_VORTEX_WMAX, KIND_SURFACE_ELEVATION
-
! Public access to the observation types is provided here
! This is constructed by the preprocessor
! DART PREPROCESS PUBLIC INSERTED HERE
@@ -56,55 +38,7 @@
logical, save :: module_initialized = .false.
-! A list of raw variable types that must be used by observation kinds but can also
-! be used by models to define the type of their variables for get_state_meta_data
-! and for forward operator evaluation by models. The value of ??? is reserved
-! for raw state variable types so that low order models don't have to use this
-! module.
-integer, parameter :: KIND_RAW_STATE_VARIABLE = 0, &
- KIND_U_WIND_COMPONENT = 1, &
- KIND_V_WIND_COMPONENT = 2, &
- KIND_SURFACE_PRESSURE = 3, &
- KIND_TEMPERATURE = 4, &
- KIND_SPECIFIC_HUMIDITY = 5, &
- KIND_PRESSURE = 6, &
- KIND_VERTICAL_VELOCITY = 7, &
- KIND_RAINWATER_MIXING_RATIO = 8, &
- KIND_DEW_POINT_TEMPERATURE = 9, &
- KIND_DENSITY = 10, &
- KIND_VELOCITY = 11, &
- KIND_RADAR_REFLECTIVITY = 12, &
- KIND_1D_INTEGRAL = 13, &
- KIND_GRAUPEL_MIXING_RATIO = 14, &
- KIND_SNOW_MIXING_RATIO = 15, &
- KIND_GPSRO = 16, &
- KIND_CLOUD_LIQUID_WATER = 17, &
- KIND_CLOUD_ICE = 18, &
- KIND_CONDENSATIONAL_HEATING = 19, &
- KIND_VAPOR_MIXING_RATIO = 20, &
- KIND_ICE_NUMBER_CONCENTRATION = 21, &
- KIND_GEOPOTENTIAL_HEIGHT = 22, &
- KIND_POTENTIAL_TEMPERATURE = 23, &
- KIND_SOIL_MOISTURE = 24, &
- KIND_SURFACE_ELEVATION = 25
-
-! kinds for Gravity Wave Drag (CAM - kevin)
-integer, parameter :: KIND_GRAV_WAVE_DRAG_EFFIC = 26, &
- KIND_GRAV_WAVE_STRESS_FRACTION = 27
-
-! kinds for simple advection model
-integer, parameter :: KIND_TRACER_SOURCE = 28, &
- KIND_TRACER_CONCENTRATION = 29, &
- KIND_MEAN_SOURCE = 30, &
- KIND_SOURCE_PHASE = 31
-
-! kinds for vortex tracking (WRF - yongsheng)
-integer, parameter :: KIND_VORTEX_LON = 81, &
- KIND_VORTEX_LAT = 82, &
- KIND_VORTEX_PMIN = 83, &
- KIND_VORTEX_WMAX = 84
-
! Index values associated with each observation kind string are defined
! by the preprocessor and inserted here. The total number of obs_kinds
! is also set in parameter max_obs_kinds.
Modified: DART/branches/nancy_work/preprocess/preprocess.f90
===================================================================
--- DART/branches/nancy_work/preprocess/preprocess.f90 2008-02-07 16:14:35 UTC (rev 3215)
+++ DART/branches/nancy_work/preprocess/preprocess.f90 2008-02-07 16:48:22 UTC (rev 3216)
@@ -1,5 +1,5 @@
! Data Assimilation Research Testbed -- DART
-! Copyright 2004-2007, Data Assimilation Research Section
+! Copyright 2004-2008, Data Assimilation Research Section
! University Corporation for Atmospheric Research
! Licensed under the GPL -- www.gpl.org/licenses/gpl.html
@@ -11,15 +11,15 @@
! $Revision$
! $Date$
-! Takes a list of observation kind module path names. These modules contain
-! six fragements of standard F90 that may be required to implement forward
-! observation operators for DART. The six sections are retrieved from the file
-! by the preprocessor and then inserted into the appropriate blank in the
+! Takes a list of observation type module path names. These modules contain
+! multiple fragments of standard F90 that may be required to implement forward
+! observation operators for DART. The sections are retrieved from the files
+! by this program and inserted into the appropriate blank in the
! DEFAULT_obs_def_mod.F90. The final obs_def_mod.f90 that is created contains
! the default code plus all the code required from the selected observation
-! kind modules. Preprocess also inserts the required identifier and string
-! for this observation kind into the DEFAULT_obs_kind_mod.f90 which is written
-! out to obs_kind_mod.f90.
+! type modules. Preprocess also inserts the required identifier and string
+! for the corresponding observation kinds into the DEFAULT_obs_kind_mod.f90
+! which is written out to obs_kind_mod.f90.
! NEED TO ADD IN ALL THE ERROR STUFF
@@ -45,7 +45,7 @@
logical :: duplicate
character(len = 169) :: err_string
-! List of the DART PREPROCESS strings
+! List of the DART PREPROCESS strings for obs_def type files.
character(len = 29) :: preprocess_string(8) = (/ &
'MODULE CODE ', &
'USE FOR OBS_KIND_MOD ', &
@@ -97,7 +97,7 @@
write(*, *) trim(output_obs_def_mod_file)
write(*, *) trim(output_obs_kind_mod_file)
-! A path for the default files is required. Have an error is these are still null.
+! A path for the default files is required. Have an error if these are null.
if(input_obs_def_mod_file == 'null') &
call error_handler(E_ERR, 'preprocess', 'Namelist must provide input_obs_def_mod_file', &
source, revision, revdate)
@@ -105,7 +105,7 @@
call error_handler(E_ERR, 'preprocess', 'Namelist must provide input_obs_kind_mod_file', &
source, revision, revdate)
-! A path for the output files is required. Have an error is these are still null.
+! A path for the output files is required. Have an error if these are null.
if(output_obs_def_mod_file == 'null') &
call error_handler(E_ERR, 'preprocess', 'Namelist must provide output_obs_def_mod_file', &
source, revision, revdate)
@@ -113,8 +113,8 @@
call error_handler(E_ERR, 'preprocess', 'Namelist must provide output_obs_kind_mod_file', &
source, revision, revdate)
-write(logfileunit, *) 'INPUT obs_kind files follow:'
-write(*, *) 'INPUT obs_kind files follow:'
+write(logfileunit, *) 'INPUT obs_def files follow:'
+write(*, *) 'INPUT obs_def files follow:'
do i = 1, max_input_files
if(input_files(i) == 'null') exit
@@ -130,8 +130,8 @@
obs_def_in_unit = open_file(input_obs_def_mod_file)
else
! If file does not exist it is an error
- write(err_string, *) 'file ', trim(input_obs_def_mod_file), ' does not exist'
- call error_handler(E_ERR, 'preprocess', err_string, source, revision, revdate)
+ write(err_string, *) 'file ', trim(input_obs_def_mod_file), ' does not exist'
+ call error_handler(E_ERR, 'preprocess', err_string, source, revision, revdate)
endif
if(file_exist(trim(input_obs_kind_mod_file))) then
@@ -139,8 +139,8 @@
obs_kind_in_unit = open_file(input_obs_kind_mod_file)
else
! If file does not exist it is an error
- write(err_string, *) 'file ', trim(input_obs_kind_mod_file), ' does not exist'
- call error_handler(E_ERR, 'preprocess', err_string, source, revision, revdate)
+ write(err_string, *) 'file ', trim(input_obs_kind_mod_file), ' does not exist'
+ call error_handler(E_ERR, 'preprocess', err_string, source, revision, revdate)
endif
! Output files must NOT EXIST or else an error
@@ -149,7 +149,7 @@
obs_def_out_unit = open_file(output_obs_def_mod_file)
else
! If file does not exist it is an error
- write(err_string, *) 'file ', trim(output_obs_def_mod_file), ' exists: Please Rename'
+ write(err_string, *) 'file ', trim(output_obs_def_mod_file), ' exists: Please Rename'
call error_handler(E_ERR, 'preprocess', err_string, source, revision, revdate)
endif
@@ -158,8 +158,8 @@
obs_kind_out_unit = open_file(output_obs_kind_mod_file)
else
! If file does not exist it is an error
- write(err_string, *) 'file ', trim(output_obs_kind_mod_file), ' exists: Please Rename'
- call error_handler(E_ERR, 'preprocess', err_string, source, revision, revdate)
+ write(err_string, *) 'file ', trim(output_obs_kind_mod_file), ' exists: Please Rename'
+ call error_handler(E_ERR, 'preprocess', err_string, source, revision, revdate)
endif
!_______________________________________________________________________________________
@@ -177,7 +177,7 @@
else
! If file does not exist it is an error
write(err_string, *) 'input_files ', trim(input_files(j)), ' does NOT exist.'
- call error_handler(E_ERR, 'preprocess', err_string, source, revision, revdate)
+ call error_handler(E_ERR, 'preprocess', err_string, source, revision, revdate)
endif
! Read until the ! BEGIN KIND LIST is found
@@ -196,7 +196,7 @@
if(test(1:33) == '! BEGIN DART PREPROCESS KIND LIST') exit FIND_KIND_LIST
end do FIND_KIND_LIST
- ! Subsequent lines contain the kind_identifier (same as kind_string), and
+ ! Subsequent lines contain the kind_identifier (same as kind_string), and
! raw_kind_ident separated by commas
EXTRACT_KINDS: do
read(in_unit, 222, IOSTAT = ierr) line
@@ -213,23 +213,23 @@
! Found a kind; increment the count
num_kinds_found = num_kinds_found + 1
- ! Otherwise this line should contain kind_identifier (same as kind_string),
+ ! Otherwise this line should contain kind_identifier (same as kind_string),
! raw_kind_item with leading comment
! Get rid of the leading comment and subsequent space
test = adjustl(line(2:))
! Compute the length of the kind_string by seeking comma
do k = 1, 256
l_kind_string = k - 1
- if(test(k:k) == ',') exit
+ if(test(k:k) == ',') exit
end do
kind_string(num_kinds_found) = adjustl(test(1:l_kind_string))
-
+
! Finally get the raw_kind_item
raw_kind_item(num_kinds_found) = adjustl(test(l_kind_string + 2:))
-
+
end do EXTRACT_KINDS
- ! Close this obs_kind file
+ ! Close this obs_kind file
close(in_unit)
end do SEARCH_INPUT_FILES
@@ -237,7 +237,7 @@
! Begin by copying over lines until first insertion point is found
do
read(obs_kind_in_unit, 222, IOSTAT = ierr) line
- ! Check for end of file
+ ! Check for end of file
if(ierr /=0) then
call error_handler(E_ERR, 'preprocess', 'Input DEFAULT obs_kind file ended unexpectedly', &
source, revision, revdate)
@@ -246,22 +246,37 @@
! Is this the place to start writing preprocessor stuff
test = adjustl(line)
if(test(1:38) == '! DART PREPROCESS PUBLIC INSERTED HERE') exit
-
+
! Write the line to the output file
write(obs_kind_out_unit, 21) trim(line)
end do
-! Loop to write out all the public declarations
+! Loop to write out all the public declarations for types
+51 format(A)
do i = 1, num_kinds_found
write(line, *) 'public :: ', trim(kind_string(i))
write(obs_kind_out_unit, 51) trim(adjustl(line))
- 51 format(A)
end do
+! Loop to write out all the public declarations for kinds,
+! squeezing out duplicates
+do i = 1, num_kinds_found
+ duplicate = .false.
+ do j = 1, i-1
+ if (trim(raw_kind_item(j)) == trim(raw_kind_item(i))) then
+ duplicate = .true.
+ exit
+ endif
+ end do
+ if (.not. duplicate) then
+ write(line, *) 'public :: ', trim(raw_kind_item(i))
+ write(obs_kind_out_unit, 51) trim(adjustl(line))
+ endif
+end do
! Copy over lines up to the next insertion point
do
read(obs_kind_in_unit, 222, IOSTAT = ierr) line
- ! Check for end of file
+ ! Check for end of file
if(ierr /=0) then
call error_handler(E_ERR, 'preprocess', 'Input DEFAULT obs_kind file ended unexpectedly', &
source, revision, revdate)
@@ -270,17 +285,33 @@
! Is this the place to start writing preprocessor stuff
test = adjustl(line)
if(test(1:51) == '! DART PREPROCESS INTEGER DECLARATION INSERTED HERE') exit
-
+
! Write the line to the output file
write(obs_kind_out_unit, 21) trim(line)
end do
-! Write out the integer declaration lines
+! Write out the integer declaration lines for types
do i = 1, num_kinds_found
write(line, *) 'integer, parameter :: ', trim(adjustl(kind_string(i))), ' = ', i
write(obs_kind_out_unit, 51) trim(adjustl(line))
end do
+! Write out the integer declaration lines for kinds,
+! squeezing out duplicates
+do i = 1, num_kinds_found
+ duplicate = .false.
+ do j = 1, i-1
+ if (trim(raw_kind_item(j)) == trim(raw_kind_item(i))) then
+ duplicate = .true.
+ exit
+ endif
+ end do
+ if (.not. duplicate) then
+ write(line, *) 'integer, parameter :: ', trim(adjustl(raw_kind_item(i))), ' = ', i
+ write(obs_kind_out_unit, 51) trim(adjustl(line))
+ endif
+end do
+
! Write out the max_obs_kinds, too
write(line, *) 'integer, parameter :: max_obs_kinds = ', num_kinds_found
write(obs_kind_out_unit, 51) trim(adjustl(line))
@@ -288,7 +319,7 @@
! Copy over lines up to the next insertion point
do
read(obs_kind_in_unit, 222, IOSTAT = ierr) line
- ! Check for end of file
+ ! Check for end of file
if(ierr /=0) then
call error_handler(E_ERR, 'preprocess', 'Input DEFAULT obs_kind file ended unexpectedly', &
source, revision, revdate)
@@ -297,7 +328,7 @@
! Is this the place to start writing preprocessor stuff
test = adjustl(line)
if(test(1:51) == '! DART PREPROCESS OBS_KIND_INFO INSERTED HERE') exit
-
+
! Write the line to the output file
write(obs_kind_out_unit, 21) trim(line)
end do
@@ -310,13 +341,13 @@
write(obs_kind_out_unit, 21) trim(line)
end do
-
+
! Copy over rest of lines
do
read(obs_kind_in_unit, 222, IOSTAT = ierr) line
- ! Check for end of file
+ ! Check for end of file
if(ierr /=0) exit
-
+
! Write the line to the output file
write(obs_kind_out_unit, 21) trim(line)
end do
@@ -343,7 +374,7 @@
call error_handler(E_ERR, 'preprocess', 'Input DEFAULT obs_def file ended unexpectedly', &
source, revision, revdate)
else
- exit ITEMS
+ exit ITEMS
endif
endif
@@ -370,7 +401,7 @@
do l = 1, k-1
if (trim(raw_kind_item(k)) == trim(raw_kind_item(l))) then
duplicate = .true.
- exit
+ exit
endif
end do
if (.not. duplicate) &
@@ -386,7 +417,7 @@
else
! If file does not exist it is an error
write(err_string, *) 'input_files ', trim(input_files(j)), ' does NOT exist.'
- call error_handler(E_ERR, 'preprocess', err_string, source, revision, revdate)
+ call error_handler(E_ERR, 'preprocess', err_string, source, revision, revdate)
endif
! Read until the appropriate ITEM # label is found in the input for this obs_kind
@@ -421,7 +452,7 @@
test = adjustl(line)
t_string = '! END DART PREPROCESS ' // trim(preprocess_string(i))
if(trim(test) == trim(t_string)) exit COPY_ITEM
-
+
! Write the line to the output obs_def_mod.f90 file
! The module code, if present, is copied verbatim. The rest of the lines
! are preceeded by a ! in col 1, so that must be stripped off.
@@ -431,7 +462,7 @@
write(obs_def_out_unit, 21) trim(line(2:))
endif
end do COPY_ITEM
-
+
! Got everything from this file, move along
close(in_unit)
end do
More information about the Dart-dev
mailing list