Changeset 258 for inundation/ga/storm_surge/pyvolution/quantity_ext.c

Timestamp:

Sep 1, 2004, 2:31:48 AM (21 years ago)

Author:

ole

Message:

Added C-headers to share code
Removed length and distance from util

File:

• inundation/ga/storm_surge/pyvolution/quantity_ext.c (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/quantity_ext.c

@@ -14 +14 @@
 #include "math.h"
 
-
-//FIXME: Should live in util_ext.c
-double max(double x, double y) {  
-  //Return maximum of two doubles
-  
-  if (x > y) return x;
-  else return y;
-}
-
-double min(double x, double y) {  
-  //Return minimum of two doubles
-  
-  if (x < y) return x;
-  else return y;
-}
-
-
-void _limit(int N, double beta, double* qc, double* qv, 
-            double* qmin, double* qmax) { 
-
-  int k, i, k3;
-  double dq, dqa[3], phi, r;
-  
-  for (k=0; k<N; k++) {
-    k3 = k*3;
-    
-    //Find the gradient limiter (phi) across vertices  
-    phi = 1.0;
-    for (i=0; i<3; i++) {    
-      r = 1.0;
-      
-      dq = qv[k3+i] - qc[k];    //Delta between vertex and centroid values
-      dqa[i] = dq;              //Save dq for use in the next loop
-      
-      if (dq > 0.0) r = (qmax[k] - qc[k])/dq;
-      if (dq < 0.0) r = (qmin[k] - qc[k])/dq;      
-  
-  
-      phi = min( min(r*beta, 1.0), phi);    
-    }
-    
-    //Then update using phi limiter
-    for (i=0; i<3; i++) {    
-      qv[k3+i] = qc[k] + phi*dqa[i];
-    }
-  }
-}
+//Shared code snippets
+#include "util_ext.h"
+#include "quantity_ext.h"
 
 /////////////////////////////////////////////////