[Dart-dev] [3331] DART/branches/nancy_work: Changes committed to my test branch only.

nancy at subversion.ucar.edu nancy at subversion.ucar.edu
Mon May 12 12:57:58 MDT 2008


An HTML attachment was scrubbed...
URL: http://mailman.ucar.edu/pipermail/dart-dev/attachments/20080512/4c8ac415/attachment-0001.html
-------------- next part --------------
Modified: DART/branches/nancy_work/models/lorenz_96/work/input.nml
===================================================================
--- DART/branches/nancy_work/models/lorenz_96/work/input.nml	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/models/lorenz_96/work/input.nml	2008-05-12 18:57:57 UTC (rev 3331)
@@ -107,7 +107,7 @@
    TERMLEVEL = 1,
    module_details = .false.,
    logfilename = 'dart_log.out',
-   nmfilename  = 'dart_log.nml'  /
+   nmlfilename = 'dart_log.nml'  /
 
 &preprocess_nml
     input_obs_def_mod_file = '../../../obs_def/DEFAULT_obs_def_mod.F90', 

Deleted: DART/branches/nancy_work/models/lorenz_96/work/mkmf_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_96/work/mkmf_merge_obs_seq	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/models/lorenz_96/work/mkmf_merge_obs_seq	2008-05-12 18:57:57 UTC (rev 3331)
@@ -1,15 +0,0 @@
-#!/bin/csh
-#
-# 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$
-#
-../../../mkmf/mkmf -p merge_obs_seq -t ../../../mkmf/mkmf.template -c"-Duse_netCDF" \
- -a "../../.." path_names_merge_obs_seq

Deleted: DART/branches/nancy_work/models/lorenz_96/work/mkmf_query_obs_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_96/work/mkmf_query_obs_seq	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/models/lorenz_96/work/mkmf_query_obs_seq	2008-05-12 18:57:57 UTC (rev 3331)
@@ -1,15 +0,0 @@
-#!/bin/csh
-#
-# 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: http://subversion.ucar.edu/DAReS/DART/trunk/models/lorenz_96/work/mkmf_query_obs_seq $
-# $Id: mkmf_query_obs_seq 2691 2007-03-11 18:18:09Z thoar $
-# $Revision: 2691 $
-# $Date: 2007-03-11 12:18:09 -0600 (Sun, 11 Mar 2007) $
-#
-../../../mkmf/mkmf -p query_obs_seq -t ../../../mkmf/mkmf.template -c"-Duse_netCDF" \
- -a "../../.." path_names_query_obs_seq

Deleted: DART/branches/nancy_work/models/lorenz_96/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_96/work/path_names_merge_obs_seq	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/models/lorenz_96/work/path_names_merge_obs_seq	2008-05-12 18:57:57 UTC (rev 3331)
@@ -1,14 +0,0 @@
-obs_sequence/merge_obs_seq.f90
-obs_sequence/obs_sequence_mod.f90
-obs_kind/obs_kind_mod.f90
-obs_def/obs_def_mod.f90
-cov_cutoff/cov_cutoff_mod.f90
-assim_model/assim_model_mod.f90
-models/lorenz_96/model_mod.f90
-common/types_mod.f90
-location/oned/location_mod.f90
-random_seq/random_seq_mod.f90
-random_nr/random_nr_mod.f90
-time_manager/time_manager_mod.f90
-utilities/utilities_mod.f90
-mpi_utilities/null_mpi_utilities_mod.f90

Deleted: DART/branches/nancy_work/models/lorenz_96/work/path_names_query_obs_seq
===================================================================
--- DART/branches/nancy_work/models/lorenz_96/work/path_names_query_obs_seq	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/models/lorenz_96/work/path_names_query_obs_seq	2008-05-12 18:57:57 UTC (rev 3331)
@@ -1,14 +0,0 @@
-obs_sequence/query_obs_seq.f90
-obs_sequence/obs_sequence_mod.f90
-obs_kind/obs_kind_mod.f90
-obs_def/obs_def_mod.f90
-cov_cutoff/cov_cutoff_mod.f90
-assim_model/assim_model_mod.f90
-models/lorenz_96/model_mod.f90
-common/types_mod.f90
-location/oned/location_mod.f90
-random_seq/random_seq_mod.f90
-random_nr/random_nr_mod.f90
-time_manager/time_manager_mod.f90
-utilities/utilities_mod.f90
-mpi_utilities/null_mpi_utilities_mod.f90

