[Dart-dev] DART/branches Revision: 11738

[dart at ucar.edu]

thoar at ucar.edu
2017-06-15 09:42:39 -0600 (Thu, 15 Jun 2017)
285
I made a parameter HDF5_FILE_NAME publically available from the 
coamps_util_mod  that contains the name of the HDF5 file name
that is now used to harvest the grid information.
The file name is   'coamps.hdf5'   one is enough since all nests
have the grid variables in the same file.




Modified: DART/branches/coamps/models/coamps_nest/coamps_domain_mod.f90
===================================================================
--- DART/branches/coamps/models/coamps_nest/coamps_domain_mod.f90	2017-06-15 05:00:01 UTC (rev 11737)
+++ DART/branches/coamps/models/coamps_nest/coamps_domain_mod.f90	2017-06-15 15:42:39 UTC (rev 11738)
@@ -51,7 +51,7 @@
                                     read_datahd_file,            &
                                     DATAHD_LEN,                  &   
                                     trace_message,               &
-                                    DATAHD_NUM_NESTS 
+                                    DATAHD_NUM_NESTS
 
     use location_mod,        only : get_location,                &
                                     location_type

Modified: DART/branches/coamps/models/coamps_nest/coamps_translate_mod.f90
===================================================================
--- DART/branches/coamps/models/coamps_nest/coamps_translate_mod.f90	2017-06-15 05:00:01 UTC (rev 11737)
+++ DART/branches/coamps/models/coamps_nest/coamps_translate_mod.f90	2017-06-15 15:42:39 UTC (rev 11738)
@@ -58,7 +58,8 @@
                                    fix_for_platform,                          &
                                    generate_flat_file_name,                   &
                                    read_flat_file,                            &
-                                   write_flat_file
+                                   write_flat_file,                           &
+                                   HDF5_FILE_NAME
 
   use time_manager_mod,     only : get_date,                                  &
                                    get_time,                                  &
@@ -288,7 +289,7 @@
       coamps_used_io_proc = .false. 
     end if
 
-    call initialize_domain(cdtgm1, domain)
+    call initialize_domain(HDF5_FILE_NAME, cdtgm1, domain)
 
     ! Set up the state vector field definitions 
     call initialize_state_vector(state_layout, STATE_VEC_DEF_FILE, domain)

Modified: DART/branches/coamps/models/coamps_nest/coamps_util_mod.f90
===================================================================
--- DART/branches/coamps/models/coamps_nest/coamps_util_mod.f90	2017-06-15 05:00:01 UTC (rev 11737)
+++ DART/branches/coamps/models/coamps_nest/coamps_util_mod.f90	2017-06-15 15:42:39 UTC (rev 11738)
@@ -60,6 +60,9 @@
 
   public :: dump_data_file
 
+  ! Working with HDF5 files
+  public :: HDF5_FILE_NAME
+
   ! Variable type
   public :: C_REAL
 
@@ -116,6 +119,11 @@
   integer, parameter :: DATAHD_LEN       = 2000
   integer, parameter :: DATAHD_NUM_NESTS = 11
 
+  ! this is a generic name for the file - there is no dtg
+  ! or ensemble member number needed - just line the specific file
+  ! to this static name
+  character(len=*), parameter :: HDF5_FILE_NAME = 'coamps.hdf5'
+
   !------------------------------
   ! END TYPES AND CONSTANTS 
   !------------------------------

Modified: DART/branches/coamps/models/coamps_nest/model_mod.f90
===================================================================
--- DART/branches/coamps/models/coamps_nest/model_mod.f90	2017-06-15 05:00:01 UTC (rev 11737)
+++ DART/branches/coamps/models/coamps_nest/model_mod.f90	2017-06-15 15:42:39 UTC (rev 11738)
@@ -81,7 +81,8 @@
                                     set_debug_level,          &
                                     timestamp_message,        &
                                     dump_data_file,           &
-                                    check_dealloc_status
+                                    check_dealloc_status,     &
+                                    HDF5_FILE_NAME
 
     use coamps_netcdf_mod,   only : nc_write_statearray_atts, &
                                     nc_write_prognostic_atts, &
@@ -251,11 +252,9 @@
     integer           :: assimilation_period_days = 0
     integer           :: assimilation_period_seconds = 216000
 
-    character(len=256) :: template_file = 'coamps.hdf5'      ! file that has grid/variable sizes
-
     namelist /model_nml/ cdtg, y_bound_skip, x_bound_skip, need_mean, dsnrff, &
                          output_interpolation, output_state_vector, debug, &
-                         template_file, num_domains, &
+                         num_domains, &
                          assimilation_period_days, assimilation_period_seconds
 
     ! Locations of state variables
@@ -307,7 +306,7 @@
         call read_model_namelist()
         call set_debug_level(debug)
 
-        call initialize_domain(template_file, cdtg, domain)
+        call initialize_domain(HDF5_FILE_NAME, cdtg, domain)
         call set_interp_diag(output_interpolation)
 
         call initialize_state_vector(state_definition, STATE_VEC_DEF_FILE, domain)