Changeset 4973

Timestamp:

Jan 25, 2008, 2:33:13 PM (16 years ago)

Author:

steve

Message:

 

Location:

anuga_core/source/anuga/advection

Files:

• advection.py (modified) (1 diff)
• advection_ext.c (modified) (2 diffs)
• advection_ext.pyf (modified) (1 diff)
• compile_all.py (modified) (1 diff)

anuga_core/source/anuga/advection/advection.py

@@ -263 +263 @@
         #print 'huge_timestep = ',huge_timestep
                 
-        timestep = compute_fluxes(stage_edge,stage_bdry,stage_update,
+        timestep = compute_fluxes(stage_update,stage_edge,stage_bdry,
                                   neighbours,neighbour_edges,normals,
                                   areas,radii,edgelengths,

anuga_core/source/anuga/advection/advection_ext.c

@@ -2 +2 @@
 #include "stdio.h"
 
-double compute_fluxes(double* stage_edge,
+double compute_fluxes(
+                    double* stage_update,
+                    double* stage_edge,
                     double* stage_bdry,
-                    double* stage_update,
                     int* neighbours,
                     int* neighbour_edges,
@@ -36 +37 @@
         for (k=0; k<N; k++){
             optimal_timestep = huge_timestep;
-            flux = 0.0;  //Reset work array
+            flux = 0.0; 
             for (i=0; i<3; i++){
                 k_i = 3*k+i;

anuga_core/source/anuga/advection/advection_ext.pyf

@@ -9 +9 @@
                 intent(c) compute_fluxes
                 intent(c)
-        
+
+                double precision dimension(n) ::      stage_update,     
                 double precision dimension(3,n) ::    stage_edge
                 double precision dimension(3,n) ::    stage_bdry,
-                double precision dimension(n) ::      stage_update,
                 integer dimension(3,n) ::             neighbours,
                 integer dimension(3,n) ::             neighbour_edges,

anuga_core/source/anuga/advection/compile_all.py

@@ -8 +8 @@
 print separation_line
 
-command = 'python setup.py build_src build_ext --inplace'
+command = 'python setup.py build_src build_ext --inplace --compiler=mingw32'
 print 'Trying to run %s in directory %s' % (command, os.getcwd())
 os.system(command)