[Dart-dev] [4624] DART/trunk/models/MITgcm_ocean: Using the newly-renamed ' hf_radial_vel' routine convention.

[nancy at ucar.edu]

Revision: 4624
Author:   thoar
Date:     2011-01-04 16:41:33 -0700 (Tue, 04 Jan 2011)
Log Message:
-----------
Using the newly-renamed 'hf_radial_vel' routine convention.
Removing the 'filter_done' reference in runme_filter.
The mpi_utilities_mod should now exit cleanly, removing the
need for a 'filter_done' call.

Modified Paths:
--------------
    DART/trunk/models/MITgcm_ocean/dart_MITocean_mod.f90
    DART/trunk/models/MITgcm_ocean/shell_scripts/runme_filter

-------------- next part --------------
Modified: DART/trunk/models/MITgcm_ocean/dart_MITocean_mod.f90
===================================================================
--- DART/trunk/models/MITgcm_ocean/dart_MITocean_mod.f90	2011-01-04 23:28:01 UTC (rev 4623)
+++ DART/trunk/models/MITgcm_ocean/dart_MITocean_mod.f90	2011-01-04 23:41:33 UTC (rev 4624)
@@ -29,7 +29,7 @@
                              copy_obs, set_copy_meta_data, set_qc_meta_data, set_obs_def, &
                              get_first_obs, get_last_obs, get_obs_def
 use     obs_kind_mod, only : get_obs_kind_index
-use obs_def_ocean_mod, only : set_radial_vel
+use obs_def_ocean_mod, only : set_hf_radial_vel
 
 implicit none
 private
@@ -290,7 +290,7 @@
 if (hfradar) then
    ! this routine increments defkey and stores the private info in
    ! the ocean module until time to write.
-   call set_radial_vel(defkey, id, angle)
+   call set_hf_radial_vel(defkey, id, angle)
    call set_obs_def_key(obsdef0, defkey)
 endif
 

Modified: DART/trunk/models/MITgcm_ocean/shell_scripts/runme_filter
===================================================================
--- DART/trunk/models/MITgcm_ocean/shell_scripts/runme_filter	2011-01-04 23:28:01 UTC (rev 4623)
+++ DART/trunk/models/MITgcm_ocean/shell_scripts/runme_filter	2011-01-04 23:41:33 UTC (rev 4624)
@@ -117,7 +117,7 @@
       # this starts filter but also returns control back to
       # this script immediately.
 
-      (setenv HOME $filterhome; mpirun.lsf ./filter || mpirun.lsf ./filter_done ) &
+      (setenv HOME $filterhome; mpirun.lsf ./filter) &
 
       while ( -e filter_to_model.lock )