[Dart-dev] DART/branches Revision: 12254

[dart at ucar.edu]

thoar at ucar.edu
2018-01-02 09:39:23 -0700 (Tue, 02 Jan 2018)
59
Updating to be consistent with the HEAD of the rma_trunk.




Index: DART/branches/mmc
===================================================================
--- DART/branches/mmc	2017-12-29 22:32:10 UTC (rev 12253)
+++ DART/branches/mmc	2018-01-02 16:39:23 UTC (rev 12254)

Property changes on: DART/branches/mmc
___________________________________________________________________
Modified: svn:mergeinfo
## -34,7 +34,7 ##
 /DART/branches/rma_sprint:8095-8166
 /DART/branches/rma_state_structure_test_dir:9472-9676
 /DART/branches/rma_state_structure_unit_test:9691-10268
-/DART/branches/rma_trunk:12038-12206
+/DART/branches/rma_trunk:12038-12253
 /DART/branches/rma_trunk_clamping:8786-8801
 /DART/branches/rma_trunk_filename:8011-8157
 /DART/branches/rma_trunk_get_state_fun:8568-8596
Modified: DART/branches/mmc/assimilation_code/modules/utilities/fixsystem
===================================================================
--- DART/branches/mmc/assimilation_code/modules/utilities/fixsystem	2017-12-29 22:32:10 UTC (rev 12253)
+++ DART/branches/mmc/assimilation_code/modules/utilities/fixsystem	2018-01-02 16:39:23 UTC (rev 12254)
@@ -73,7 +73,7 @@
       echo "  or   $0 pgf90 "
       echo "  etc."
       exit 1
-    elif [ "$1" = gfortran ]; then
+    elif ([ "$1" = gfortran ] || [ "$1" = nagfor ]); then
       export todo=out
     else
       export todo=in

Modified: DART/branches/mmc/developer_tests/location/location_test.f90
===================================================================
--- DART/branches/mmc/developer_tests/location/location_test.f90	2017-12-29 22:32:10 UTC (rev 12253)
+++ DART/branches/mmc/developer_tests/location/location_test.f90	2018-01-02 16:39:23 UTC (rev 12254)
@@ -9,7 +9,8 @@
 ! Simple test program to exercise annulus location module.
 
 use     types_mod, only : r8
-use utilities_mod, only : open_file, close_file
+use utilities_mod, only : open_file, close_file, initialize_utilities, &
+                          finalize_utilities
 use  location_mod
 
 implicit none
@@ -25,6 +26,8 @@
 real(r8)            :: loc2_val, lon, lat
 character(len=102)  :: testbuf
 
+call initialize_utilities('location_test')
+
 print *, ''
 print *, 'reading in 6 locations to use in distance tests:'
 do i = 1, 6
@@ -169,6 +172,8 @@
 call close_file(iunit1)
 call close_file(iunit2)
 
+call finalize_utilities()
+
 end program location_test
 
 ! <next few lines under version control, do not edit>

Modified: DART/branches/mmc/developer_tests/location/location_test2.f90
===================================================================
--- DART/branches/mmc/developer_tests/location/location_test2.f90	2017-12-29 22:32:10 UTC (rev 12253)
+++ DART/branches/mmc/developer_tests/location/location_test2.f90	2018-01-02 16:39:23 UTC (rev 12254)
@@ -10,7 +10,8 @@
 
 use location_mod
 use types_mod,     only : r8
-use utilities_mod, only : get_unit, error_handler, E_ERR
+use utilities_mod, only : get_unit, error_handler, E_ERR, &
+                          initialize_utilities, finalize_utilities
 
 implicit none
 
@@ -24,6 +25,8 @@
 integer  :: iunit, i
 real(r8) :: loc2_val
 
+call initialize_utilities('location_test2')
+
 ! Open an output file
 iunit = get_unit()
 open(iunit, file = 'location_test_file')
@@ -56,6 +59,8 @@
 
 close(iunit)
 
+call finalize_utilities()
+
 end program location_test2
 
 ! <next few lines under version control, do not edit>

Modified: DART/branches/mmc/developer_tests/location/location_test3.f90
===================================================================
--- DART/branches/mmc/developer_tests/location/location_test3.f90	2017-12-29 22:32:10 UTC (rev 12253)
+++ DART/branches/mmc/developer_tests/location/location_test3.f90	2018-01-02 16:39:23 UTC (rev 12254)