[Dart-dev] DART/branches Revision: 12227

[dart at ucar.edu]

nancy at ucar.edu
2017-12-19 16:37:29 -0700 (Tue, 19 Dec 2017)
161
call initialize_utilities() and finalize_utilities()
to avoid a recursive call in the utils module.

merged in from the rma_trunk where i first fixed
this bug.




Index: DART/branches/recam/developer_tests/location
===================================================================
--- DART/branches/recam/developer_tests/location	2017-12-19 23:11:58 UTC (rev 12226)
+++ DART/branches/recam/developer_tests/location	2017-12-19 23:37:29 UTC (rev 12227)

Property changes on: DART/branches/recam/developer_tests/location
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,51 ##
+/DART/branches/CM1/developer_tests/location:8569-10316
+/DART/branches/bgrid_sprint/developer_tests/location:8188-8237
+/DART/branches/bgrid_sprint_state_reorder/developer_tests/location:8208-8250
+/DART/branches/development/developer_tests/location:4674-6249
+/DART/branches/gitm/developer_tests/location:5137-6209
+/DART/branches/gitm_lanai/developer_tests/location:6565-6646
+/DART/branches/helen/developer_tests/location:5989-6155
+/DART/branches/model_mod_changes/developer_tests/location:11403-11604
+/DART/branches/rma_array_nml/developer_tests/location:11814-11839
+/DART/branches/rma_cam_fv/developer_tests/location:9552-9728
+/DART/branches/rma_cf_conventions/developer_tests/location:9727-10086
+/DART/branches/rma_cice/developer_tests/location:10649-10852
+/DART/branches/rma_clm/developer_tests/location:8905-9126
+/DART/branches/rma_diag/developer_tests/location:9623-9737
+/DART/branches/rma_fix_clm_restarts/developer_tests/location:9634-11919
+/DART/branches/rma_fixed_filenames/developer_tests/location:10702-10895
+/DART/branches/rma_kinds_to_state_structure/developer_tests/location:8952-9431
+/DART/branches/rma_kinds_to_state_strucutre/developer_tests/location:8903-8951
+/DART/branches/rma_mmc/developer_tests/location:11725-11731,11735-11751
+/DART/branches/rma_model_mod_check/developer_tests/location:8959-9172
+/DART/branches/rma_mpas_fold_mean_fwd/developer_tests/location:9342-9452
+/DART/branches/rma_mpas_get_state_meta_data/developer_tests/location:8865-8884
+/DART/branches/rma_obs_defs/developer_tests/location:8917-9061
+/DART/branches/rma_output_files/developer_tests/location:11441-11538
+/DART/branches/rma_par_msg/developer_tests/location:9466-9505
+/DART/branches/rma_par_single_file/developer_tests/location:11679-11731,11735-11773
+/DART/branches/rma_pop_variable_namelist/developer_tests/location:8818-9150
+/DART/branches/rma_qc_fwd_op/developer_tests/location:9644-9717
+/DART/branches/rma_refac_io/developer_tests/location:9117-9540
+/DART/branches/rma_remove_groups_from_transpose/developer_tests/location:9321-9449
+/DART/branches/rma_roms/developer_tests/location:10151-10375
+/DART/branches/rma_set_filenames/developer_tests/location:8379-8385
+/DART/branches/rma_single_file/developer_tests/location:10898-11107
+/DART/branches/rma_sprint/developer_tests/location:8095-8166
+/DART/branches/rma_state_structure_test_dir/developer_tests/location:9472-9676
+/DART/branches/rma_state_structure_unit_test/developer_tests/location:9691-10268
+/DART/branches/rma_trunk/developer_tests/location:12028-12226
+/DART/branches/rma_trunk_clamping/developer_tests/location:8786-8801
+/DART/branches/rma_trunk_filename/developer_tests/location:8011-8157
+/DART/branches/rma_trunk_get_state_fun/developer_tests/location:8568-8596
+/DART/branches/rma_trunk_mean_ens/developer_tests/location:8516-8528
+/DART/branches/rma_trunk_mmc_fix/developer_tests/location:9320-9337
+/DART/branches/rma_trunk_mpi_get_in_utils/developer_tests/location:8561-8817
+/DART/branches/rma_trunk_pathnames/developer_tests/location:8015-8028
+/DART/branches/rma_trunk_posterior/developer_tests/location:9768-9781
+/DART/branches/rma_trunk_read_transpose/developer_tests/location:9208-9250
+/DART/branches/rma_trunk_vert_loc/developer_tests/location:8532-8537
+/DART/branches/rma_types_kinds/developer_tests/location:11202-11236
+/DART/branches/rma_updates_nancy/developer_tests/location:11615-11676
+/DART/branches/trunk_with_cam_style/developer_tests/location:9467-9534
+/DART/trunk/developer_tests/location:6306-9550
\ No newline at end of property
Modified: DART/branches/recam/developer_tests/location/location_test.f90
===================================================================
--- DART/branches/recam/developer_tests/location/location_test.f90	2017-12-19 23:11:58 UTC (rev 12226)
+++ DART/branches/recam/developer_tests/location/location_test.f90	2017-12-19 23:37:29 UTC (rev 12227)
@@ -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/recam/developer_tests/location/location_test2.f90
===================================================================
--- DART/branches/recam/developer_tests/location/location_test2.f90	2017-12-19 23:11:58 UTC (rev 12226)
+++ DART/branches/recam/developer_tests/location/location_test2.f90	2017-12-19 23:37:29 UTC (rev 12227)
@@ -10,7 +10,8 @@
 
 use location_mod