[Dart-dev] DART/branches Revision: 12037

[dart at ucar.edu]

hendric at ucar.edu
2017-11-03 11:20:51 -0600 (Fri, 03 Nov 2017)
145
moving as many nc_check use statements from utilities mod
to use netcdf utilities.  cleaned up read routine and
got model_mod_check to compile.




Modified: DART/branches/recam/assimilation_code/modules/io/direct_netcdf_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/io/direct_netcdf_mod.f90	2017-11-03 17:10:16 UTC (rev 12036)
+++ DART/branches/recam/assimilation_code/modules/io/direct_netcdf_mod.f90	2017-11-03 17:20:51 UTC (rev 12037)
@@ -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/recam/assimilation_code/modules/io/io_filenames_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/io/io_filenames_mod.f90	2017-11-03 17:10:16 UTC (rev 12036)
+++ DART/branches/recam/assimilation_code/modules/io/io_filenames_mod.f90	2017-11-03 17:20:51 UTC (rev 12037)
@@ -35,7 +35,7 @@
 
 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, &
+                                 open_file, close_file, find_textfile_dims, &
                                  do_output
 use time_manager_mod,     only : time_type
 use mpi_utilities_mod,    only : my_task_id
@@ -45,6 +45,7 @@
                                  get_FillValue, get_xtype, get_add_offset, get_scale_factor, &
                                  get_has_missing_value, do_io_update
 use ensemble_manager_mod, only : ensemble_type
+use netcdf_utilities_mod, only : nc_check
 
 use netcdf
 

Modified: DART/branches/recam/assimilation_code/modules/io/state_vector_io_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/io/state_vector_io_mod.f90	2017-11-03 17:10:16 UTC (rev 12036)
+++ DART/branches/recam/assimilation_code/modules/io/state_vector_io_mod.f90	2017-11-03 17:20:51 UTC (rev 12037)
@@ -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/recam/assimilation_code/programs/model_mod_check/model_mod_check.f90
===================================================================
--- DART/branches/recam/assimilation_code/programs/model_mod_check/model_mod_check.f90	2017-11-03 17:10:16 UTC (rev 12036)
+++ DART/branches/recam/assimilation_code/programs/model_mod_check/model_mod_check.f90	2017-11-03 17:20:51 UTC (rev 12037)
@@ -17,8 +17,10 @@
 use         utilities_mod, only : register_module, error_handler, E_MSG, E_ERR, &
                                   initialize_utilities, finalize_utilities,     &
                                   find_namelist_in_file, check_namelist_read,   &
-                                  nc_check, E_MSG, open_file, close_file, do_output
+                                  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

Modified: DART/branches/recam/models/cam-fv/new_model_mod.f90
===================================================================
--- DART/branches/recam/models/cam-fv/new_model_mod.f90	2017-11-03 17:10:16 UTC (rev 12036)
+++ DART/branches/recam/models/cam-fv/new_model_mod.f90	2017-11-03 17:20:51 UTC (rev 12037)
@@ -25,7 +25,8 @@
 use  ensemble_manager_mod
 use distributed_state_mod
 use   state_structure_mod
-use  netcdf_utilities_mod,  only : nc_check, nc_get_variable
+use  netcdf_utilities_mod,  only : nc_check, nc_get_variable, nc_get_variable_size!, &
+                                   
 use       location_io_mod
 use     default_model_mod,  only : adv_1step, init_time, init_conditions, &
                                    nc_write_model_vars, pert_model_copies
@@ -611,12 +612,13 @@
 
 if ( .not. module_initialized ) call static_init_model
 
+!>@todo need to put code to write cam model time
+
 if (present(adv_to_time)) then
-   string3 = time_to_string(adv_to_time)
    write(string1,*)'CAM/DART not configured to advance CAM.'
-   write(string2,*)'called with optional advance_to_time of'
+   write(string2,*)'called with optional advance_to_time '
    call error_handler(E_ERR, 'write_model_time', string1, &
-              source, revision, revdate, text2=string2,text3=string3)
+              source, revision, revdate, text2=string2)
 endif