Copied: DART/branches/nancy_work/observations/utilities/oned/work/quickbuild.csh (from rev 3330, DART/branches/nancy_work/observations/utilities/oned/work/workshop_setup.csh)
===================================================================
--- DART/branches/nancy_work/observations/utilities/oned/work/quickbuild.csh	                        (rev 0)
+++ DART/branches/nancy_work/observations/utilities/oned/work/quickbuild.csh	2008-05-12 18:57:57 UTC (rev 3331)
@@ -0,0 +1,65 @@
+#!/bin/csh
+#
+# 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: workshop_setup.csh 2752 2007-03-30 22:12:18Z thoar $
+# $Revision$
+# $Date: 2007-03-30 16:12:18 -0600 (Fri, 30 Mar 2007) $
+
+# Script to manage the compilation of all programs in this directory.
+#
+#----------------------------------------------------------------------
+# 'preprocess' is a program that culls the appropriate sections of the
+# observation module for the observations types in 'input.nml'; the 
+# resulting source file is used by all the remaining programs, 
+# so this MUST be run first.
+#----------------------------------------------------------------------
+
+\rm -f preprocess *.o *.mod
+\rm -f ../../../obs_def/obs_def_mod.f90
+\rm -f ../../../obs_kind/obs_kind_mod.f90
+
+set DIRECT = "utilities"
+
+@ n = 1
+
+echo
+echo
+echo "---------------------------------------------------------------"
+echo "${DIRECT} build number ${n} is preprocess"
+
+csh  mkmf_preprocess
+make || exit $n
+
+./preprocess || exit 99
+
+#----------------------------------------------------------------------
+# Build all the single-threaded targets
+#----------------------------------------------------------------------
+
+foreach TARGET ( mkmf_* )
+
+   set PROG = `echo $TARGET | sed -e 's#mkmf_##'`
+
+   switch ( $TARGET )
+   case mkmf_preprocess:
+      breaksw
+   default:
+      @ n = $n + 1
+      echo
+      echo "---------------------------------------------------"
+      echo "${DIRECT} build number ${n} is ${PROG}" 
+      \rm -f ${PROG}
+      csh $TARGET || exit $n
+      make        || exit $n
+      breaksw
+   endsw
+end
+
+
+

Deleted: DART/branches/nancy_work/observations/utilities/oned/work/workshop_setup.csh
===================================================================
--- DART/branches/nancy_work/observations/utilities/oned/work/workshop_setup.csh	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/observations/utilities/oned/work/workshop_setup.csh	2008-05-12 18:57:57 UTC (rev 3331)
@@ -1,65 +0,0 @@
-#!/bin/csh
-#
-# 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: workshop_setup.csh 2752 2007-03-30 22:12:18Z thoar $
-# $Revision$
-# $Date: 2007-03-30 16:12:18 -0600 (Fri, 30 Mar 2007) $
-
-# Script to manage the compilation of all programs in this directory.
-#
-#----------------------------------------------------------------------
-# 'preprocess' is a program that culls the appropriate sections of the
-# observation module for the observations types in 'input.nml'; the 
-# resulting source file is used by all the remaining programs, 
-# so this MUST be run first.
-#----------------------------------------------------------------------
-
-\rm -f preprocess *.o *.mod
-\rm -f ../../../obs_def/obs_def_mod.f90
-\rm -f ../../../obs_kind/obs_kind_mod.f90
-
-set DIRECT = "utilities"
-
-@ n = 1
-
-echo
-echo
-echo "---------------------------------------------------------------"
-echo "${DIRECT} build number ${n} is preprocess"
-
-csh  mkmf_preprocess
-make || exit $n
-
-./preprocess || exit 99
-
-#----------------------------------------------------------------------
-# Build all the single-threaded targets
-#----------------------------------------------------------------------
-
-foreach TARGET ( mkmf_* )
-
-   set PROG = `echo $TARGET | sed -e 's#mkmf_##'`
-
-   switch ( $TARGET )
-   case mkmf_preprocess:
-      breaksw
-   default:
-      @ n = $n + 1
-      echo
-      echo "---------------------------------------------------"
-      echo "${DIRECT} build number ${n} is ${PROG}" 
-      \rm -f ${PROG}
-      csh $TARGET || exit $n
-      make        || exit $n
-      breaksw
-   endsw
-end
-
-
-

