Changeset 8697

Timestamp:

Feb 14, 2013, 11:33:06 PM (12 years ago)

Author:

steve

Message:

Changes to get Padarn's new code working for windows. Do need to setup netcdf dll and netcdf.h in fit_interpolate directory

Location:

trunk/anuga_core

Files:

• compile_all.py (modified) (1 diff)
• source/anuga/caching/caching.py (modified) (1 diff)
• source/anuga/fit_interpolate/fit.py (modified) (1 diff)
• source/anuga/pmesh/mesh_quadtree.py (modified) (1 diff)
• source/anuga/utilities/compile.py (modified) (1 diff)

trunk/anuga_core/compile_all.py

@@ -63 +63 @@
 os.chdir('..')
 os.chdir('fit_interpolate')
+subprocess.call([sys.executable, '..' + os.sep + 'utilities' + os.sep + 'compile.py', 'rand48.c'])
+subprocess.call([sys.executable, '..' + os.sep + 'utilities' + os.sep + 'compile.py', 'ptinpoly.c'])
 execfile('..' + os.sep + 'utilities' + os.sep + 'compile.py')
 

trunk/anuga_core/source/anuga/caching/caching.py

@@ -939 +939 @@
   
   # Setup for quad_tree extension
-  from anuga.utilities import compile
-  if compile.can_use_C_extension('quad_tree_ext.c'):
-      import quad_tree_ext
-  else:
-      msg = "C implementation of quad tree extension not avaliable"
-      raise Exception(msg)
+  #from anuga.utilities import compile
+  #if compile.can_use_C_extension('quad_tree_ext.c'):
+  #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'):
-      import sparse_matrix_ext
-  else:
-      msg = "C implementation of sparse_matrix extension not avaliable"
-      raise Exception(msg)
-
+  #from anuga.utilities import compile
+  #if compile.can_use_C_extension('sparse_matrix_ext.c'):
+
+  #else:
+  #    msg = "C implementation of sparse_matrix extension not avaliable"
+  #    raise Exception(msg)
+
+  import anuga.utilities.sparse_matrix_ext as sparse_matrix_ext
+  import anuga.utilities.quad_tree_ext as quad_tree_ext
   from anuga.geometry.aabb import AABB
 

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

@@ -47 +47 @@
 
 # Setup for c fitting routines
-from anuga.utilities import compile
-if compile.can_use_C_extension('fitsmooth.c'):
-    import fitsmooth
-else:
-    msg = "C implementation of fitting algorithms (fitsmooth.c) not avalaible"
-    raise Exception(msg)
+#from anuga.utilities import compile
+#if compile.can_use_C_extension('fitsmooth.c'):
+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'):
-    import quad_tree_ext
-else:
-    msg = "C implementation of quad tree extension not avaliable"
-    raise Exception(msg)
+#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'):
-    import sparse_matrix_ext
-else:
-    msg = "C implementation of sparse_matrix extension not avaliable"
-    raise Exception(msg)
+#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)
 
 

trunk/anuga_core/source/anuga/pmesh/mesh_quadtree.py

@@ -60 +60 @@
         extents = AABB(*self.mesh.get_extent(absolute=True))
         extents.grow(1.001)  # To avoid round off error
-        extents = [extents.xmin, extents.xmax, extents.ymin, extents.ymax]
-        self.extents = ensure_numeric(extents, num.float)
+        numextents = [extents.xmin, extents.xmax, extents.ymin, extents.ymax]
+        self.extents = num.array(numextents, num.float)
+        #print self.extents
 
     def add_quad_tree(self):
 
         V = self.mesh.get_vertex_coordinates(absolute=True)
+        
+        self.set_extents()
+        #print self.extents
         self.root = fitsmooth.build_quad_tree(self.mesh.triangles, V, self.extents)
 

trunk/anuga_core/source/anuga/utilities/compile.py

@@ -302 +302 @@
   # Make shared library (*.so or *.dll)
   if FN=="fitsmooth.c":
