Changeset 8763

Timestamp:

Mar 17, 2013, 10:08:46 PM (12 years ago)

Author:

steve

Message:

Added in xllcorner and yllcorner into fitsmooth (caused a problem on cairns demo)

Location:

trunk/anuga_core

Files:

• demos/cairns/project.py (modified) (1 diff)
• demos/cairns/run_cairns.py (modified) (1 diff)
• source/anuga/fit_interpolate/fit.py (modified) (9 diffs)
• source/anuga/fit_interpolate/fitsmooth.c (modified) (3 diffs)
• source/anuga_parallel/pymetis/Makefile (modified) (1 diff)
• source/anuga_parallel/run_parallel_sw_merimbula.py (modified) (2 diffs)

trunk/anuga_core/demos/cairns/project.py

@@ -57 +57 @@
 
 # bigger base_scale == less triangles
-base_scale = 100000
-base_scale = 100000
+#base_scale = 100000 # 162170 triangles
+base_scale = 400000 # 42093
 default_res = 100 * base_scale   # Background resolution
 islands_res = base_scale

trunk/anuga_core/demos/cairns/run_cairns.py

@@ -65 +65 @@
 domain.set_flow_algorithm('tsunami')
 
+
+                                    
 #------------------------------------------------------------------------------
 # Setup initial conditions

trunk/anuga_core/source/anuga/fit_interpolate/fit.py

@@ -46 +46 @@
 import sys
 
-# Setup for c fitting routines
-#from anuga.utilities import compile
-#if compile.can_use_C_extension('fitsmooth.c'):
+#----------------------------------------------
+# C code to build interpolation matrices
+#----------------------------------------------
 import fitsmooth
-#else:
-#    msg = "C implementation of fitting algorithms (fitsmooth.c) not avalaible"
-#    raise Exception(msg)
-
-# Setup for quad_tree extension
-#from anuga.utilities import compile
-#if compile.can_use_C_extension('quad_tree_ext.c'):
-#from anuga.utilities import quad_tree_ext
-#else:
-#    msg = "C implementation of quad tree extension not avaliable"
-#    raise Exception(msg)
-
-# Setup for sparse_matrix extension
-#from anuga.utilities import compile
-#if compile.can_use_C_extension('sparse_matrix_ext.c'):
-#from anuga.utilities import sparse_matrix_ext
-#else:
-#    msg = "C implementation of sparse_matrix extension not avaliable"
-#    raise Exception(msg)
-
 
 
@@ -87 +67 @@
         Padarn Note 05/12/12: This documentation should probably
         be updated to account for the fact that the fitting is now
-        done in c. I wasn't sure what details were neccesary though.
+        done in C. I wasn't sure what details were neccesary though.
 
         Fit data at points to the vertices of a mesh.
@@ -134 +114 @@
 
         # NOTE PADARN: NEEDS FIXING - currently need smoothing matrix
-        # even if alpha is zero, due to c function expecting it. This
+        # even if alpha is zero, due to C function expecting it. This
         # could and should be removed.
         if True:
@@ -206 +186 @@
 
     # NOTE PADARN: This function was added to emulate behavior of the original
-    # class not using external c functions. This method is dangerous as D could
+    # class not using external C functions. This method is dangerous as D could
     # be very large - it was added as it is used in a unit test.
     def get_D(self):
@@ -212 +192 @@
 
     # NOTE PADARN: This function was added to emulate behavior of the original
-    # class so as to pass a unit test. It is completely uneeded.
+    # class so as to pass a unit test. It is completely unneeded.
     def build_fit_subset(self, point_coordinates, z=None, attribute_name=None,
                               verbose=False, output='dot'):
@@ -310 +290 @@
         # PADARN NOTE: THe following block of code is translated from
         # things that were being done in the Geospatial_data object
-        # which is no longer required if data from file in c.
+        # which is no longer required if data from file in C.
         #---------------------------------------------------------
         # Default attribute name here seems to only have possibility
@@ -358 +338 @@
 
         Inputs:
