[Dart-dev] DART/branches Revision: 12447

[dart at ucar.edu]

thoar at ucar.edu
2018-03-14 15:20:04 -0600 (Wed, 14 Mar 2018)
134
This correctly increments the output HDF5 file name.
Clamping the appropriate variables still needs to be done,
but that's about it.




Modified: DART/branches/coamps/models/coamps_nest/coamps_translate_mod.f90
===================================================================
--- DART/branches/coamps/models/coamps_nest/coamps_translate_mod.f90	2018-03-14 21:19:16 UTC (rev 12446)
+++ DART/branches/coamps/models/coamps_nest/coamps_translate_mod.f90	2018-03-14 21:20:04 UTC (rev 12447)
@@ -88,7 +88,6 @@
                                    file_exist, get_unit, do_output,           &
                                    do_nml_file, do_nml_term, nmlfileunit
 
-
   use location_mod,         only : VERTISUNDEF, VERTISSURFACE, VERTISLEVEL,   &
                                    VERTISPRESSURE, VERTISHEIGHT
 
@@ -117,7 +116,6 @@
 
   ! DART restart file tools
   public :: open_dart_file
-! public :: dart_read  obsolete now that DART reads netCDF directly
   public :: dart_write
 
   ! Conversion tools
@@ -137,19 +135,8 @@
   public :: get_dart_current_time
   public :: get_dart_target_time
   public :: write_pickup_file
-  public :: get_current_dtg
+  public :: get_dtg
 
-  public :: print_dart_diagnostics
-
-  !>@todo these are needed for model_mod to generate the hdf5 variable names
-  public :: get_coamps_filename_count
-  public :: get_coamps_filename
-
-  !FIX ONLY FOR TESTING
-  public :: dart_state
-
-  public :: previous_dtg
-
   !------------------------------
   ! END PUBLIC INTERFACE
   !------------------------------
@@ -207,6 +194,8 @@
   character(len=*), parameter :: revision = "$Revision$"
   character(len=*), parameter :: revdate  = "$Date$"
 
+  character(len=11) :: nml_file = 'convert.nml'
+
   ! Namelist containing the date time group and lead time information
   ! Also include information about the domain decomposition: number
   ! of processors in x and y, the number of I/O processors, and the
@@ -223,13 +212,13 @@
   integer                      :: nbdypt   = 7
   logical                      :: ldigit   = .false.
   character(len=10)            :: cdtg     = '1999083100'
-  character(len=11)            :: nml_file = 'convert.nml'
   logical                      :: is_pmo   = .false.
   logical                      :: is_first = .false.
   character(len=180)           :: dsnrff   = './'
+  integer                      :: verbosity = 0
 
   namelist /convert/ ktauf, ktaust, ndxnam, ndynam, npr0nam, nbnam,&
-       & cdtg, icycle, is_pmo, dsnrff, is_first, nbdypt, ldigit
+       & cdtg, icycle, is_pmo, dsnrff, is_first, nbdypt, ldigit, verbosity
 
   logical  :: FLAT_FILE_IO = .true.
   logical  :: is_dart_async
@@ -257,7 +246,7 @@
   character(len=*), parameter :: DART_FILENAME = 'dart_vector.nc'
   integer                     :: dart_unit              
 
-  character(len=10)  :: cdtgm1
+  character(len=10)  :: cdtgm1, cdtgp1
   character(len=180) :: dsnrff1
 
   ! The COAMPS domain and the contents of the DART state vector
@@ -293,7 +282,7 @@
     if (module_initialized) return
     call set_calendar_type(GREGORIAN)
 
-    ! Get the data we can't read from pre-exiting COAMPS files
+    ! Get the data we can't read from pre-existing COAMPS files
     call read_convert_namelist()
 
     if (npr0nam > 0) then
@@ -473,9 +462,9 @@
       forecast_time = (/icycle,0,0/)
     end if
     forecast_type = 'fcstfld'
+
     dsnrff1 = dsnrff
 
-
     coamps_file_index = 0
     iterator = get_iterator(file_layout)
     flat_file_loop: do while (has_next(iterator))
@@ -524,7 +513,7 @@
 
     end do flat_file_loop
 
-    if (do_output()) then
+    if (do_output() .and. verbosity > 0) then