-    if libs is "":
-      s = '%s -%s %s ../utilities/quad_tree.o ../utilities/sparse_dok.o ../utilities/sparse_csr.o -o %s.%s -lm -lblas -fopenmp -lnetcdf' %(loader, sharedflag, object_files, root1, libext)
-    else:
-      s = '%s -%s %s ../utilities/quad_tree.o ../utilities/sparse_dok.o ../utilities/sparse_csr.o -o %s.%s "%s" -lm -lblas -fopenmp -lnetcdf' %(loader, sharedflag, object_files, root1, libext, libs)
+    if sys.platform == 'win32':   
+      if libs is "":
+        s = '%s -%s %s ../utilities/quad_tree.o ../utilities/sparse_dok.o ../utilities/sparse_csr.o -o %s.%s -lm  -fopenmp netcdf.dll' %(loader, sharedflag, object_files, root1, libext)
+      else:
+        s = '%s -%s %s ../utilities/quad_tree.o ../utilities/sparse_dok.o ../utilities/sparse_csr.o -o %s.%s "%s" -lm  -fopenmp netcdf.dll' %(loader, sharedflag, object_files, root1, libext, libs)
+    else:    
+      if libs is "":
+        s = '%s -%s %s ../utilities/quad_tree.o ../utilities/sparse_dok.o ../utilities/sparse_csr.o -o %s.%s -lm  -fopenmp -lnetcdf' %(loader, sharedflag, object_files, root1, libext)
+      else:
+        s = '%s -%s %s ../utilities/quad_tree.o ../utilities/sparse_dok.o ../utilities/sparse_csr.o -o %s.%s "%s" -lm  -fopenmp -lnetcdf' %(loader, sharedflag, object_files, root1, libext, libs)
   elif FN=="quad_tree_ext.c":
     if libs is "":
-      s = '%s -%s %s quad_tree.o -o %s.%s -lm -lblas -fopenmp -lnetcdf' %(loader, sharedflag, object_files, root1, libext)
+      s = '%s -%s %s quad_tree.o -o %s.%s -lm  -fopenmp' %(loader, sharedflag, object_files, root1, libext)
+    else:
+      s = '%s -%s %s quad_tree.o -o %s.%s "%s" -lm  -fopenmp ' %(loader, sharedflag, object_files, root1, libext, libs)       
   elif FN=="sparse_matrix_ext.c":
     if libs is "":
-      s = '%s -%s %s sparse_dok.o -o %s.%s -lm -lblas -fopenmp -lnetcdf' %(loader, sharedflag, object_files, root1, libext)
-    else:
-      s = '%s -%s %s sparse_dok.o -o %s.%s "%s" -lm -lblas -fopenmp -lnetcdf' %(loader, sharedflag, object_files, root1, libext, libs) 
+      s = '%s -%s %s sparse_dok.o -o %s.%s -lm  -fopenmp ' %(loader, sharedflag, object_files, root1, libext)
+    else:
+      s = '%s -%s %s sparse_dok.o -o %s.%s "%s" -lm  -fopenmp ' %(loader, sharedflag, object_files, root1, libext, libs) 
+  elif FN=="p_test.c":
+    if libs is "":
+      s = '%s -%s %s ptinpoly.o rand48.o -o %s.%s -lm  -fopenmp ' %(loader, sharedflag, object_files, root1, libext)
+    else:
+      s = '%s -%s %s ptinpoly.o rand48.o -o %s.%s "%s" -lm  -fopenmp ' %(loader, sharedflag, object_files, root1, libext, libs) 
   else:
     if libs is "":
-      s = '%s -%s %s -o %s.%s -lm -lblas -fopenmp' %(loader, sharedflag, object_files, root1, libext)
-    else:
-      s = '%s -%s %s -o %s.%s "%s" -lm -lblas -fopenmp' %(loader, sharedflag, object_files, root1, libext, libs)
+      s = '%s -%s %s -o %s.%s -lm  -fopenmp' %(loader, sharedflag, object_files, root1, libext)
+    else:
+      s = '%s -%s %s -o %s.%s "%s" -lm -fopenmp' %(loader, sharedflag, object_files, root1, libext, libs)