[Dart-dev] DART/branches Revision: 11412

[dart at ucar.edu]

nancy at ucar.edu
2017-03-29 16:26:55 -0600 (Wed, 29 Mar 2017)
149
update quickbuild, fix the broken path_names files
(moved location_io_mod, and add missing modules)
remove wakeup_filter; no one runs this async 4.




Deleted: DART/branches/model_mod_changes/models/bgrid_solo/work/mkmf_wakeup_filter
===================================================================
--- DART/branches/model_mod_changes/models/bgrid_solo/work/mkmf_wakeup_filter	2017-03-29 21:48:14 UTC (rev 11411)
+++ DART/branches/model_mod_changes/models/bgrid_solo/work/mkmf_wakeup_filter	2017-03-29 22:26:55 UTC (rev 11412)
@@ -1,64 +0,0 @@
-#!/bin/csh
-#
-# DART software - Copyright UCAR. This open source software is provided
-# by UCAR, "as is", without charge, subject to all terms of use at
-# http://www.image.ucar.edu/DAReS/DART/DART_download
-#
-# DART $Id$
-#
-# usage: mkmf_wakeup_filter [ -mpi | -nompi ]
-#
-# without any args, builds wakeup_filter without mpi libraries, and it will run
-# as a normal executable. if -mpi is given, it will be compiled with the mpi
-# libraries and can run with multiple cooperating processes.
-
-if ( $#argv > 0 ) then
-  if ("$argv[1]" == "-mpi") then
-    setenv usingmpi 1
-  else if ("$argv[1]" == "-nompi") then
-    setenv usingmpi 0
-  else
-    echo "Unrecognized argument to mkmf_wakeup_filter: $argv[1]"
-    echo "Usage: mkmf_wakeup_filter [ -mpi | -nompi ]"
-    echo " default is to generate a Makefile without MPI support."
-    exit -1
-  endif
-else
-  setenv usingmpi 0
-endif
-
-
-# make a backup copy of the path_names file, and then use
-# sed to make sure it includes either the non-mpi subroutines,
-# or the subroutines which really call mpi.
-cp -f path_names_wakeup_filter path_names_wakeup_filter.back
-
-if ( $usingmpi ) then
-
-  echo "Making Makefile with MPI"
-  touch using_mpi_for_wakeup_filter
-  sed -e 's;/null_mpi_util;/mpi_util;' path_names_wakeup_filter.back >! path_names_wakeup_filter
-  setenv wrapper_arg -w
-
-else
-
-  echo "Making Makefile without MPI"
-  rm -f using_mpi_for_wakeup_filter
-  sed -e 's;/mpi_util;/null_mpi_util;' path_names_wakeup_filter.back >! path_names_wakeup_filter
-  setenv wrapper_arg ""
-
-endif
-
-# remove temp file and now really call mkmf to generate makefile
-rm -f path_names_wakeup_filter.back
-
-../../../build_templates/mkmf -p wakeup_filter -t ../../../build_templates/mkmf.template -c"-Duse_netCDF" \
-        -a "../../.." ${wrapper_arg} path_names_wakeup_filter
-
-exit $status
-
-# <next few lines under version control, do not edit>
-# $URL$
-# $Revision$
-# $Date$
-

Modified: DART/branches/model_mod_changes/models/bgrid_solo/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/model_mod_changes/models/bgrid_solo/work/path_names_create_fixed_network_seq	2017-03-29 21:48:14 UTC (rev 11411)
+++ DART/branches/model_mod_changes/models/bgrid_solo/work/path_names_create_fixed_network_seq	2017-03-29 22:26:55 UTC (rev 11412)
@@ -1,5 +1,6 @@
 assimilation_code/location/threed_sphere/location_mod.f90
 assimilation_code/location/utilities/default_location_mod.f90
+assimilation_code/location/utilities/location_io_mod.f90
 assimilation_code/modules/assimilation/adaptive_inflate_mod.f90
 assimilation_code/modules/assimilation/assim_model_mod.f90
 assimilation_code/modules/io/dart_time_io_mod.f90
@@ -12,7 +13,6 @@
 assimilation_code/modules/observations/obs_sequence_mod.f90
 assimilation_code/modules/utilities/distributed_state_mod.f90
 assimilation_code/modules/utilities/ensemble_manager_mod.f90
-assimilation_code/modules/utilities/location_io_mod.f90
 assimilation_code/modules/utilities/netcdf_utilities_mod.f90
 assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
 assimilation_code/modules/utilities/null_win_mod.f90

Modified: DART/branches/model_mod_changes/models/bgrid_solo/work/path_names_create_obs_sequence
===================================================================
--- DART/branches/model_mod_changes/models/bgrid_solo/work/path_names_create_obs_sequence	2017-03-29 21:48:14 UTC (rev 11411)
+++ DART/branches/model_mod_changes/models/bgrid_solo/work/path_names_create_obs_sequence	2017-03-29 22:26:55 UTC (rev 11412)
@@ -1,4 +1,6 @@
 assimilation_code/location/threed_sphere/location_mod.f90
+assimilation_code/location/utilities/default_location_mod.f90
+assimilation_code/location/utilities/location_io_mod.f90
 assimilation_code/modules/assimilation/adaptive_inflate_mod.f90
 assimilation_code/modules/assimilation/assim_model_mod.f90
 assimilation_code/modules/assimilation/cov_cutoff_mod.f90