[Dart-dev] !/ Revision: 11734

[dart at ucar.edu]

thoar at ucar.edu
2017-06-14 15:52:05 -0600 (Wed, 14 Jun 2017)
279
pmo compiles and gets to the point where we need to read the HDF5 file.
The .f90 files have the new svn and copyright tags where applicable.
The path_names_files have the new locations, but may not have all the
needed modules. But - now that we can compile, we can finish that.




Modified: DART/branches/coamps/models/coamps_nest/check_in_grid.f90
===================================================================
--- DART/branches/coamps/models/coamps_nest/check_in_grid.f90	2017-06-14 21:12:16 UTC (rev 11733)
+++ DART/branches/coamps/models/coamps_nest/check_in_grid.f90	2017-06-14 21:52:05 UTC (rev 11734)
@@ -4,6 +4,9 @@
 ! the lat/lon point described by the last two lines of domain.dat is
 ! in the grid or not - this is for use with actual observations to
 ! pare down the list to points that are actually within our domain.
+
+! DART $Id$
+
 program check_in_grid
 
   use coamps_intrinsic_mod, only : ll2ij
@@ -39,4 +42,11 @@
   if (grid_i < 1)        in_grid = .false.
   if (grid_j < 1)        in_grid = .false.
   print *, in_grid
+
 end program check_in_grid
+
+! <next few lines under version control, do not edit>
+! $URL$
+! $Id$
+! $Revision$
+! $Date$

Modified: DART/branches/coamps/models/coamps_nest/coamps_domain_mod.f90
===================================================================
--- DART/branches/coamps/models/coamps_nest/coamps_domain_mod.f90	2017-06-14 21:12:16 UTC (rev 11733)
+++ DART/branches/coamps/models/coamps_nest/coamps_domain_mod.f90	2017-06-14 21:52:05 UTC (rev 11734)
@@ -8,6 +8,8 @@
 ! which is an amalgamation of a grid (a map projection and how the domain
 ! connects to it), an arbitrary number of nests, and vertical structure.
 !------------------------------ 
+! DART $Id$
+
 module coamps_domain_mod
 
     use coamps_intrinsic_mod, only : uvg2uv   
@@ -48,7 +50,7 @@
                                     generate_flat_file_name,     &
                                     read_datahd_file,            &
                                     DATAHD_LEN,                  &   
-                                    trace_message,                    &
+                                    trace_message,               &
                                     DATAHD_NUM_NESTS 
 
     use location_mod,        only : get_location,                &
@@ -156,11 +158,11 @@
     ! BEGIN MODULE VARIABLES
     !------------------------------
 
-    ! Modified automatically by Subversion
-    character(len=128) :: &
-    source = "$URL$", &
-    revision = "$Revision$", &
-    revdate = "$Date$"
+    ! version controlled file description for error handling, do not edit
+    character(len=*), parameter :: source   = &
+       "$URL$"
+    character(len=*), parameter :: revision = "$Revision$"
+    character(len=*), parameter :: revdate  = "$Date$"
 
     logical, save :: module_initialized = .false.
 
@@ -177,10 +179,16 @@
     ! -----------------
     ! Constructor for a COAMPS domain possibly consisting of several nests
     !  PARAMETERS
+    !   IN  filename          HDF5-format file that has a datahd_sfc_yaddayadda variable
     !   IN  dtg               COAMPS date-time-group (for filenames)
     !   OUT domain            Domain to initialize
-    subroutine initialize_domain(dtg, domain)
-        character(len=10),      intent(in) :: dtg
+    !
+    ! this routine used to read the datahd information from an exclusive file.
+    ! This information is now a single variable
+
+    subroutine initialize_domain(filename, dtg, domain)
+        character(len=*),    intent(in)    :: filename
+        character(len=*),    intent(in)    :: dtg
         type(coamps_domain), intent(inout) :: domain
 
         real(kind=r8), dimension(DATAHD_LEN) :: coamps_datahd
@@ -192,7 +200,8 @@
 
         if (domain%is_initialized) return
 
-        call read_datahd_file(dtg, coamps_datahd)
+        ! read from datahd_sfc  variable instead of flat file
+        call read_datahd_file(filename, dtg, coamps_datahd)
 
         call initialize_grid(coamps_datahd, domain%static_grid)
 
@@ -790,3 +799,8 @@
 
 end module coamps_domain_mod
 
+! <next few lines under version control, do not edit>
+! $URL$