[Dart-dev] DART/branches Revision: 11580

[dart at ucar.edu]

nancy at ucar.edu
2017-05-02 11:37:44 -0600 (Tue, 02 May 2017)
81
updates for revised interfaces and add missing modules
to the path_names files.




Modified: DART/branches/model_mod_changes/developer_tests/location/location_test3.f90
===================================================================
--- DART/branches/model_mod_changes/developer_tests/location/location_test3.f90	2017-05-02 17:17:21 UTC (rev 11579)
+++ DART/branches/model_mod_changes/developer_tests/location/location_test3.f90	2017-05-02 17:37:44 UTC (rev 11580)
@@ -6,7 +6,7 @@
 
 program location_test3
 
-! Simple test program to exercise oned location module.
+! Simple test program to exercise threed_sphere location module.
 
 use location_mod
 use types_mod,      only : r8
@@ -85,8 +85,7 @@
    call write_location(iunit, loc1(i))
 enddo
 
-call get_close_maxdist_init(cc_gc, maxdist)
-call get_close_obs_init(cc_gc, nl, loc1)
+call get_close_init(cc_gc, nl, maxdist, loc1)
 
 call print_get_close_type(cc_gc)
 
@@ -111,7 +110,7 @@
    enddo
  
 
-   call get_close_obs(cc_gc, loc2, 0, loc1, dummy, num_close, close_ind, dist)
+   call get_close_obs(cc_gc, loc2, 0, loc1, dummy, dummy, num_close, close_ind, dist)
    if (num_close > 0) then
       print *, 'num close = ', num_close
       do j=1, min(num_close, nl)

Modified: DART/branches/model_mod_changes/developer_tests/location/testall.csh
===================================================================
--- DART/branches/model_mod_changes/developer_tests/location/testall.csh	2017-05-02 17:17:21 UTC (rev 11579)
+++ DART/branches/model_mod_changes/developer_tests/location/testall.csh	2017-05-02 17:37:44 UTC (rev 11580)
@@ -24,6 +24,7 @@
         $i/test/location_test
 end
 
+
 # and now build afresh and run tests
 foreach i ( $LOCLIST )
 
@@ -37,12 +38,14 @@
  echo
  echo
 
+ set FAILURE = 0
+
  cd $i/test
 
  ./mkmf_location_test
- make
+ make || set FAILURE = 1
  ls -l location_test
- ./location_test  < test.in
+ ./location_test  < test.in || set FAILURE = 1
 
  cd ../..
 
@@ -50,7 +53,13 @@
  echo
  echo "=================================================================="
  echo "=================================================================="
- echo "Tests of location module $i complete at "`date`
+ if ( $FAILURE ) then
+   echo
+   echo "ERROR - unsuccessful build of location module $i at "`date`
+   echo
+ else
+   echo "Tests of location module $i complete at "`date`
+ endif
  echo "=================================================================="
  echo "=================================================================="
  echo

Modified: DART/branches/model_mod_changes/developer_tests/location/threed_cartesian/test/path_names_location_test
===================================================================
--- DART/branches/model_mod_changes/developer_tests/location/threed_cartesian/test/path_names_location_test	2017-05-02 17:17:21 UTC (rev 11579)
+++ DART/branches/model_mod_changes/developer_tests/location/threed_cartesian/test/path_names_location_test	2017-05-02 17:37:44 UTC (rev 11580)
@@ -1,7 +1,11 @@
 assimilation_code/location/threed_cartesian/location_mod.f90
+assimilation_code/location/utilities/default_location_mod.f90
 assimilation_code/modules/observations/obs_kind_mod.f90
+assimilation_code/modules/utilities/ensemble_manager_mod.f90
+assimilation_code/modules/utilities/netcdf_utilities_mod.f90
 assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
 assimilation_code/modules/utilities/random_seq_mod.f90
+assimilation_code/modules/utilities/sort_mod.f90
 assimilation_code/modules/utilities/time_manager_mod.f90
 assimilation_code/modules/utilities/types_mod.f90
 assimilation_code/modules/utilities/utilities_mod.f90

Modified: DART/branches/model_mod_changes/developer_tests/location/threed_cartesian/test/path_names_location_test3
===================================================================
--- DART/branches/model_mod_changes/developer_tests/location/threed_cartesian/test/path_names_location_test3	2017-05-02 17:17:21 UTC (rev 11579)
+++ DART/branches/model_mod_changes/developer_tests/location/threed_cartesian/test/path_names_location_test3	2017-05-02 17:37:44 UTC (rev 11580)
@@ -1,7 +1,12 @@
 assimilation_code/location/threed_cartesian/location_mod.f90