Modified: DART/branches/nancy_work/observations/utilities/threed_sphere/work/Makefile
===================================================================
--- DART/branches/nancy_work/observations/utilities/threed_sphere/work/Makefile	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/observations/utilities/threed_sphere/work/Makefile	2008-05-12 18:57:57 UTC (rev 3331)
@@ -9,8 +9,8 @@
 all: query_obs_seq
 time_manager_mod.o: ../../../../time_manager/time_manager_mod.f90 types_mod.o utilities_mod.o
 	$(FC) $(FFLAGS) -c	../../../../time_manager/time_manager_mod.f90
-query_obs_seq.o: ../../../../obs_sequence/query_obs_seq.f90 types_mod.o utilities_mod.o time_manager_mod.o obs_sequence_mod.o obs_def_mod.o obs_kind_mod.o
-	$(FC) $(FFLAGS) -c	../../../../obs_sequence/query_obs_seq.f90
+query_obs_seq.o: ../../../../observations/utilities/query_obs_seq.f90 types_mod.o utilities_mod.o time_manager_mod.o obs_sequence_mod.o obs_def_mod.o obs_kind_mod.o
+	$(FC) $(FFLAGS) -c	../../../../observations/utilities/query_obs_seq.f90
 assim_model_mod.o: ../../../../assim_model/assim_model_mod.f90 types_mod.o location_mod.o time_manager_mod.o utilities_mod.o model_mod.o
 	$(FC) $(FFLAGS) -c	../../../../assim_model/assim_model_mod.f90
 model_mod.o: ../../../../models/template/model_mod.f90 types_mod.o time_manager_mod.o location_mod.o utilities_mod.o
@@ -19,6 +19,8 @@
 	$(FC) $(FFLAGS) -c	../../../../obs_kind/obs_kind_mod.f90
 obs_def_mod.o: ../../../../obs_def/obs_def_mod.f90 types_mod.o utilities_mod.o location_mod.o assim_model_mod.o obs_kind_mod.o time_manager_mod.o
 	$(FC) $(FFLAGS) -c	../../../../obs_def/obs_def_mod.f90
+null_mpi_utilities_mod.o: ../../../../mpi_utilities/null_mpi_utilities_mod.f90 types_mod.o utilities_mod.o time_manager_mod.o
+	$(FC) $(FFLAGS) -c	../../../../mpi_utilities/null_mpi_utilities_mod.f90
 random_nr_mod.o: ../../../../random_nr/random_nr_mod.f90 types_mod.o utilities_mod.o
 	$(FC) $(FFLAGS) -c	../../../../random_nr/random_nr_mod.f90
 obs_sequence_mod.o: ../../../../obs_sequence/obs_sequence_mod.f90 types_mod.o location_mod.o obs_def_mod.o time_manager_mod.o utilities_mod.o obs_kind_mod.o
@@ -41,23 +43,25 @@
 	cp ../../../../location/threed_sphere/location_mod.f90 .
 ./types_mod.f90: ../../../../common/types_mod.f90
 	cp ../../../../common/types_mod.f90 .
+./null_mpi_utilities_mod.f90: ../../../../mpi_utilities/null_mpi_utilities_mod.f90
+	cp ../../../../mpi_utilities/null_mpi_utilities_mod.f90 .
 ./model_mod.f90: ../../../../models/template/model_mod.f90
 	cp ../../../../models/template/model_mod.f90 .
