Clawpack git diffs...

===========
classic
===========
/Users/mandli/src/clawpack/classic

diff --git a/examples/acoustics_1d_example1/qinit.f90 b/examples/acoustics_1d_example1/qinit.f90
index 945d91f..b7b0fbf 100644
--- a/examples/acoustics_1d_example1/qinit.f90
+++ b/examples/acoustics_1d_example1/qinit.f90
@@ -16,6 +16,7 @@ subroutine qinit(meqn,mbc,mx,xlower,dx,q,maux,aux)
     real(kind=8) :: beta, xcell
     common /cqinit/ beta
  
+     print *, "stuff"
  
       do i=1,mx
          xcell = xlower + (i-0.5d0)*dx


===========
amrclaw
===========
/Users/mandli/src/clawpack/amrclaw



===========
clawutil
===========
/Users/mandli/src/clawpack/clawutil



===========
pyclaw
===========
/Users/mandli/src/clawpack/pyclaw



===========
visclaw
===========
/Users/mandli/src/clawpack/visclaw



===========
riemann
===========
/Users/mandli/src/clawpack/riemann

diff --git a/src/rpn2_layered_shallow_water.f90 b/src/rpn2_layered_shallow_water.f90
index 21589b5..d7adce5 100644
--- a/src/rpn2_layered_shallow_water.f90
+++ b/src/rpn2_layered_shallow_water.f90
@@ -82,8 +82,6 @@ subroutine rpn2(ixy,maxm,meqn,mwaves,maux,mbc,mx,ql,qr,auxl,auxr,fwave,s,amdq,ap
     real(kind=8), dimension(num_layers) :: h_hat_l, h_hat_r
     real(kind=8) :: b_l, b_r, flux_transfer_l, flux_transfer_r, lambda(6)
 
-    ! real(kind=8) :: advected_speed, eta_l, eta_r, gamma_l, gamma_r, kappa_l, kappa_r, w_normal, w_transverse
-
     ! Solver variables
     integer :: num_dry_states
     real(kind=8), dimension(num_layers) :: eigen_h_l, eigen_h_r
@@ -237,7 +235,22 @@ subroutine rpn2(ixy,maxm,meqn,mwaves,maux,mbc,mx,ql,qr,auxl,auxr,fwave,s,amdq,ap
             call solve_single_layer_rp(layer_index, h_l, h_r, hu_l, hu_r,      &
                                                     hv_l, hv_r, b_l, b_r,      &
                                                     fw, sw)
-
+            if (any(fw > 1d-12)) then
+                print *, "dry states: ", dry_state_l, dry_state_r
+                print *, "        left            |             right"
+                print *, "====================================================="
+                print "(2d16.8)", h_l(1), h_r(1)
+                print "(2d16.8)", hu_l(1), hu_r(1)
+                print "(2d16.8)", hv_l(1), hv_r(1)
+                print "(2d16.8)", h_l(2), h_r(2)
+                print "(2d16.8)", hu_l(2), hu_r(2)
+                print "(2d16.8)", hv_l(2), hv_r(2)
+                print "(2d16.8)", b_l, b_r
+                print *, " "
+                print "(3d16.8)", (fw(j, :), j=1,3)
+                print "(3d16.8)", sw
+                stop
+            end if
             ! Update speeds and waves
             ! Note that we represent all the waves in the first three arrays
             ! so it does not directly correspond to the two-layer case's wave
@@ -270,6 +283,8 @@ subroutine rpn2(ixy,maxm,meqn,mwaves,maux,mbc,mx,ql,qr,auxl,auxr,fwave,s,amdq,ap
         !     *inundation_method* is used.
         ! ======================================================================
         else
+            stop "Should not see a two-layer problem here"
+
             ! By default fill in the eigen and flux evaluation states with their
             ! side values
             if (eigen_method == 1) then
@@ -301,9 +316,21 @@ subroutine rpn2(ixy,maxm,meqn,mwaves,maux,mbc,mx,ql,qr,auxl,auxr,fwave,s,amdq,ap
             momentum_transfer = 0.d0
 
             ! ==================================================================
+            !  All-states are wet - (F F F F)
+            if (num_dry_states == 0) then
+
+                ! Nothing to do for eigenspace evaluation
+
+                ! Flux evaulation
+                momentum_transfer(1) =  g * rho(1) * h_ave(1) * (h_r(2) - h_l(2) + b_r - b_l)
+                momentum_transfer(2) = -g * rho(1) * h_ave(1) * (h_r(2) - h_l(2)) + g * rho(2) * h_ave(2) * (b_r - b_l)
+                flux_transfer_r = g * rho(1) * h_r(1) * h_r(2)
+                flux_transfer_l = g * rho(1) * h_l(1) * h_l(2)
+
+            ! ==================================================================
             !  Right state is completely dry - (F F T T)
-            if (.not. dry_state_l(1) .and. .not. dry_state_l(2) .and.          &
-                      dry_state_r(1) .and.       dry_state_r(2)) then
+            else if (.not. dry_state_l(1) .and. .not. dry_state_l(2) .and.     &
+                           dry_state_r(1) .and.       dry_state_r(2)) then
     
                 ! Inundation occurs
                 inundation = sum(h_l) + b_l > b_r
@@ -450,20 +477,6 @@ subroutine rpn2(ixy,maxm,meqn,mwaves,maux,mbc,mx,ql,qr,auxl,auxr,fwave,s,amdq,ap
                 end if
 
             ! ==================================================================
-            !  All-states are wet - (F F F F)
-!             else if (.not. dry_state_l(1) .and. .not. dry_state_l(2) .and.     &
-!                      .not. dry_state_r(1) .and. .not. dry_state_r(2)) then
-            else if (num_dry_states == 0) then
-
-                ! Nothing to do for eigenspace evaluation
-
-                ! Flux evaulation
-                momentum_transfer(1) =  g * rho(1) * h_ave(1) * (h_r(2) - h_l(2) + b_r - b_l)
-                momentum_transfer(2) = -g * rho(1) * h_ave(1) * (h_r(2) - h_l(2)) + g * rho(2) * h_ave(2) * (b_r - b_l)
-                flux_transfer_r = g * rho(1) * h_r(1) * h_r(2)
-                flux_transfer_l = g * rho(1) * h_l(1) * h_l(2)
-
-            ! ==================================================================
             !  We do not yet handle this case - F F F F and F F F F 
             else
                 print *, "Unhandled dry-state condition reached."
@@ -868,6 +881,24 @@ subroutine solve_single_layer_rp(layer_index, h_l, h_r, hu_l, hu_r, hv_l, hv_r,
             phiL = 0.d0
          endif
 
+         if (uL < 1e-14) then
+            huL = 0.d0
+            uL = 0.d0
+         end if
+         if (uR < 1e-14) then
+            huR = 0.d0
+            uR = 0.d0
+        end if
+
+         if (vL < 1e-14) then
+            hvL = 0.d0
+            vL = 0.d0
+         end if
+         if (vR < 1e-14) then
+            hvR = 0.d0
+            vR = 0.d0
+        end if
+
          wall(1) = 1.d0
          wall(2) = 1.d0
          wall(3) = 1.d0
@@ -922,14 +953,14 @@ subroutine solve_single_layer_rp(layer_index, h_l, h_r, hu_l, hu_r, hv_l, hv_r,
 
          maxiter = 1
 
-         call riemann_aug_JCP(maxiter,3,3,hL,hR,huL,huR,hvL,hvR,bL,bR,uL,uR, &
-                                          vL,vR,phiL,phiR,sE1,sE2,drytol,g,sw,fw)
+         ! call riemann_aug_JCP(maxiter,3,3,hL,hR,huL,huR,hvL,hvR,bL,bR,uL,uR, &
+         !                                  vL,vR,phiL,phiR,sE1,sE2,drytol,g,sw,fw)
 
 !         call riemann_ssqfwave(maxiter,meqn,mwaves,hL,hR,huL,huR,
 !     &     hvL,hvR,bL,bR,uL,uR,vL,vR,phiL,phiR,sE1,sE2,drytol,g,sw,fw)
 
-!          call riemann_fwave(meqn,mwaves,hL,hR,huL,huR,hvL,hvR,
-!     &      bL,bR,uL,uR,vL,vR,phiL,phiR,sE1,sE2,drytol,g,sw,fw)
+         call riemann_fwave(3,3,hL,hR,huL,huR,hvL,hvR,bL,bR,uL,uR, &
+                                         vL,vR,phiL,phiR,sE1,sE2,drytol,g,sw,fw)
 
 !        !eliminate ghost fluxes for wall
          do mw=1,3


===========
geoclaw
===========
/Users/mandli/src/clawpack/geoclaw

diff --git a/examples/multi-layer/plane_wave/setplot.py b/examples/multi-layer/plane_wave/setplot.py
index 04d83e0..689954d 100644
--- a/examples/multi-layer/plane_wave/setplot.py
+++ b/examples/multi-layer/plane_wave/setplot.py
@@ -122,15 +122,17 @@ def setplot(plotdata=None,  bathy_location=0.15,  bathy_angle=0.0,
 
     # ========================================================================
     # Axis limits
-    #xlimits = [amrdata.xlower,amrdata.xupper]
-    xlimits = [-0.5,0.5]
-    #ylimits = [amrdata.ylower,amrdata.yupper]
-    ylimits = [-0.5,0.5]
-    eta = [multilayer_data.eta[0],multilayer_data.eta[1]]
-    top_surface_limits = [eta[0]-0.03,eta[0]+0.03]
-    internal_surface_limits = [eta[1]-0.015,eta[1]+0.015]
+    xlimits = [clawdata.lower[0],clawdata.upper[0]]
+    # xlimits = [-0.5,0.5]
+    ylimits = [clawdata.lower[1],clawdata.upper[1]]
+    # ylimits = [-0.5,0.5]
+    eta = [multilayer_data.eta[0], multilayer_data.eta[1]]
+    # top_surface_limits = [eta[0]-0.03, eta[0]+0.03]
+    # internal_surface_limits = [eta[1]-0.015,eta[1]+0.015]
     # top_surface_limits = [eta[0]-0.3,eta[0]+0.3]
     # internal_surface_limits = [eta[1]-0.15,eta[1]+0.15]
+    top_surface_limits = [eta[0]-1e-15,eta[0]+1e-15]
+    internal_surface_limits = [eta[1]-1e-15,eta[1]+1e-15]
     top_speed_limits = [0.0,0.1]
     internal_speed_limits = [0.0,0.03]
     
diff --git a/examples/multi-layer/plane_wave/setrun.py b/examples/multi-layer/plane_wave/setrun.py
index 239c961..a7900be 100644
--- a/examples/multi-layer/plane_wave/setrun.py
+++ b/examples/multi-layer/plane_wave/setrun.py
@@ -242,7 +242,7 @@ def setrun(claw_pkg='geoclaw'):
     # Order of accuracy:  1 => Godunov,  2 => Lax-Wendroff plus limiters
     clawdata.order = 2
     
-    # Use dimensional splitting? (not yet available for AMR)
+    # Use dimensional splitting?
     #  0 or 'unsplit' or none'  ==> Unsplit
     #  1 or 'increment'         ==> corner transport of waves
     #  2 or 'all'               ==> corner transport of 2nd order corrections too
@@ -266,6 +266,7 @@ def setrun(claw_pkg='geoclaw'):
     #   3 or 'mc'       ==> MC limiter
     #   4 or 'vanleer'  ==> van Leer
     clawdata.limiter = ['mc', 'mc', 'mc', 'mc', 'mc', 'mc']
+    # clawdata.limiter = ['none', 'none', 'none', 'none', 'none', 'none']
 
     clawdata.use_fwaves = True    # True ==> use f-wave version of algorithms
     
@@ -469,9 +470,9 @@ def set_multilayer(rundata):
 
     # Physics parameters
     data.num_layers = 2
-    data.rho = [0.9,1.0]
-    data.eta = [0.0,-0.6]
-    
+    data.rho = [1.0, 1.1]
+    data.eta = [0.0, -1.1]
+
     # Algorithm parameters
     data.eigen_method = 2
     data.inundation_method = 2
@@ -481,7 +482,8 @@ def set_multilayer(rundata):
 
     rundata.replace_data('qinit_data', QinitMultilayerData())
     rundata.qinit_data.qinit_type = 6
-    rundata.qinit_data.epsilon = 0.02
+    # rundata.qinit_data.epsilon = 0.02
+    rundata.qinit_data.epsilon = 0.0
     rundata.qinit_data.angle = 0.0
     rundata.qinit_data.sigma = 0.02
     rundata.qinit_data.wave_family = 4
@@ -532,4 +534,4 @@ if __name__ == '__main__':
 
     rundata.write()
 
-    write_topo_file(rundata, 'topo.tt2')
+    write_topo_file(rundata, 'topo.tt2', right=-1.0)
diff --git a/src/2d/shallow/multilayer/setaux.f90 b/src/2d/shallow/multilayer/setaux.f90
index 2f4682d..168efbb 100644
--- a/src/2d/shallow/multilayer/setaux.f90
+++ b/src/2d/shallow/multilayer/setaux.f90
@@ -12,19 +12,21 @@ subroutine setaux(mbc,mx,my,xlow,ylow,dx,dy,maux,aux)
 !     aux(4:num_layers + 3,i,j) = Initial layer depths for linearized problem
 !
 
-    use amr_module, only: mcapa, xupper, yupper, xlower, ylower
+    use amr_module, only: mcapa, xupper, yupper, xlower, ylower, NEEDS_TO_BE_SET
 
     use geoclaw_module, only: coordinate_system, earth_radius, deg2rad
     use geoclaw_module, only: sea_level
 
-    use storm_module, only: storm_type, wind_index, pressure_index
+    use storm_module, only: wind_forcing, pressure_forcing
+    use storm_module, only: wind_index, pressure_index, set_storm_fields
     use storm_module, only: ambient_pressure
 
-    use friction_module, only: friction_index, set_friction_field
-
-    use multilayer_module, only: eta_init, num_layers, aux_layer_index
+    use friction_module, only: variable_friction, friction_index
+    use friction_module, only: set_friction_field
 
     use topo_module
+
+    use multilayer_module, only: eta_init, num_layers, aux_layer_index
     
     implicit none
     
@@ -34,7 +36,7 @@ subroutine setaux(mbc,mx,my,xlow,ylow,dx,dy,maux,aux)
     real(kind=8), intent(inout) :: aux(maux,1-mbc:mx+mbc,1-mbc:my+mbc)
     
     ! Locals
-    integer :: i,j,m,iint,jint
+    integer :: i,j,m,i_index,j_index,skipcount,ilo,jlo
     real(kind=8) :: x,y,xm,ym,xp,yp,topo_integral
     character(len=*), parameter :: aux_format = "(2i4,4d15.3)"
 
@@ -48,16 +50,18 @@ subroutine setaux(mbc,mx,my,xlow,ylow,dx,dy,maux,aux)
         endif
     endif
     
-    ! Set default values for aux variables
-    aux(1,:,:) = 0.d0 ! Bathymetry
-    aux(2,:,:) = 1.d0 ! Grid cell area
-    aux(3,:,:) = 1.d0 ! Length ratio for edge
-    aux(friction_index,:,:) = 0.d0 ! Manning's-N friction coefficeint
-    if (storm_type > 0) then
-        ! Set these to something non-offensive
-        aux(wind_index,:,:) = 0.d0 ! Wind speed x-direction
-        aux(wind_index+1,:,:) = 0.d0 ! Wind speed y-direction
-        aux(pressure_index,:,:) = ambient_pressure ! Pressure field
+    ! If using a variable friction field initialize the coefficients to 0
+    if (variable_friction) then
+        aux(friction_index,:,:) = 0.d0
+    endif
+
+    ! Storm fields if used
+    if (wind_forcing) then
+        aux(wind_index, :, :) = 0.d0
+        aux(wind_index + 1, :, :) = 0.d0
+    endif
+    if (pressure_forcing) then
+        aux(pressure_index, :, :) = ambient_pressure
     endif
     ! Initial layer depths for multilayer
     aux(aux_layer_index:num_layers - 1 + aux_layer_index,:,:) = 0.d0 
@@ -70,28 +74,54 @@ subroutine setaux(mbc,mx,my,xlow,ylow,dx,dy,maux,aux)
         end forall
     endif
     
+! test:  compute integer indices based off same corner of domain 
+!        to reduce round off discrepancies
+    ilo = floor((xlow - xlower + .05d0*dx)/dx)
+    jlo = floor((ylow - ylower + .05d0*dy)/dy)
+
     ! Set bathymetry
+    skipcount = 0
     do j=1-mbc,my+mbc
-        ym = ylow + (j - 1.d0) * dy
-        y = ylow + (j - 0.5d0) * dy
-        yp = ylow + real(j,kind=8) * dy
+        !ym = ylow + (j - 1.d0) * dy
+        !y = ylow + (j - 0.5d0) * dy
+        !yp = ylow + real(j,kind=8) * dy
+
+        ym = ylower + (jlo+j-1.d0) * dy
+        yp = ylower + (jlo+j) * dy
+        y = 0.5d0*(ym+yp)
+
+
         do i=1-mbc,mx+mbc
-            xm = xlow + (i - 1.d0) * dx
-            x = xlow + (i - 0.5d0) * dx
-            xp = xlow + real(i,kind=8) * dx
+            !xm = xlow + (i - 1.d0) * dx
+            !x  = xlow + (i - 0.5d0) * dx
+            !xp = xlow + real(i,kind=8) * dx
+
+            xm = xlower + (ilo+i-1.d0) * dx
+            xp = xlower + (ilo+i) * dx
+            x = 0.5d0*(xm+xp)
+
+
+            !write(*,"("in setaux ",2i4,e12.5)")i,j,aux(1,i,j)
 
             ! Set lat-long cell info
             if (coordinate_system == 2) then
                 aux(2,i,j) = deg2rad * earth_radius**2 * (sin(yp * deg2rad) - sin(ym * deg2rad)) / dy
                 aux(3,i,j) = ym * deg2rad
             endif
-            
+
             ! skip setting aux(1,i,j) in ghost cell if outside physical domain
             ! since topo files may not cover ghost cell, and values
             ! should be extrapolated, which is done in next set of loops.
             if ((y>yupper) .or. (y<ylower) .or. &
                 (x>xupper) .or. (x<xlower)) cycle
 
+!           ### parameter NEEDS_TO_BE_SET initialized in amr_module.f90
+!           ### saves time by otherwise copying instead of reinitializing
+            if (aux(1,i,j) .ne. NEEDS_TO_BE_SET) then
+               skipcount = skipcount + 1
+               cycle  ! new system copies bathy where possible
+            endif
+
 
             ! Use input topography files if available
             if (mtopofiles > 0 .and. test_topography == 0) then
@@ -101,35 +131,42 @@ subroutine setaux(mbc,mx,my,xlow,ylow,dx,dy,maux,aux)
                     mxtopo,mytopo,mtopo,i0topo,mtopoorder, &
                     mtopofiles,mtoposize,topowork)
 
+                if (coordinate_system == 2) then
                     aux(1,i,j) = topo_integral / (dx * dy * aux(2,i,j))
+                else
+                    aux(1,i,j) = topo_integral / (dx * dy)
+                endif
             endif
         enddo
     enddo
+    !write(*,*)" skipcount = ",skipcount
 
     ! Copy topo to ghost cells if outside physical domain
     do j=1-mbc,my+mbc
-        y = ylow + (j-0.5d0) * dy
+        y = ylower + (jlo+j-.5d0) * dy
         if ((y < ylower) .or. (y>yupper)) then
             do i=1-mbc,mx+mbc
-                x = xlow + (i-0.5d0) * dx 
-                iint = i + max(0, ceiling((xlower-x)/dx)) &
-                         - max(0, ceiling((x-xupper)/dx))
-                jint = j + max(0, ceiling((ylower-y)/dy)) &
-                         - max(0, ceiling((y-yupper)/dy))
-                aux(1,i,j) = aux(1,iint,jint)
+                x = xlower + (ilo+i-.5d0) * dx
+                i_index = i + max(0, ceiling((xlower-x)/dx)) &
+                            - max(0, ceiling((x-xupper)/dx))
+                j_index = j + max(0, ceiling((ylower-y)/dy)) &
+                            - max(0, ceiling((y-yupper)/dy))
+                aux(1,i,j) = aux(1,i_index,j_index)
             enddo
         endif
     enddo
+
+
     do i=1-mbc,mx+mbc
-        x = xlow + (i-0.5d0) * dx
+        x =  xlower + (ilo+i-.5d0) * dx
         if ((x < xlower) .or. (x > xupper)) then
             do j=1-mbc,my+mbc
-                y = ylow + (j-0.5d0) * dy 
-                iint = i + max(0, ceiling((xlower-x)/dx)) &
-                         - max(0, ceiling((x-xupper)/dx))
-                jint = j + max(0, ceiling((ylower-y)/dy)) &
-                         - max(0, ceiling((y-yupper)/dy))
-                aux(1,i,j) = aux(1,iint,jint)
+                y = ylower + (jlo+j-.5d0) * dy
+                i_index = i + max(0, ceiling((xlower-x)/dx)) &
+                            - max(0, ceiling((x-xupper)/dx))
+                j_index = j + max(0, ceiling((ylower-y)/dy)) &
+                            - max(0, ceiling((y-yupper)/dy))
+                aux(1,i,j) = aux(1,i_index,j_index)
             enddo
         endif
     enddo
diff --git a/src/python/geoclaw/data.py b/src/python/geoclaw/data.py
index 3e61103..e1923fc 100755
--- a/src/python/geoclaw/data.py
+++ b/src/python/geoclaw/data.py
@@ -91,9 +91,8 @@ class GeoClawData(clawpack.clawutil.data.ClawData):
         self.data_write()
 
         self.data_write('dry_tolerance')
- 
-        self.close_data_file()
 
+        self.close_data_file()
 
 
 class RefinementData(clawpack.clawutil.data.ClawData):
@@ -525,4 +524,58 @@ class MultilayerData(clawpack.clawutil.data.ClawData):
         # self.data_write('wave_tolerance',description='(Tolerance for wave height refinement)')
         # self.data_write('dry_limit',description='(Turn off limiting when near a dry state)')
         
-        self.close_data_file()
\ No newline at end of file
+        self.close_data_file()
+
+
+# ====================
+#  New Region Support
+# ====================
+class RegionData(clawpack.clawutil.data.ClawData):
+    r"""Region data object that is responsible for all region data output"""
+
+    def __init__(self):
+        r""""""
+
+        pass
+
+    def write(self, data_source="setrun.py"):
+        r""" """
+
+        pass
+
+
+class Region(object):
+    r"""Generic region definition, should be subclassed"""
+
+    def __init__(self):
+        r""""""
+
+        pass
+
+    def write(self):
+        r""""""
+
+        pass
+
+
+def TopoRegion(RegionData):
+    r"""Generic region specified by isobathys rather than lat-long boxes"""
+
+    def __init__(self):
+        r""""""
+
+        pass
+
+
+class RefinementRegion(Region):
+    r"""Region that defined a refinement criteria"""
+
+    def __init__(self):
+
+        pass
+
+    def write(self):
+        r""""""
+
+        pass
+
diff --git a/tests/netcdf_topo/regression_data/gauge00001.txt b/tests/netcdf_topo/regression_data/gauge00001.txt
index be7233d..d8d7fec 100644
--- a/tests/netcdf_topo/regression_data/gauge00001.txt
+++ b/tests/netcdf_topo/regression_data/gauge00001.txt
@@ -1,57 +1,57 @@
-# gauge_id= 1 location=( 0.5 0.5 ) num_eqn= 4
-# Columns: level time q(1 ... num_eqn)
-2 0.0 0.07497756 0.0 0.05251106 0.025
-2 0.0001 0.07498456 -7.355615e-06 0.05251596 0.025007
-2 0.00875985 0.07558772 -0.0006468801 0.05293698 0.02561016
-2 0.0174197 0.07618326 -0.001296506 0.05334462 0.0262057
-2 0.02607955 0.07677113 -0.001955929 0.05373871 0.02679357
-2 0.0347394 0.07735129 -0.002624846 0.05411907 0.02737374
-2 0.04339925 0.07792366 -0.003302947 0.05448547 0.0279461
-2 0.0520591 0.07848811 -0.003989921 0.05483761 0.02851055
-2 0.06071895 0.07904453 -0.00468545 0.05517525 0.02906697
-2 0.0693788 0.07959283 -0.005389214 0.05549817 0.02961527
-2 0.07803865 0.08013295 -0.006100888 0.0558062 0.0301554
-2 0.0866985 0.08066487 -0.006820147 0.05609923 0.03068731
-2 0.09753441 0.08131896 -0.007729636 0.05644536 0.0313414
-2 0.1083703 0.08195994 -0.008649852 0.05676742 0.03198239
-2 0.1192062 0.08258766 -0.009580123 0.05706505 0.0326101
-2 0.1300422 0.08320192 -0.01051976 0.05733789 0.03322436
-2 0.1387318 0.08368458 -0.01128008 0.05753797 0.03370702
-2 0.1474215 0.08415847 -0.01204561 0.05772186 0.03418091
-2 0.1561111 0.08462355 -0.01281599 0.05788947 0.034646
-2 0.1648008 0.08507979 -0.01359084 0.05804072 0.03510223
-2 0.1734904 0.08552711 -0.0143698 0.0581755 0.03554955
-2 0.1822098 0.08596694 -0.01515517 0.05829412 0.03598938
-2 0.1909291 0.08639768 -0.01594392 0.05839597 0.03642012
-2 0.1996485 0.08681925 -0.01673567 0.05848094 0.03684169
-2 0.2083678 0.08723148 -0.01753003 0.05854878 0.03725392
-2 0.2170872 0.08763419 -0.0183266 0.05859926 0.03765663
-2 0.2280465 0.08812714 -0.01932988 0.05863909 0.03814958
-2 0.2390057 0.08860617 -0.02033559 0.05865348 0.03862861
-2 0.249965 0.08907273 -0.02134335 0.05864496 0.03909517
-2 0.2609243 0.08952645 -0.02235238 0.05861316 0.03954889
-2 0.2697571 0.08987807 -0.02316534 0.05856304 0.03990052
-2 0.2785899 0.09020697 -0.02397461 0.05847535 0.04022941
-2 0.2874227 0.09052631 -0.02478296 0.05837124 0.04054876
-2 0.2962555 0.09084303 -0.02559185 0.05826198 0.04086547
-2 0.3050882 0.09115501 -0.02640044 0.05814458 0.04117746
-2 0.3139928 0.09146018 -0.02721371 0.05801097 0.04148262
-2 0.3228974 0.09175348 -0.02802392 0.05785839 0.04177592
-2 0.331802 0.09203437 -0.02883041 0.05768623 0.04205682
-2 0.3407065 0.09230261 -0.0296326 0.05749423 0.04232505
-2 0.3496111 0.09255856 -0.0304301 0.05728297 0.042581
-2 0.3608576 0.09286566 -0.03143006 0.05699029 0.04288811
-2 0.372104 0.09315622 -0.03242215 0.05666962 0.04317867
-2 0.3833505 0.0934324 -0.03340665 0.05632157 0.04345485
-2 0.394597 0.09369661 -0.03438468 0.05594576 0.04371905
-2 0.403709 0.09390349 -0.03517322 0.0556199 0.04392593
-2 0.412821 0.09410567 -0.0359594 0.05527452 0.04412812
-2 0.421933 0.09430424 -0.03674419 0.05490953 0.04432668
-2 0.431045 0.09449994 -0.03752769 0.0545251 0.04452238
-2 0.440157 0.09469303 -0.0383093 0.05412118 0.04471547
-2 0.4493903 0.09488586 -0.0390995 0.05369147 0.04490831
-2 0.4586237 0.09507504 -0.03988736 0.05324147 0.04509749
-2 0.467857 0.09525782 -0.04067111 0.05277252 0.04528027
-2 0.4770904 0.09543012 -0.04144716 0.05228639 0.04545256
-2 0.4863237 0.09558605 -0.04220907 0.05178413 0.04560849
-2 0.4931619 0.09568733 -0.04276107 0.05140156 0.04570977
+# gauge_id=     1 location=(   0.5000000E+00   0.5000000E+00 ) num_var=  4
+# level, time, q[  1  2  3], eta, aux[]
+   02  0.0000000E+00  0.7497756E-01  0.0000000E+00  0.5251106E-01  0.2500000E-01
+   02  0.1000000E-03  0.7498456E-01 -0.7355615E-05  0.5251596E-01  0.2500700E-01
+   02  0.8759850E-02  0.7558771E-01 -0.6468801E-03  0.5293698E-01  0.2561015E-01
+   02  0.1741970E-01  0.7618233E-01 -0.1296498E-02  0.5334477E-01  0.2620478E-01
+   02  0.2607955E-01  0.7676879E-01 -0.1955905E-02  0.5373911E-01  0.2679124E-01
+   02  0.3473940E-01  0.7734746E-01 -0.2624785E-02  0.5411973E-01  0.2736990E-01
+   02  0.4339925E-01  0.7791943E-01 -0.3302835E-02  0.5448615E-01  0.2794187E-01
+   02  0.5205910E-01  0.7848456E-01 -0.3989761E-02  0.5483804E-01  0.2850700E-01
+   02  0.6071895E-01  0.7904282E-01 -0.4685294E-02  0.5517519E-01  0.2906527E-01
+   02  0.6937880E-01  0.7959418E-01 -0.5389175E-02  0.5549741E-01  0.2961662E-01
+   02  0.7803865E-01  0.8013867E-01 -0.6101140E-02  0.5580455E-01  0.3016112E-01
+   02  0.8669850E-01  0.8067631E-01 -0.6820912E-02  0.5609646E-01  0.3069875E-01
+   02  0.9753442E-01  0.8133926E-01 -0.7731402E-02  0.5644095E-01  0.3136170E-01
+   02  0.1083703E+00  0.8199092E-01 -0.8653068E-02  0.5676095E-01  0.3201336E-01
+   02  0.1192062E+00  0.8263072E-01 -0.9585235E-02  0.5705615E-01  0.3265316E-01
+   02  0.1300422E+00  0.8325801E-01 -0.1052720E-01  0.5732624E-01  0.3328046E-01
+   02  0.1387318E+00  0.8375154E-01 -0.1128969E-01  0.5752392E-01  0.3377398E-01
+   02  0.1474215E+00  0.8423626E-01 -0.1205761E-01  0.5770534E-01  0.3425870E-01
+   02  0.1561111E+00  0.8471183E-01 -0.1283056E-01  0.5787050E-01  0.3473427E-01
+   02  0.1648008E+00  0.8517788E-01 -0.1360812E-01  0.5801937E-01  0.3520032E-01
+   02  0.1734904E+00  0.8563402E-01 -0.1438983E-01  0.5815194E-01  0.3565646E-01
+   02  0.1822098E+00  0.8608135E-01 -0.1517788E-01  0.5826858E-01  0.3610379E-01
+   02  0.1909292E+00  0.8651789E-01 -0.1596911E-01  0.5836882E-01  0.3654033E-01
+   02  0.1996485E+00  0.8694321E-01 -0.1676298E-01  0.5845261E-01  0.3696565E-01
+   02  0.2083679E+00  0.8735686E-01 -0.1755893E-01  0.5851982E-01  0.3737930E-01
+   02  0.2170872E+00  0.8775838E-01 -0.1835639E-01  0.5857030E-01  0.3778082E-01
+   02  0.2280465E+00  0.8824600E-01 -0.1935950E-01  0.5861107E-01  0.3826844E-01
+   02  0.2390058E+00  0.8871504E-01 -0.2036341E-01  0.5862759E-01  0.3873748E-01
+   02  0.2499651E+00  0.8916696E-01 -0.2136757E-01  0.5862247E-01  0.3918941E-01
+   02  0.2609243E+00  0.8960157E-01 -0.2237114E-01  0.5859527E-01  0.3962401E-01
+   02  0.2697571E+00  0.8993495E-01 -0.2317861E-01  0.5855009E-01  0.3995739E-01
+   02  0.2785899E+00  0.9024329E-01 -0.2398075E-01  0.5846801E-01  0.4026573E-01
+   02  0.2874227E+00  0.9054052E-01 -0.2477996E-01  0.5837048E-01  0.4056297E-01
+   02  0.2962555E+00  0.9083326E-01 -0.2557729E-01  0.5826792E-01  0.4085570E-01
+   02  0.3050883E+00  0.9112009E-01 -0.2637446E-01  0.5815743E-01  0.4114253E-01
+   02  0.3139929E+00  0.9139985E-01 -0.2717639E-01  0.5803131E-01  0.4142229E-01
+   02  0.3228974E+00  0.9166777E-01 -0.2797487E-01  0.5788581E-01  0.4169021E-01
+   02  0.3318020E+00  0.9192419E-01 -0.2876907E-01  0.5772056E-01  0.4194664E-01
+   02  0.3407066E+00  0.9216953E-01 -0.2955896E-01  0.5753514E-01  0.4219198E-01
+   02  0.3496112E+00  0.9240475E-01 -0.3034470E-01  0.5733000E-01  0.4242720E-01
+   02  0.3608576E+00  0.9268924E-01 -0.3133152E-01  0.5704414E-01  0.4271168E-01
+   02  0.3721041E+00  0.9296120E-01 -0.3231230E-01  0.5672923E-01  0.4298365E-01
+   02  0.3833506E+00  0.9322204E-01 -0.3328731E-01  0.5638611E-01  0.4324449E-01
+   02  0.3945971E+00  0.9347238E-01 -0.3425662E-01  0.5601498E-01  0.4349483E-01
+   02  0.4037091E+00  0.9366763E-01 -0.3503784E-01  0.5569345E-01  0.4369007E-01
+   02  0.4128211E+00  0.9385579E-01 -0.3581492E-01  0.5535347E-01  0.4387824E-01
+   02  0.4219331E+00  0.9403643E-01 -0.3658738E-01  0.5499516E-01  0.4405887E-01
+   02  0.4310450E+00  0.9420896E-01 -0.3735458E-01  0.5461878E-01  0.4423140E-01
+   02  0.4401570E+00  0.9437267E-01 -0.3811574E-01  0.5422473E-01  0.4439512E-01
+   02  0.4493903E+00  0.9452879E-01 -0.3887992E-01  0.5380789E-01  0.4455123E-01
+   02  0.4586236E+00  0.9467422E-01 -0.3963595E-01  0.5337388E-01  0.4469666E-01
+   02  0.4678569E+00  0.9480816E-01 -0.4038281E-01  0.5292321E-01  0.4483060E-01
+   02  0.4770902E+00  0.9492989E-01 -0.4111950E-01  0.5245634E-01  0.4495234E-01
+   02  0.4863235E+00  0.9503887E-01 -0.4184518E-01  0.5197368E-01  0.4506132E-01
+   02  0.4931618E+00  0.9511106E-01 -0.4237521E-01  0.5160613E-01  0.4513350E-01
