Changeset 2731

Timestamp:

Apr 19, 2006, 10:24:38 PM (19 years ago)

Author:

steve

Message:

 

Location:

inundation

Files:

• examples/island.py (modified) (1 diff)
• pyvolution/netherlands.py (modified) (1 diff)
• pyvolution/shallow_water.py (modified) (2 diffs)
• pyvolution/shallow_water_ext.c (modified) (1 diff)
• utilities/cg_solve.py (modified) (1 diff)
• utilities/test_cg_solve.py (modified) (4 diffs)
• zeus/anuga-workspace.zwi (modified) (1 diff)

inundation/examples/island.py

@@ -78 +78 @@
 
 #domain.set_quantity('friction', 0.1)  #Honky dory
-domain.set_quantity('friction', 2)     #Creep
+domain.set_quantity('friction', 100)     #Creep
 domain.set_quantity('elevation', island)
 domain.set_quantity('stage', 1)

inundation/pyvolution/netherlands.py

@@ -12 +12 @@
 #rpdb.set_active()
 
-from shallow_water_vtk import Domain, Reflective_boundary, Dirichlet_boundary,\
+from shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
      Transmissive_boundary, Constant_height, Constant_stage
 

inundation/pyvolution/shallow_water.py

@@ -1191 +1191 @@
 
     #print 'Implicit friction'
-    
+
     xmom = domain.quantities['xmomentum']
     ymom = domain.quantities['ymomentum']
@@ -1218 +1218 @@
 
     #print 'Explicit friction'
-    
+
     xmom = domain.quantities['xmomentum']
     ymom = domain.quantities['ymomentum']

inundation/pyvolution/shallow_water_ext.c

@@ -343 +343 @@
       alpha = 1.0;  //Flat bed
 
-    //alpha = 1.0;
 
     //printf("dz = %.3f, alpha = %.8f\n", dz, alpha);

inundation/utilities/cg_solve.py

@@ -69 +69 @@
           logger.info('i = %g rTr = %20.15e' %(i,rTr))
 
-   #FIXME: Should this raise an exception?
-   if i==imax:
-       logger.warning('max number of iterations attained')
-       msg = 'Conjugate gradient solver did not converge: rTr==%20.15e' %rTr
-       raise ConvergenceError, msg
+       if i==imax:
+            logger.warning('max number of iterations attained')
+            msg = 'Conjugate gradient solver did not converge: rTr==%20.15e' %rTr
+            raise ConvergenceError, msg
 
    return x

inundation/utilities/test_cg_solve.py

@@ -1 +1 @@
 #!/usr/bin/env python
 
+import exceptions
+class TestError(exceptions.Exception): pass
 import unittest
 
 
 from Numeric import dot, allclose, array, transpose, arange, ones, Float
-from cg_solve import *
-from sparse import Sparse, Sparse_CSR
+from utilities.cg_solve import *
+from utilities.sparse import Sparse, Sparse_CSR
 
 
@@ -49 +51 @@
         else:
             msg = 'Should have raised exception'
-            raise msg            
+            raise TestError, msg
 
 
@@ -181 +183 @@
         else:
             msg = 'Should have raised exception'
-            raise msg
+            raise TestError, msg
 
 
@@ -191 +193 @@
      runner.run(suite)
 
-

inundation/zeus/anuga-workspace.zwi

@@ -2 +2 @@
 <workspace name="anuga-workspace">
     <mode>Debug</mode>
-    <active>analytic_solutions</active>
+    <active>pyvolution</active>
     <project name="analytic_solutions">analytic_solutions.zpi</project>
     <project name="euler">euler.zpi</project>