Changeset 5352

Timestamp:

May 21, 2008, 3:00:47 PM (16 years ago)

Author:

ole

Message:

Moved default smoothing parameter from fit to config.
Removed print statements in data_manager.

Location:

anuga_core/source/anuga

Files:

• config.py (modified) (1 diff)
• fit_interpolate/fit.py (modified) (3 diffs)
• shallow_water/data_manager.py (modified) (1 diff)

anuga_core/source/anuga/config.py

@@ -7 +7 @@
 epsilon = 1.0e-12 # Smallest number - used for safe division
 max_float = 1.0e36 # Largest number - used to initialise (max, min) ranges
-
+default_smoothing_parameter = 0.001 # Default alpha for penalised
+                                    # least squares fitting
 
 #-------------------------------------------

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -41 +41 @@
 from anuga.utilities.cg_solve import conjugate_gradient
 from anuga.utilities.numerical_tools import ensure_numeric, gradient
+from anuga.config import default_smoothing_parameter as DEFAULT_ALPHA
 
 import exceptions
@@ -46 +47 @@
 class VertsWithNoTrianglesError(exceptions.Exception): pass
 
-DEFAULT_ALPHA = 0.001
+#DEFAULT_ALPHA = 0.001
 
 
@@ -94 +95 @@
         # Initialise variabels
         if alpha is None:
-
             self.alpha = DEFAULT_ALPHA
         else:    

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -3919 +3919 @@
     assert allclose(sort(longitudes), longitudes)
 
-    print latitudes[0],longitudes[0]
-    print len(latitudes),len(longitudes)
-    print latitudes[len(latitudes)-1],longitudes[len(longitudes)-1]
+    #print latitudes[0],longitudes[0]
+    #print len(latitudes),len(longitudes)
+    #print latitudes[len(latitudes)-1],longitudes[len(longitudes)-1]
     
     lat_ascending = True