-./query_obs_seq.f90: ../../../../obs_sequence/query_obs_seq.f90
-	cp ../../../../obs_sequence/query_obs_seq.f90 .
 ./obs_kind_mod.f90: ../../../../obs_kind/obs_kind_mod.f90
 	cp ../../../../obs_kind/obs_kind_mod.f90 .
 ./random_nr_mod.f90: ../../../../random_nr/random_nr_mod.f90
 	cp ../../../../random_nr/random_nr_mod.f90 .
 ./random_seq_mod.f90: ../../../../random_seq/random_seq_mod.f90
 	cp ../../../../random_seq/random_seq_mod.f90 .
+./query_obs_seq.f90: ../../../../observations/utilities/query_obs_seq.f90
+	cp ../../../../observations/utilities/query_obs_seq.f90 .
 ./time_manager_mod.f90: ../../../../time_manager/time_manager_mod.f90
 	cp ../../../../time_manager/time_manager_mod.f90 .
 ./obs_sequence_mod.f90: ../../../../obs_sequence/obs_sequence_mod.f90
 	cp ../../../../obs_sequence/obs_sequence_mod.f90 .
-SRC = ../../../../time_manager/time_manager_mod.f90 ../../../../obs_sequence/query_obs_seq.f90 ../../../../assim_model/assim_model_mod.f90 ../../../../models/template/model_mod.f90 ../../../../obs_kind/obs_kind_mod.f90 ../../../../obs_def/obs_def_mod.f90 ../../../../random_nr/random_nr_mod.f90 ../../../../obs_sequence/obs_sequence_mod.f90 ../../../../random_seq/random_seq_mod.f90 ../../../../location/threed_sphere/location_mod.f90 ../../../../utilities/utilities_mod.f90 ../../../../common/types_mod.f90
-OBJ = time_manager_mod.o query_obs_seq.o assim_model_mod.o model_mod.o obs_kind_mod.o obs_def_mod.o random_nr_mod.o obs_sequence_mod.o random_seq_mod.o location_mod.o utilities_mod.o types_mod.o
-OFF = ../../../../utilities/utilities_mod.f90 ../../../../obs_def/obs_def_mod.f90 ../../../../assim_model/assim_model_mod.f90 ../../../../location/threed_sphere/location_mod.f90 ../../../../common/types_mod.f90 ../../../../models/template/model_mod.f90 ../../../../obs_sequence/query_obs_seq.f90 ../../../../obs_kind/obs_kind_mod.f90 ../../../../random_nr/random_nr_mod.f90 ../../../../random_seq/random_seq_mod.f90 ../../../../time_manager/time_manager_mod.f90 ../../../../obs_sequence/obs_sequence_mod.f90
+SRC = ../../../../time_manager/time_manager_mod.f90 ../../../../observations/utilities/query_obs_seq.f90 ../../../../assim_model/assim_model_mod.f90 ../../../../models/template/model_mod.f90 ../../../../obs_kind/obs_kind_mod.f90 ../../../../obs_def/obs_def_mod.f90 ../../../../mpi_utilities/null_mpi_utilities_mod.f90 ../../../../random_nr/random_nr_mod.f90 ../../../../obs_sequence/obs_sequence_mod.f90 ../../../../random_seq/random_seq_mod.f90 ../../../../location/threed_sphere/location_mod.f90 ../../../../utilities/utilities_mod.f90 ../../../../common/types_mod.f90
+OBJ = time_manager_mod.o query_obs_seq.o assim_model_mod.o model_mod.o obs_kind_mod.o obs_def_mod.o null_mpi_utilities_mod.o random_nr_mod.o obs_sequence_mod.o random_seq_mod.o location_mod.o utilities_mod.o types_mod.o
+OFF = ../../../../utilities/utilities_mod.f90 ../../../../obs_def/obs_def_mod.f90 ../../../../assim_model/assim_model_mod.f90 ../../../../location/threed_sphere/location_mod.f90 ../../../../common/types_mod.f90 ../../../../mpi_utilities/null_mpi_utilities_mod.f90 ../../../../models/template/model_mod.f90 ../../../../obs_kind/obs_kind_mod.f90 ../../../../random_nr/random_nr_mod.f90 ../../../../random_seq/random_seq_mod.f90 ../../../../observations/utilities/query_obs_seq.f90 ../../../../time_manager/time_manager_mod.f90 ../../../../obs_sequence/obs_sequence_mod.f90
 clean: neat
 	-rm -f .cppdefs $(OBJ) query_obs_seq
 neat:

