[Dart-dev] DART/branches Revision: 12260

[dart at ucar.edu]

nancy at ucar.edu
2018-01-03 13:10:52 -0700 (Wed, 03 Jan 2018)
147
updates from NAG compiler tests, and some development done while
fixing problems.  enhanced calls to netcdf utils from the test interp
routines.





Modified: DART/branches/recam/assimilation_code/modules/assimilation/assim_tools_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/assimilation/assim_tools_mod.f90	2018-01-03 18:59:10 UTC (rev 12259)
+++ DART/branches/recam/assimilation_code/modules/assimilation/assim_tools_mod.f90	2018-01-03 20:10:52 UTC (rev 12260)
@@ -392,8 +392,6 @@
 real(r8) :: vertvalue_obs_in_localization_coord
 integer  :: whichvert_obs_in_localization_coord
 real(r8) :: whichvert_real
-type(location_type) :: lc(1)
-integer             :: kd(1)
 
 ! timing - set one or both of the parameters to true
 ! to get timing info printed out.
@@ -494,7 +492,7 @@
 ! HK I would like to move this to before the calculation of the forward operator so you could
 ! overwrite the vertical location with the required localization vertical coordinate when you 
 ! do the forward operator calculation
-call get_my_obs_loc(ens_handle, obs_ens_handle, obs_seq, keys, my_obs_loc, my_obs_kind, my_obs_type, obs_time)
+call get_my_obs_loc(obs_ens_handle, obs_seq, keys, my_obs_loc, my_obs_kind, my_obs_type, obs_time)
 
 if (convert_all_obs_verticals_first .and. is_doing_vertical_conversion) then
    ! convert the vertical of all my observations to the localization coordinate
@@ -1907,8 +1905,8 @@
 
 ! Uses interpolation to get correction factor into the table
 
-integer             :: iunit, i, low_indx, high_indx
-real(r8)            :: temp, temp2, correl, fract, low_correl, low_exp_correl, low_alpha
+integer             :: low_indx, high_indx
+real(r8)            :: correl, fract, low_correl, low_exp_correl, low_alpha
 real(r8)            :: high_correl, high_exp_correl, high_alpha
 
 logical, save :: first_time = .true.
@@ -2793,9 +2791,8 @@
 
 !----------------------------------------------------------------------
 !> gets the location of of all my observations
-subroutine get_my_obs_loc(state_ens_handle, obs_ens_handle, obs_seq, keys, my_obs_loc, my_obs_kind, my_obs_type, my_obs_time)
+subroutine get_my_obs_loc(obs_ens_handle, obs_seq, keys, my_obs_loc, my_obs_kind, my_obs_type, my_obs_time)
 
-type(ensemble_type),      intent(in)  :: state_ens_handle
 type(ensemble_type),      intent(in)  :: obs_ens_handle
 type(obs_sequence_type),  intent(in)  :: obs_seq
 integer,                  intent(in)  :: keys(:)

Modified: DART/branches/recam/assimilation_code/modules/utilities/fixsystem
===================================================================
--- DART/branches/recam/assimilation_code/modules/utilities/fixsystem	2018-01-03 18:59:10 UTC (rev 12259)
+++ DART/branches/recam/assimilation_code/modules/utilities/fixsystem	2018-01-03 20:10:52 UTC (rev 12260)
@@ -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/recam/assimilation_code/programs/model_mod_check/model_mod_check.f90
===================================================================
--- DART/branches/recam/assimilation_code/programs/model_mod_check/model_mod_check.f90	2018-01-03 18:59:10 UTC (rev 12259)
+++ DART/branches/recam/assimilation_code/programs/model_mod_check/model_mod_check.f90	2018-01-03 20:10:52 UTC (rev 12260)
@@ -15,23 +15,20 @@
 use             types_mod, only : r8, i8, missing_r8, metadatalength, MAX_NUM_DOMS
 
 use         utilities_mod, only : register_module, error_handler, E_MSG, E_ERR, &
-                                  initialize_utilities, finalize_utilities,     &
                                   find_namelist_in_file, check_namelist_read,   &
                                   E_MSG, open_file, close_file, do_output
 
-use  netcdf_utilities_mod, only : nc_check
-
 use     mpi_utilities_mod, only : initialize_mpi_utilities, finalize_mpi_utilities
 
 use          location_mod, only : location_type, write_location
 
-use          obs_kind_mod, only : get_index_for_quantity, get_name_for_quantity
+use          obs_kind_mod, only : get_name_for_quantity
 
 use      obs_sequence_mod, only : static_init_obs_sequence
 
 use       assim_model_mod, only : static_init_assim_model
 
-use      time_manager_mod, only : time_type, set_time, print_time, print_date, operator(-), &
+use      time_manager_mod, only : time_type, print_time, print_date, operator(-), &
                                   get_calendar_type, NO_CALENDAR
 
 use  ensemble_manager_mod, only : init_ensemble_manager, ensemble_type
@@ -38,20 +35,21 @@
 
 use   state_vector_io_mod, only : state_vector_io_init, read_state, write_state
 
-use   state_structure_mod, only : get_num_domains, get_model_variable_indices
+use   state_structure_mod, only : get_num_domains, get_model_variable_indices, &
+                                  state_structure_info
 
 use      io_filenames_mod, only : io_filenames_init, file_info_type,       &
                                   stage_metadata_type, get_stage_metadata, &
-                                  get_restart_filename,                    &
-                                  set_file_metadata, file_info_dump,       &