[Dart-dev] DART/branches Revision: 12426

[dart at ucar.edu]

nancy at ucar.edu
2018-03-06 15:17:08 -0700 (Tue, 06 Mar 2018)
198
update the interfaces in the netcdf_utilities_mod and then
make all the model_mods match.  also more aggressive changes
in the POP model_mod to use the new routines and consolidate
identical code.




Modified: DART/branches/rma_netcdf_utils/assimilation_code/modules/utilities/netcdf_utilities_mod.f90
===================================================================
--- DART/branches/rma_netcdf_utils/assimilation_code/modules/utilities/netcdf_utilities_mod.f90	2018-03-06 17:53:49 UTC (rev 12425)
+++ DART/branches/rma_netcdf_utils/assimilation_code/modules/utilities/netcdf_utilities_mod.f90	2018-03-06 22:17:08 UTC (rev 12426)
@@ -31,19 +31,33 @@
 implicit none
 private
 
-public :: nc_check,                     &
-          nc_add_global_attribute,      &
-          nc_add_attribute_to_variable, &
-          nc_define_dimension,          &
-          nc_define_integer_variable,   &
-          nc_define_real_variable,      &
-          nc_define_double_variable,    &
-          nc_put_variable,              &
-          nc_get_variable,              &
-          nc_add_global_creation_time,  &
-          nc_redef,                     &
-          nc_enddef,                    &
-          nc_sync
+public :: nc_check,                       &
+          nc_add_global_attribute,        &
+          nc_get_global_attribute,        &
+          nc_add_attribute_to_variable,   &
+          nc_get_attribute_from_variable, &
+          nc_define_dimension,            &
+          nc_define_integer_variable,     &
+          nc_define_real_variable,        &
+          nc_define_double_variable,      &
+          nc_define_integer_scalar,       &
+          nc_define_real_scalar,          &
+          nc_define_double_scalar,        &
+          nc_global_attribute_exists,     &
+          nc_dimension_exists,            &
+          nc_variable_exists,             &
+          nc_put_variable,                &
+          nc_get_variable,                &
+          nc_add_global_creation_time,    &
+          nc_get_variable_num_dimensions, &
+          nc_get_variable_size,           &
+          nc_open_file_readonly,          &
+          nc_open_file_readwrite,         &
+          nc_create_file,                 &
+          nc_close_file,                  &
+          nc_begin_define_mode,           &
+          nc_end_define_mode,             &
+          nc_synchronize_file
 
 
 interface nc_add_global_attribute
@@ -53,6 +67,13 @@
    module procedure nc_add_global_real_array_att
 end interface
 
+interface nc_get_global_attribute
+   module procedure nc_get_global_char_att
+   module procedure nc_get_global_int_att
+   module procedure nc_get_global_real_att
+   module procedure nc_get_global_real_array_att
+end interface
+
 interface nc_add_attribute_to_variable
    module procedure nc_add_char_att_to_var
    module procedure nc_add_int_array_att_to_var
@@ -61,6 +82,14 @@
    module procedure nc_add_real_array_att_to_var
 end interface
 
+interface nc_get_attribute_from_variable
+   module procedure nc_get_char_att_from_var
+   module procedure nc_get_int_array_att_from_var
+   module procedure nc_get_int_att_from_var
+   module procedure nc_get_real_att_from_var
+   module procedure nc_get_real_array_att_from_var
+end interface
+
 interface nc_define_integer_variable
    module procedure nc_define_var_int_1d
    module procedure nc_define_var_int_Nd
@@ -87,10 +116,10 @@
    module procedure nc_put_real_3d
 end interface
 
-!>@todo FIXME do we need single value versions
-!> of these as well?
 interface nc_get_variable
+   module procedure nc_get_single_int_1d
    module procedure nc_get_int_1d
+   module procedure nc_get_single_real_1d
    module procedure nc_get_real_1d
    module procedure nc_get_int_2d
    module procedure nc_get_real_2d
@@ -98,6 +127,11 @@
    module procedure nc_get_real_3d
 end interface
 
+interface nc_get_variable_size
+   module procedure nc_get_variable_size_1d
+   module procedure nc_get_variable_size_Nd
+end interface