Modified: DART/branches/nancy_work/observations/utilities/threed_sphere/work/dart_log.nml
===================================================================
--- DART/branches/nancy_work/observations/utilities/threed_sphere/work/dart_log.nml	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/observations/utilities/threed_sphere/work/dart_log.nml	2008-05-12 18:57:57 UTC (rev 3331)
@@ -49,3 +49,19 @@
  LAST_OBS_SECONDS=         -1,
  OBS_INPUT_TYPES= 5000*                                ,  /
 
+ !Starting Program preprocess
+&UTILITIES_NML
+ TERMLEVEL=          2,
+ LOGFILENAME=dart_log.out                                                                                                                     ,
+ MODULE_DETAILS=F,
+ NMLFILENAME=dart_log.nml                                                                                                                     ,  /
+
+ !Ending Program 
+ !Starting Program preprocess
+&UTILITIES_NML
+ TERMLEVEL=          2,
+ LOGFILENAME=dart_log.out                                                                                                                     ,
+ MODULE_DETAILS=F,
+ NMLFILENAME=dart_log.nml                                                                                                                     ,  /
+
+ !Ending Program 

Modified: DART/branches/nancy_work/observations/utilities/threed_sphere/work/dart_log.out
===================================================================
--- DART/branches/nancy_work/observations/utilities/threed_sphere/work/dart_log.out	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/observations/utilities/threed_sphere/work/dart_log.out	2008-05-12 18:57:57 UTC (rev 3331)
@@ -189,3 +189,55 @@
     file revision : $Revision: 3325 $
     revision date : $Date: 2008-04-30 14:17:26 -0600 (Wed, 30 Apr 2008) $
     message       :  Unable to open file gps_seq20060906
+
+ --------------------------------------
+ Starting ... at YYYY MM DD HH MM SS = 
+                 2008  5 12 10 58  2
+ Program preprocess
+ --------------------------------------
+
+ Path names of default obs_def and obs_kind modules
+ ../../../../obs_def/DEFAULT_obs_def_mod.F90
+ ../../../../obs_kind/DEFAULT_obs_kind_mod.F90
+ Path names of output obs_def and obs_kind modules
+ ../../../../obs_def/obs_def_mod.f90
+ ../../../../obs_kind/obs_kind_mod.f90
+ INPUT obs_def files follow:
+ ../../../../obs_def/obs_def_reanalysis_bufr_mod.f90
+ ../../../../obs_def/obs_def_altimeter_mod.f90
+ ../../../../obs_def/obs_def_gps_mod.f90
+
+ --------------------------------------
+ Finished ... at YYYY MM DD HH MM SS = 
+                 2008  5 12 10 58  2
+ $URL: http://subversion.ucar.edu/DAReS/DART/branches/nancy_work/preprocess/preprocess.f90 $
+ $Revision: 3330 $
+ $Date: 2008-05-09 15:41:50 -0600 (Fri, 09 May 2008) $
+ --------------------------------------
+
+
+ --------------------------------------
+ Starting ... at YYYY MM DD HH MM SS = 
+                 2008  5 12 10 59  8
+ Program preprocess
+ --------------------------------------
+
+ Path names of default obs_def and obs_kind modules
+ ../../../../obs_def/DEFAULT_obs_def_mod.F90
+ ../../../../obs_kind/DEFAULT_obs_kind_mod.F90
+ Path names of output obs_def and obs_kind modules
+ ../../../../obs_def/obs_def_mod.f90
+ ../../../../obs_kind/obs_kind_mod.f90
+ INPUT obs_def files follow:
+ ../../../../obs_def/obs_def_reanalysis_bufr_mod.f90
+ ../../../../obs_def/obs_def_altimeter_mod.f90
+ ../../../../obs_def/obs_def_gps_mod.f90
+
+ --------------------------------------
+ Finished ... at YYYY MM DD HH MM SS = 
+                 2008  5 12 10 59  8
+ $URL: http://subversion.ucar.edu/DAReS/DART/branches/nancy_work/preprocess/preprocess.f90 $
+ $Revision: 3330 $
+ $Date: 2008-05-09 15:41:50 -0600 (Fri, 09 May 2008) $
+ --------------------------------------
+

