Merge pull request #676 from mandli/change-refinement-criteria-none

Change storm refinement to use None instead of bool

Author: rjleveque

src/2d/shallow/multilayer/flag2refine2.f90

@@ -81,7 +81,7 @@ subroutine flag2refine2(mx,my,mbc,mbuff,meqn,maux,xlower,ylower,dx,dy,t,level, &
             ! the storm and refine if we are
             if (storm_specification_type /= 0) then
                 R_eye = storm_location(t)
-                do m=1,size(R_refine,1)
+                do m=1, min(size(R_refine), mxnest)
                     if (coordinate_system == 2) then
                         ds = spherical_distance(x_c, y_c, R_eye(1), R_eye(2))
                     else
@@ -97,7 +97,7 @@ subroutine flag2refine2(mx,my,mbc,mbuff,meqn,maux,xlower,ylower,dx,dy,t,level, &
                 ! Refine based on wind speed
                 if (wind_forcing) then
                     wind_speed = sqrt(aux(wind_index,i,j)**2 + aux(wind_index+1,i,j)**2)
-                    do m=1,size(wind_refine,1)
+                    do m=1, min(size(wind_refine), mxnest)
                         if ((wind_speed > wind_refine(m)) .and. (level <= m)) then
                             amrflags(i,j) = DOFLAG
                             cycle x_loop
@@ -107,7 +107,6 @@ subroutine flag2refine2(mx,my,mbc,mbuff,meqn,maux,xlower,ylower,dx,dy,t,level, &
             endif
 
             ! ********* criteria applied only to wet cells:
-
             b = aux(1,i,j)
             do layer = num_layers, 1, -1
                 if (q(3*layer-2,i,j) / rho(layer) > dry_tolerance(layer)) then
@@ -125,12 +124,13 @@ subroutine flag2refine2(mx,my,mbc,mbuff,meqn,maux,xlower,ylower,dx,dy,t,level, &
                     ! gradient based
                     speed = sqrt(q(3*layer-1,i,j)**2 + q(3*layer,i,j)**2) &
                             / q(3*layer-2,i,j)
-                    do m=1,min(size(speed_tolerance),mxnest)
+                    do m=1,min(size(speed_tolerance), mxnest)
                         if (speed > speed_tolerance(m) .and. level <= m) then
                             amrflags(i,j) = DOFLAG
                             cycle x_loop
                         endif
                     enddo
+                    
                     b = b + q(3*layer-2,i,j) / rho(layer)
                 endif
             enddo

src/2d/shallow/surge/storm_module.f90

@@ -177,22 +177,10 @@ subroutine set_storm(data_file)
 
             ! AMR parameters
             read(unit,'(a)') line
-            if (line(1:1) == "F") then
-                allocate(wind_refine(1))
-                wind_refine(1) = huge(1.d0)
-            else
-                allocate(wind_refine(get_value_count(line)))
-                read(line,*) (wind_refine(i),i=1,size(wind_refine,1))
-            end if
+            allocate(wind_refine(get_value_count(line)))
             read(unit,'(a)') line
-            if (line(1:1) == "F") then
-                allocate(R_refine(1))
-                R_refine(1) = -huge(1.d0)
-            else
-                allocate(R_refine(get_value_count(line)))
-                read(line,*) (R_refine(i),i=1,size(R_refine,1))
-            end if
-            read(unit,*)
+            allocate(R_refine(get_value_count(line)))
+            read(unit, *)
 
             ! Storm Setup
             read(unit, "(i2)") storm_specification_type
@@ -509,4 +497,4 @@ logical pure function S_rotation(x, y) result(rotation)
         rotation = .false.
     end function S_rotation
 
-end module storm_module
+end module storm_module

src/python/geoclaw/data.py

@@ -646,25 +646,22 @@ def write(self, out_file='surge.data', data_source="setrun.py"):
                         description='(Display time relative to landfall)')
         self.data_write()
 
+        # AMR storm refinement criteria
+        # Handle older style of refinement for turning it off, F -> None
         if isinstance(self.wind_refine, bool):
             if not self.wind_refine:
-                self.data_write('wind_refine', value=False,
-                                description='(Refinement ratios)')
-        elif isinstance(self.wind_refine, type(None)):
-            self.data_write('wind_refine', value=False,
-                            description='(Refinement ratios)')
-        else:
-            self.data_write('wind_refine',description='(Refinement ratios)')
+                self.wind_refine = None
         if isinstance(self.R_refine, bool):
             if not self.R_refine:
-                self.data_write('R_refine', value=False,
-                                description='(Refinement ratios)')
-        elif isinstance(self.R_refine, type(None)):
-            self.data_write('R_refine', value=False,
-                            description='(Refinement ratios)')
-        else:
-            self.data_write('R_refine', description='(Refinement ratios)')
+                self.R_refine = None
         self.data_write()
+        
+        if isinstance(self.wind_refine, float):
+            self.wind_refine = [self.wind_refine]
+        self.data_write('wind_refine', description='(Wind speed refinement criteria)')
+        if isinstance(self.R_refine, float):
+            self.R_refine = [self.R_refine]
+        self.data_write('R_refine', description='(Wind speed refinement criteria)')
 
         # Storm specification
         # Handle deprecated member value