-        point_coordinates: The co-ordinates of the data points.
+        point_coordinates_or_filename: The co-ordinates of the data points.
+              A filename of a .pts file or a
               List of coordinate pairs [x, y] of
-        data points or an nx2 numeric array or a Geospatial_data object
+              data points or an nx2 numeric array or a Geospatial_data object
               or points file filename
           z: Single 1d vector or array of data at the point_coordinates.
@@ -368 +349 @@
             if point_coordinates_or_filename[-4:] != ".pts":
                 use_blocking_option2 = False
+
         # NOTE PADARN 12/12/12: Currently trying to get all blocking to be done
-        # in c, but blocking option 1, which does everything using the python
+        # in C, but blocking option 1, which does everything using the python
         # interface can be used in the meantime (much slower).
+
         #-----------------------BLOCKING OPTION 1----------------------------
         if use_blocking_option2 is False:
@@ -401 +384 @@
             else:
                 point_coordinates = point_coordinates_or_filename
+
         #-----------------------BLOCKING OPTION 2----------------------------
         else:

trunk/anuga_core/source/anuga/fit_interpolate/fitsmooth.c

@@ -92 +92 @@
 
     *x = (int)length;
+
+    if ((status = nc_close(ncid))) ERR(status);
+
+    return 0;
+
+}
+
+// Takes a netcdf file and gets the x and y corners
+int _read_net_cdf_corners(char * filename,double *xllcorner, double *yllcorner){
+
+    int status;                       /* error status */
+    int ncid;
+
+    if ((status = nc_open(filename, NC_NOWRITE, &ncid))) ERR(status);
+
+    if ((status = nc_get_att_double(ncid, NC_GLOBAL, "xllcorner", xllcorner))) ERR(status);
+    if ((status = nc_get_att_double(ncid, NC_GLOBAL, "yllcorner", yllcorner))) ERR(status);
 
     if ((status = nc_close(ncid))) ERR(status);
@@ -270 +287 @@
     //n=10;
 
+    double xllcorner, yllcorner;
+    _read_net_cdf_corners(filename,&xllcorner,&yllcorner);
+
+    //printf(" xllcorner %g yllcorner %g\n",xllcorner,yllcorner);
+
+
     double * point_coordinates = malloc(2*sizeof(double)*blocksize);
     double * point_values = malloc(sizeof(double)*blocksize);
@@ -301 +324 @@
 
 
-                double x = point_coordinates[2*k];
-                double y = point_coordinates[2*k+1];
+                double x = point_coordinates[2*k]+xllcorner;
+                double y = point_coordinates[2*k+1]+yllcorner;
                 triangle * T = search(quadtree,x,y);
 

trunk/anuga_core/source/anuga_parallel/pymetis/Makefile

@@ -20 +20 @@
 
 pymetis_module:
-        (cd pymetis; METIS_DIR=$(METIS_DIR) python setup.py build; sh ./get_module)
+        (cd pymetis; METIS_DIR=$(METIS_DIR) python setup.py build; sh get_module)
 
 for_win32: metis_win32 pymetis_module_win32

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

@@ -45 +45 @@
 #mesh_filename = "merimbula_17156.tsh"   ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 50; finaltime = 500
 #mesh_filename = "merimbula_43200_1.tsh"   ; x0 = 756000.0 ; x1 = 756500.0; yieldstep = 50; finaltime = 500
-mesh_filename = "test-100.tsh" ; x0 = 200.0 ; x1 = 300.0; yieldstep = 1; finaltime = 50
+#mesh_filename = "test-100.tsh" ; x0 = 200.0 ; x1 = 300.0; yieldstep = 1; finaltime = 50
 #mesh_filename = "test-20.tsh" ; x0 = 250.0 ; x1 = 350.0; yieldstep = 1; finaltime = 50
 
@@ -88 +88 @@
     domain.set_name('merimbula_new')
     domain.set_store(True)
-    domain.set_store_vertices_smoothly(False)
+    domain.set_store_vertices_smoothly(True)
     #domain.set_quantity('elevation', Set_Elevation(500.0))