[Dart-dev] DART/branches Revision: 12035

[dart at ucar.edu]

hendric at ucar.edu
2017-11-03 11:00:18 -0600 (Fri, 03 Nov 2017)
93
moving nc_check calls to use the netcdf module and started
working on reading time routine.




Modified: DART/branches/recam/assimilation_code/modules/assimilation/sampling_error_correction_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/assimilation/sampling_error_correction_mod.f90	2017-11-03 16:08:23 UTC (rev 12034)
+++ DART/branches/recam/assimilation_code/modules/assimilation/sampling_error_correction_mod.f90	2017-11-03 17:00:18 UTC (rev 12035)
@@ -15,8 +15,9 @@
 
 module sampling_error_correction_mod
 
-use types_mod,      only : r8
-use utilities_mod,  only : error_handler, E_ERR, nc_check
+use types_mod,           only : r8
+use utilities_mod,       only : error_handler, E_ERR
+use netcdf_utilities_mod, only : nc_check
 
 use netcdf
 

Modified: DART/branches/recam/assimilation_code/modules/io/dart_time_io_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/io/dart_time_io_mod.f90	2017-11-03 16:08:23 UTC (rev 12034)
+++ DART/branches/recam/assimilation_code/modules/io/dart_time_io_mod.f90	2017-11-03 17:00:18 UTC (rev 12035)
@@ -12,13 +12,13 @@
 !>@todo should this go in state_vector_io_mod or io_filename_mod?
 !> @{
 
-use types_mod,        only : r8, digits12
-use time_manager_mod, only : time_type, set_time, get_time, print_time, &
-                             set_calendar_type, set_date, get_calendar_string, &
-                             operator(+)
+use types_mod,            only : r8, digits12
+use time_manager_mod,     only : time_type, set_time, get_time, print_time, &
+                                 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/recam/assimilation_code/modules/io/state_structure_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/io/state_structure_mod.f90	2017-11-03 16:08:23 UTC (rev 12034)
+++ DART/branches/recam/assimilation_code/modules/io/state_structure_mod.f90	2017-11-03 17:00:18 UTC (rev 12035)
@@ -59,7 +59,7 @@
 !> 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  obs_kind_mod, only : get_name_for_quantity, get_index_for_quantity
 
@@ -66,6 +66,8 @@
 use     types_mod, only : r8, r4, i8, digits12, MISSING_R8, MISSING_R4, MISSING_I, &
                           obstypelength, MAX_NUM_DOMS
 
+use netcdf_utilities_mod, only : nc_check
+
 use      sort_mod, only : index_sort
 
 use netcdf

Modified: DART/branches/recam/assimilation_code/modules/utilities/obs_impact_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/utilities/obs_impact_mod.f90	2017-11-03 16:08:23 UTC (rev 12034)
+++ DART/branches/recam/assimilation_code/modules/utilities/obs_impact_mod.f90	2017-11-03 17:00:18 UTC (rev 12035)
@@ -16,7 +16,7 @@
 
 use      types_mod, only : r8, obstypelength, missing_r8
 use  utilities_mod, only : register_module, error_handler, E_ERR, E_MSG,       &
-                           open_file, close_file, nc_check, get_next_filename, &
+                           open_file, close_file, get_next_filename, &
                            find_namelist_in_file, check_namelist_read,         &
                            do_nml_file, do_nml_term, nmlfileunit, to_upper
 use  obs_kind_mod        ! all qtys/types, so impossible to enumerate them here

Modified: DART/branches/recam/assimilation_code/modules/utilities/utilities_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/utilities/utilities_mod.f90	2017-11-03 16:08:23 UTC (rev 12034)
+++ DART/branches/recam/assimilation_code/modules/utilities/utilities_mod.f90	2017-11-03 17:00:18 UTC (rev 12035)
@@ -147,7 +147,7 @@
 ! module local data
 
 integer, parameter :: E_DBG = -2,   E_MSG = -1,  E_ALLMSG = 0, E_WARN = 1, E_ERR = 2
-integer, parameter :: DEBUG = -1, MESSAGE = 0, WARNING = 1, FATAL = 2
+!integer, parameter :: DEBUG = -1, MESSAGE = 0, WARNING = 1, FATAL = 2
 integer, parameter :: NML_NONE = 0, NML_FILE = 1, NML_TERMINAL = 2, NML_BOTH = 3
 
 real(r8), parameter :: TWOPI = PI * 2.0_r8
@@ -169,7 +169,6 @@
           error_handler, &
           to_upper, &
           squeeze_out_blanks, &
-          nc_check, &
           next_file, &
           logfileunit, &
           nmlfileunit, &
@@ -191,10 +190,6 @@