Modified: DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.merge_obs_seq_default
===================================================================
--- DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.merge_obs_seq_default	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.merge_obs_seq_default	2008-05-12 18:57:57 UTC (rev 3331)
@@ -39,5 +39,8 @@
 
 &utilities_nml
    TERMLEVEL = 1,
-   logfilename = 'dart_log.out'  /
+   logfilename = 'dart_log.out',
+   nmlfilename = 'dart_log.nml',
+   module_details = .false.
+/
 

Modified: DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.obs_diag_default
===================================================================
--- DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.obs_diag_default	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.obs_diag_default	2008-05-12 18:57:57 UTC (rev 3331)
@@ -57,5 +57,8 @@
 
 &utilities_nml
    TERMLEVEL = 1,
-   logfilename = 'dart_log.out'  /
+   logfilename = 'dart_log.out',
+   nmlfilename = 'dart_log.nml',
+   module_details = .false.
+/
 

Modified: DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.preprocess_default
===================================================================
--- DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.preprocess_default	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.preprocess_default	2008-05-12 18:57:57 UTC (rev 3331)
@@ -7,5 +7,8 @@
 
 &utilities_nml
    TERMLEVEL = 1,
-   logfilename = 'dart_log.out'  /
+   logfilename = 'dart_log.out',
+   nmlfilename = 'dart_log.nml',
+   module_details = .false.
+/
 

Modified: DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.query_obs_seq_default
===================================================================
--- DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.query_obs_seq_default	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/observations/utilities/threed_sphere/work/input.nml.query_obs_seq_default	2008-05-12 18:57:57 UTC (rev 3331)
@@ -27,5 +27,8 @@
 
 &utilities_nml
    TERMLEVEL = 1,
-   logfilename = 'dart_log.out'  /
+   logfilename = 'dart_log.out',
+   nmlfilename = 'dart_log.nml',
+   module_details = .false.
+/
 

Modified: DART/branches/nancy_work/observations/utilities/threed_sphere/work/path_names_merge_obs_seq
===================================================================
--- DART/branches/nancy_work/observations/utilities/threed_sphere/work/path_names_merge_obs_seq	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/observations/utilities/threed_sphere/work/path_names_merge_obs_seq	2008-05-12 18:57:57 UTC (rev 3331)
@@ -1,4 +1,4 @@
-obs_sequence/merge_obs_seq.f90
+observations/utilities/merge_obs_seq.f90
 obs_sequence/obs_sequence_mod.f90
 obs_kind/obs_kind_mod.f90
 obs_def/obs_def_mod.f90

Modified: DART/branches/nancy_work/observations/utilities/threed_sphere/work/path_names_query_obs_seq
===================================================================
--- DART/branches/nancy_work/observations/utilities/threed_sphere/work/path_names_query_obs_seq	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/observations/utilities/threed_sphere/work/path_names_query_obs_seq	2008-05-12 18:57:57 UTC (rev 3331)
@@ -1,4 +1,4 @@
-obs_sequence/query_obs_seq.f90
+observations/utilities/query_obs_seq.f90
 obs_sequence/obs_sequence_mod.f90
 obs_kind/obs_kind_mod.f90
 obs_def/obs_def_mod.f90

