Merge pull request #675 from mandli/switch-gauge-format

Switch gauge binary file format order

Author: rjleveque

src/2d/shallow/gauges_module.f90

@@ -294,10 +294,10 @@ subroutine set_gauges(restart, num_eqn, num_aux, fname)
                           "# file format ascii, time series follow in this file"
                     else if (gauges(i)%file_format == 2) then
                         write(OUTGAUGEUNIT, '(a)') &
-                            "# file format binary64, time series in .bin file"
+                            "# file format binary32, time series in .bin file"
                     else if (gauges(i)%file_format == 3) then
                         write(OUTGAUGEUNIT, '(a)') &
-                            "# file format binary32, time series in .bin file"
+                            "# file format binary64, time series in .bin file"
                     endif
 
                    close(OUTGAUGEUNIT)
@@ -749,14 +749,14 @@ subroutine print_gauges_and_reset_nextLoc(gauge_num)
                       (gauges(gauge_num)%data(k, j), k=1,nvals)
             end do
 
-        else if (gauges(gauge_num)%file_format >= 2) then
+        else if (gauges(gauge_num)%file_format == 2 .or.    &
+                 gauges(gauge_num)%file_format == 3) then
 
             ! binary output
-
             open(unit=myunit, file=gauges(gauge_num)%file_name_bin, &
                  status='unknown', position='append',access='stream')
 
-            if (gauges(gauge_num)%file_format == 3) then
+            if (gauges(gauge_num)%file_format == 2) then
                 allocate(gdata4(nvals+1, ntimes))
                 gdata4(1, 1:ntimes) = real(gauges(gauge_num)%level(1:ntimes), kind=4)
                 gdata4(2:nvals+1, 1:ntimes) = &