Changeset 2945

Timestamp:

May 23, 2006, 2:25:03 PM (19 years ago)

Author:

sexton

Message:

updates to smf

File:

• inundation/pyvolution/smf.py (modified) (4 diffs)

inundation/pyvolution/smf.py

@@ -346 +346 @@
         kappa = self.kappa
         kappad = self.kappad
-        amin = self.find_min(x0,wa,kappad,kappa)
+        amin = self.find_min(x0,wa,kappad,kappa,dx,am)
 
         #double Gaussian calculation assumes water displacement is oriented
@@ -363 +363 @@
         for i in range(N):
             try:
-                z[i] =  -am / (amin*(cosh(kappa*(yr[i]-y0)/(wi+wa)))**2) \
+                z[i] =  -am / ((cosh(kappa*(yr[i]-y0)/(wi+wa)))**2) \
                             * (exp(-((xr[i]-x0)/wa)**2) - \
                                 kappad*exp(-((xr[i]-dx-x0)/wa)**2))
@@ -394 +394 @@
         self.dx = 2.0 * (c * sqrt(-log((zsmall/a),e))) / 5.0
 
-    def find_min(self, x0, wa, kappad, kappa):
+    def find_min(self, x0, wa, kappad, kappa, dx, am):
         """Determine eta_min to scale eta(x,y)
         """
@@ -400 +400 @@
         from math import exp, cosh
 
-        step = 0.001
+        step = 10.0
         x = x0
         deriv = 10.0
         tol = 0.001
-        count_max = 100000
+        count_max = 1000000
         c = 0