[Dart-dev] DART/branches Revision: 12270

[dart at ucar.edu]

nancy at ucar.edu
2018-01-03 15:54:08 -0700 (Wed, 03 Jan 2018)
174
changes to the netcdf utilities interfaces, plus
some changes caught by the nag compiler.
these are to the recam branch but if they test
ok, might migrate to the rma_trunk.




Modified: DART/branches/recam/models/9var/model_mod.f90
===================================================================
--- DART/branches/recam/models/9var/model_mod.f90	2018-01-03 22:29:16 UTC (rev 12269)
+++ DART/branches/recam/models/9var/model_mod.f90	2018-01-03 22:54:08 UTC (rev 12270)
@@ -16,8 +16,8 @@
                                   nmlfileunit, find_namelist_in_file, check_namelist_read, &
                                   do_nml_file, do_nml_term
 
-use netcdf_utilities_mod,  only : nc_add_global_attribute, &
-                                  nc_add_global_creation_time, nc_redef, nc_enddef
+use netcdf_utilities_mod,  only : nc_add_global_attribute, nc_add_global_creation_time, &
+                                  nc_begin_define_mode, nc_end_define_mode
 
 use location_io_mod,       only : nc_write_location_atts, nc_get_location_varids, &
                                   nc_write_location
@@ -455,8 +455,7 @@
 
 ! Write Global Attributes
 
-call nc_redef(ncid)
-
+call nc_begin_define_mode(ncid)
 call nc_add_global_creation_time(ncid)
 
 call nc_add_global_attribute(ncid, "model_source", source )
@@ -476,7 +475,7 @@
 call nc_add_global_attribute(ncid, "model_c", c )
 
 call nc_write_location_atts(ncid, msize)
-call nc_enddef(ncid)
+call nc_end_define_mode(ncid)
 call nc_write_location(ncid, state_loc, msize)
 
 end subroutine nc_write_model_atts

Modified: DART/branches/recam/models/POP/model_mod.f90
===================================================================
--- DART/branches/recam/models/POP/model_mod.f90	2018-01-03 22:29:16 UTC (rev 12269)
+++ DART/branches/recam/models/POP/model_mod.f90	2018-01-03 22:54:08 UTC (rev 12270)
@@ -25,8 +25,9 @@
                              do_output, to_upper,                              &
                              find_namelist_in_file, check_namelist_read,       &
                              file_exist, find_textfile_dims, file_to_text
-use netcdf_utilities_mod, only : nc_add_global_attribute, nc_check, nc_sync, &
-                                 nc_add_global_creation_time, nc_redef, nc_enddef
+use netcdf_utilities_mod, only : nc_add_global_attribute, nc_check,            &
+                                 nc_synchronize_file, nc_add_global_creation_time, &
+                                 nc_begin_define_mode, nc_end_define_mode
 use     obs_kind_mod, only : QTY_TEMPERATURE, QTY_SALINITY, QTY_DRY_LAND,      &
                              QTY_U_CURRENT_COMPONENT,QTY_V_CURRENT_COMPONENT,  &
                              QTY_SEA_SURFACE_HEIGHT, QTY_SEA_SURFACE_PRESSURE, &
@@ -1904,7 +1905,7 @@
 !-------------------------------------------------------------------------------
 ! Write Global Attributes 
 !-------------------------------------------------------------------------------
-call nc_redef(ncid)
+call nc_begin_define_mode(ncid)
 
 call nc_add_global_creation_time(ncid)
 
@@ -2045,7 +2046,7 @@
 
 ! Finished with dimension/variable definitions, must end 'define' mode to fill.
 
-call nc_enddef(ncid)
+call nc_end_define_mode(ncid)
 
 !----------------------------------------------------------------------------
 ! Fill the coordinate variables
@@ -2071,7 +2072,7 @@
 !-------------------------------------------------------------------------------
 ! Flush the buffer and leave netCDF file open
 !-------------------------------------------------------------------------------
-call nc_sync(ncid)
+call nc_synchronize_file(ncid)
 
 end subroutine nc_write_model_atts
 

Modified: DART/branches/recam/models/ROMS/model_mod.f90
===================================================================
--- DART/branches/recam/models/ROMS/model_mod.f90	2018-01-03 22:29:16 UTC (rev 12269)
+++ DART/branches/recam/models/ROMS/model_mod.f90	2018-01-03 22:54:08 UTC (rev 12270)
@@ -86,8 +86,9 @@
                                   get_long_name, get_xtype, get_has_missing_value, &
                                   get_dim_lengths
 
-use netcdf_utilities_mod, only : nc_add_global_attribute, nc_sync, nc_check, &
-                                 nc_add_global_creation_time, nc_redef, nc_enddef
+use netcdf_utilities_mod, only : nc_add_global_attribute, nc_synchronize_file, nc_check, &
+                                 nc_add_global_creation_time, nc_begin_define_mode, &
+                                 nc_end_define_mode
 
 use location_io_mod,      only :  nc_write_location_atts, nc_get_location_varids, &
                                   nc_write_location
@@ -147,14 +148,6 @@
 integer  :: debug = 0   ! turn up for more and more debug messages
 character(len=256) :: roms_filename = 'roms_input.nc'
 
-namelist /model_nml/  &
-   assimilation_period_days,    &