Added: DART/branches/nancy_work/observations/utilities/threed_sphere/work/quickbuild.csh
===================================================================
--- DART/branches/nancy_work/observations/utilities/threed_sphere/work/quickbuild.csh	                        (rev 0)
+++ DART/branches/nancy_work/observations/utilities/threed_sphere/work/quickbuild.csh	2008-05-12 18:57:57 UTC (rev 3331)
@@ -0,0 +1,65 @@
+#!/bin/csh
+#
+# 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: workshop_setup.csh 2752 2007-03-30 22:12:18Z thoar $
+# $Revision$
+# $Date: 2007-03-30 16:12:18 -0600 (Fri, 30 Mar 2007) $
+
+# Script to manage the compilation of all programs in this directory.
+#
+#----------------------------------------------------------------------
+# 'preprocess' is a program that culls the appropriate sections of the
+# observation module for the observations types in 'input.nml'; the 
+# resulting source file is used by all the remaining programs, 
+# so this MUST be run first.
+#----------------------------------------------------------------------
+
+\rm -f preprocess *.o *.mod
+\rm -f ../../../../obs_def/obs_def_mod.f90
+\rm -f ../../../../obs_kind/obs_kind_mod.f90
+
+set DIRECT = "utilities"
+
+@ n = 1
+
+echo
+echo
+echo "---------------------------------------------------------------"
+echo "${DIRECT} build number ${n} is preprocess"
+
+csh  mkmf_preprocess
+make || exit $n
+
+./preprocess || exit 99
+
+#----------------------------------------------------------------------
+# Build all the single-threaded targets
+#----------------------------------------------------------------------
+
+foreach TARGET ( mkmf_* )
+
+   set PROG = `echo $TARGET | sed -e 's#mkmf_##'`
+
+   switch ( $TARGET )
+   case mkmf_preprocess:
+      breaksw
+   default:
+      @ n = $n + 1
+      echo
+      echo "---------------------------------------------------"
+      echo "${DIRECT} build number ${n} is ${PROG}" 
+      \rm -f ${PROG}
+      csh $TARGET || exit $n
+      make        || exit $n
+      breaksw
+   endsw
+end
+
+
+


Property changes on: DART/branches/nancy_work/observations/utilities/threed_sphere/work/quickbuild.csh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + "Date Rev Author URL Id"

Deleted: DART/branches/nancy_work/observations/utilities/threed_sphere/work/workshop_setup.csh
===================================================================
--- DART/branches/nancy_work/observations/utilities/threed_sphere/work/workshop_setup.csh	2008-05-09 21:41:50 UTC (rev 3330)
+++ DART/branches/nancy_work/observations/utilities/threed_sphere/work/workshop_setup.csh	2008-05-12 18:57:57 UTC (rev 3331)
@@ -1,65 +0,0 @@
-#!/bin/csh
-#
-# 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: workshop_setup.csh 2752 2007-03-30 22:12:18Z thoar $
-# $Revision$
-# $Date: 2007-03-30 16:12:18 -0600 (Fri, 30 Mar 2007) $
-
-# Script to manage the compilation of all programs in this directory.
-#
-#----------------------------------------------------------------------
-# 'preprocess' is a program that culls the appropriate sections of the
-# observation module for the observations types in 'input.nml'; the 
-# resulting source file is used by all the remaining programs, 
-# so this MUST be run first.
-#----------------------------------------------------------------------
-
-\rm -f preprocess *.o *.mod
-\rm -f ../../../../obs_def/obs_def_mod.f90
-\rm -f ../../../../obs_kind/obs_kind_mod.f90
-
-set DIRECT = "utilities"
-
-@ n = 1
-
-echo
-echo
-echo "---------------------------------------------------------------"
-echo "${DIRECT} build number ${n} is preprocess"
-
-csh  mkmf_preprocess
-make || exit $n
-
-./preprocess || exit 99
-
-#----------------------------------------------------------------------
-# Build all the single-threaded targets
-#----------------------------------------------------------------------
-
-foreach TARGET ( mkmf_* )
-
-   set PROG = `echo $TARGET | sed -e 's#mkmf_##'`
-
-   switch ( $TARGET )
-   case mkmf_preprocess:
-      breaksw
-   default:
-      @ n = $n + 1
-      echo
-      echo "---------------------------------------------------"
-      echo "${DIRECT} build number ${n} is ${PROG}" 
-      \rm -f ${PROG}
-      csh $TARGET || exit $n
-      make        || exit $n
-      breaksw
-   endsw
-end
-
-
-


More information about the Dart-dev mailing list