[Dart-dev] DART/branches Revision: 12516
dart at ucar.edu
dart at ucar.edu
Fri Apr 13 09:40:46 MDT 2018
nancy at ucar.edu
2018-04-13 09:40:43 -0600 (Fri, 13 Apr 2018)
671
hopefully the rest of the updates to the all_nsc_changes branch.
(trying to consolidate all my local changes into one location)
updated utilities module: separated out sections by function,
removed unused or redundant code, tried to clean up repeated code
sections to make it easier to maintain and change.
updated modules to use nc_check from netcdf utils instead of utils.
removed jeff_netcdf from L96 because it seems to be reading a diag format
that no longer exists.
changed the formatting slightly for assim/eval/ext FO so it's more
consistent on stdout and in the log.
fixed a merge conflict that i missed when reconciling the
wrf/model_mod.f90 last time.
Modified: DART/branches/all_nsc_changes/assimilation_code/modules/assimilation/sampling_error_correction_mod.f90
===================================================================
--- DART/branches/all_nsc_changes/assimilation_code/modules/assimilation/sampling_error_correction_mod.f90 2018-04-13 15:23:31 UTC (rev 12515)
+++ DART/branches/all_nsc_changes/assimilation_code/modules/assimilation/sampling_error_correction_mod.f90 2018-04-13 15:40:43 UTC (rev 12516)
@@ -16,7 +16,8 @@
module sampling_error_correction_mod
use types_mod, only : r8
-use utilities_mod, only : error_handler, E_ERR, nc_check
+use utilities_mod, only : error_handler, E_ERR
+use netcdf_utilities_mod, only : nc_check
use netcdf
Modified: DART/branches/all_nsc_changes/assimilation_code/modules/io/dart_time_io_mod.f90
===================================================================
--- DART/branches/all_nsc_changes/assimilation_code/modules/io/dart_time_io_mod.f90 2018-04-13 15:23:31 UTC (rev 12515)
+++ DART/branches/all_nsc_changes/assimilation_code/modules/io/dart_time_io_mod.f90 2018-04-13 15:40:43 UTC (rev 12516)
@@ -17,8 +17,10 @@
set_calendar_type, set_date, get_calendar_string, &
operator(+)
-use utilities_mod, only : nc_check, E_MSG, E_ERR, error_handler, to_upper
+use utilities_mod, only : E_MSG, E_ERR, error_handler, to_upper
+use netcdf_utilities_mod, only : nc_check
+
use typeSizes
use netcdf
Modified: DART/branches/all_nsc_changes/assimilation_code/modules/io/direct_netcdf_mod.f90
===================================================================
--- DART/branches/all_nsc_changes/assimilation_code/modules/io/direct_netcdf_mod.f90 2018-04-13 15:23:31 UTC (rev 12515)
+++ DART/branches/all_nsc_changes/assimilation_code/modules/io/direct_netcdf_mod.f90 2018-04-13 15:40:43 UTC (rev 12516)
@@ -70,10 +70,12 @@
operator(-), operator(/), operator(*), &
operator(==), operator(/=)
-use utilities_mod, only : error_handler, nc_check, file_to_text, &
+use utilities_mod, only : error_handler, file_to_text, &
find_textfile_dims, file_exist, &
E_MSG, E_ALLMSG, E_ERR, E_DBG, E_WARN
+use netcdf_utilities_mod, only : nc_check
+
use mpi_utilities_mod, only : task_count, send_to, receive_from, my_task_id, &
broadcast_flag
Modified: DART/branches/all_nsc_changes/assimilation_code/modules/io/io_filenames_mod.f90
===================================================================
--- DART/branches/all_nsc_changes/assimilation_code/modules/io/io_filenames_mod.f90 2018-04-13 15:23:31 UTC (rev 12515)
+++ DART/branches/all_nsc_changes/assimilation_code/modules/io/io_filenames_mod.f90 2018-04-13 15:40:43 UTC (rev 12516)
@@ -34,9 +34,9 @@
!> @{
use types_mod, only : r4, r8, MISSING_R8, MAX_NUM_DOMS, digits12
-use utilities_mod, only : file_exist, E_ERR, E_MSG, E_WARN, error_handler,&
- nc_check, open_file, close_file, find_textfile_dims, &
- do_output
+use utilities_mod, only : file_exist, E_ERR, E_MSG, E_WARN, error_handler, &
+ open_file, close_file, find_textfile_dims, do_output
+use netcdf_utilities_mod, only : nc_check
use time_manager_mod, only : time_type
use mpi_utilities_mod, only : my_task_id
use state_structure_mod, only : get_num_domains, get_dim_length, get_dim_name, &
Modified: DART/branches/all_nsc_changes/assimilation_code/modules/io/state_structure_mod.f90
===================================================================
--- DART/branches/all_nsc_changes/assimilation_code/modules/io/state_structure_mod.f90 2018-04-13 15:23:31 UTC (rev 12515)
+++ DART/branches/all_nsc_changes/assimilation_code/modules/io/state_structure_mod.f90 2018-04-13 15:40:43 UTC (rev 12516)
@@ -59,8 +59,10 @@
!> variables after reading from a netcdf file. There may be calculations in model_mod
!> that are assuming a transformed order which no longer exists.
-use utilities_mod, only : E_ERR, error_handler, nc_check, do_output
+use utilities_mod, only : E_ERR, error_handler, do_output
+use netcdf_utilities_mod, only : nc_check
+
use obs_kind_mod, only : get_name_for_quantity, get_index_for_quantity
use types_mod, only : r8, r4, i8, digits12, MISSING_R8, MISSING_R4, MISSING_I, &
Modified: DART/branches/all_nsc_changes/assimilation_code/modules/io/state_vector_io_mod.f90
===================================================================
--- DART/branches/all_nsc_changes/assimilation_code/modules/io/state_vector_io_mod.f90 2018-04-13 15:23:31 UTC (rev 12515)
+++ DART/branches/all_nsc_changes/assimilation_code/modules/io/state_vector_io_mod.f90 2018-04-13 15:40:43 UTC (rev 12516)
@@ -51,7 +51,7 @@
all_copies_to_all_vars, all_vars_to_all_copies, &
get_var_owner_index
-use utilities_mod, only : error_handler, nc_check, check_namelist_read, &
+use utilities_mod, only : error_handler, check_namelist_read, &
find_namelist_in_file, nmlfileunit, do_nml_file, &
do_nml_term, register_module, to_upper, E_MSG, E_ERR
Modified: DART/branches/all_nsc_changes/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
More information about the Dart-dev
mailing list