cleanup.

Author: alsam

examples/acoustics_1d_example1/bc1.jl

@@ -35,92 +35,84 @@ function bc1(meqn::Int, mbc::Int, mx::Int, xlower::Float64, dx::Float64,
 #-------------------------------------------------------
 #     # left boundary:
 #-------------------------------------------------------
-#      go to (100,110,120,130) mthbc(1)+1
 #
     if mthbc[1] == 0
-#  100 continue
 
         # user-specified boundary conditions go here in place of error output
         println("*** ERROR *** mthbc(1)=0 and no BCs specified in bc1")
+        exit(-1)
 
     elseif mthbc[1] == 1
 
-#  110 continue
         # zero-order extrapolation:
         for ibc=1:mbc
             for m=1:meqn
                 q[m,1-ibc] = q[m,1]
             end
         end
-#      go to 199
+        @goto l199
 
     elseif mthbc[1] == 2 
-#  120 continue
         # periodic:
         for ibc=1:mbc
             for m=1:meqn
                 q[m,1-ibc] = q[m,mx+1-ibc]
             end
         end
-#      go to 199
+        @goto l199
 
     elseif mthbc[1] == 3 
-#  130 continue
-#     # solid wall (assumes 2'nd component is velocity or momentum in x):
-      for ibc=1:mbc
-         for m=1:meqn
-            q[m,1-ibc] = q[m,ibc]
-         end
-         q[2,1-ibc] = -q[2,ibc]
-      end
-#     # negate the normal velocity:
-#      go to 199
-
-#  199 continue
+        # solid wall (assumes 2'nd component is velocity or momentum in x):
+        for ibc=1:mbc
+            for m=1:meqn
+                q[m,1-ibc] = q[m,ibc]
+            end
+            q[2,1-ibc] = -q[2,ibc]
+        end
+        # negate the normal velocity:
+        @goto l199
+
     end # if mthbc[1] == ...
 
+@label l199
+
 #
 #-------------------------------------------------------
 #     # right boundary:
 #-------------------------------------------------------
-#      go to (200,210,220,230) mthbc(2)+1
-#
+
     if mthbc[2] == 0
-#  200 continue
         # user-specified boundary conditions go here in place of error output
         println("*** ERROR *** mthbc(2)=0 and no BCs specified in bc2")
-        # go to 299
+        exit(-1)
 
     elseif mthbc[2] == 1
-#  210 continue
         # zero-order extrapolation:
         for ibc=1:mbc
             for m=1:meqn
                 q[m,mx+ibc] = q[m,mx]
             end
         end
-#      go to 299
+        return
 
     elseif mthbc[2] == 2 
-#  220 continue
-#     # periodic:  
+        # periodic:  
         for ibc=1:mbc
             for m=1:meqn
                 q[m,mx+ibc] = q[m,ibc]
             end
         end
-#      go to 299
+        return
 
     elseif mthbc[2] == 3 
-#  230 continue
-#     # solid wall (assumes 2'nd component is velocity or momentum in x):
-      for ibc=1:mbc
-         for m=1:meqn
-            q[m,mx+ibc] = q[m,mx+1-ibc]
-         end
-         q[2,mx+ibc] = -q[2,mx+1-ibc]
-      end
-#      go to 299
+        # solid wall (assumes 2'nd component is velocity or momentum in x):
+        for ibc=1:mbc
+            for m=1:meqn
+                q[m,mx+ibc] = q[m,mx+1-ibc]
+            end
+            q[2,mx+ibc] = -q[2,mx+1-ibc]
+        end
+        return
 
     end # if mthbc[2] == ...
 #  299 continue

examples/acoustics_1d_example1/claw1.jl

@@ -470,17 +470,12 @@ function claw1(parms::CParam,meqn::Int, mwaves::Int, maux::Int, mbc::Int, mx::In
         if method[1] == 1
             # save old q in case we need to retake step with smaller dt:
             #copyq1(meqn,mbc,mx,q,work(i0qwork))
-            #q_save[:] = q[:]
             q_save = q
         end
 
     #           
     @label l40
 
-
-        println("BEFORE endless loop n = $n maxn = $maxn t = $t dt = $dt")
-        #println("TOP INSIDE endless loop n = $n")
-
         dt2 = dt / 2.0
         #println("dt2: $dt2")
         thalf = t + dt2  # midpoint in time for Strang splitting
@@ -558,7 +553,6 @@ function claw1(parms::CParam,meqn::Int, mwaves::Int, maux::Int, mbc::Int, mx::In
             # reject this step
             t = told
             #copyq1(meqn,mbc,mx,work(i0qwork),q)
-            #q[:] = q_save[:]
             q = q_save
 
             if method[4] == 1
@@ -568,11 +562,9 @@ function claw1(parms::CParam,meqn::Int, mwaves::Int, maux::Int, mbc::Int, mx::In
 
             if method[1] == 1
                 # if variable dt, go back and take a smaller step
-                println("CONTINUE INSIDE endless loop n = $n")
                 @goto l40
             else # if fixed dt, give up and return
                 cflmax = max(cfl,cflmax)
-                println("BREAK INSIDE endless loop n = $n")
                 break
             end