Changeset 8276

Timestamp:

Dec 8, 2011, 3:04:04 PM (13 years ago)

Author:

paul

Message:

Should have been included in revision 8274

File:

• trunk/anuga_work/development/2010-projects/anuga_1d/utilities/solver.h (modified) (5 diffs)

trunk/anuga_work/development/2010-projects/anuga_1d/utilities/solver.h

@@ -278 +278 @@
 **********************************************************/
 // Declarations
-double domain_compute_fluxes_generic(struct domain *D);
+double domain_compute_fluxes_cells_generic(struct domain *D);
+double domain_compute_fluxes_edges_generic(struct domain *D);
 struct cell* sqpipe_domain_get_cell(struct domain *D, int i, struct cell *c);
 double* edge_flux_function_godunov (struct edge *c, struct params *p, double *edgeflux, int num_eqns);
@@ -287 +288 @@
 // Computational function for flux computation
 // This iterates over cells.
-double domain_compute_fluxes_generic (struct domain *D) {
+double domain_compute_fluxes_cells_generic (struct domain *D) {
   double flux[D->number_of_equations];
   double max_speed;
@@ -322 +323 @@
 }
 
+// Computational function for flux computation
+// This iterates over edges.
+double domain_compute_fluxes_edges_generic (struct domain *D) {
+  double flux[D->number_of_equations];
+  double max_speed;
+  int k, i;
+  // pre-create a cell object to use in the loop
+  // so we need only allocate memory once
+  struct cell *c = domain_new_cell(D);
+
+  for (k=0; k<D->number_of_elements; k++) {
+    c = domain_get_cell(D, k, c);
+   
+    // Compute sound speeds (this updates c) and update timestep
+    max_speed = cell_extreme_sound_speeds(c, D->params);
+    if (max_speed > D->params->epsilon) {                                   
+      D->timestep = min(D->timestep, 0.5*D->params->cfl * D->areas[k]/max_speed); 
+    }
+
+    // Compute flux and store in explicit_update
+    cell_flux_function(c, D->params, flux, D->number_of_equations);    
+    for (i=0; i<D->number_of_equations; i++) {
+      flux[i] /= D->areas[k];
+    }
+    quantities_update(D->explicit_update, flux, k);
+
+    //Keep track of maximal speeds
+    D->max_speed_array[k]=max_speed;
+  }
+  
+  cell_destroy(c);
+
+  return D->timestep;   
+}
+
+
 struct cell* domain_get_cell_generic(struct domain *D, int k, struct cell *c) {
   int i, ki, n, m, nm;
@@ -349 +386 @@
 double* edge_flux_function_godunov (struct edge *e, struct params *p, double *edgeflux, int num_eqns) {
   int i;
-  double flux_left[num_eqns], flux_right[num_eqns];
+  double flux_in[num_eqns], flux_out[num_eqns];
   double denom;
 
-  // Flux contribution from left side of  edge
-  quantity_flux_formula(e->qin, e->normal, p, flux_left);
-
-  // Flux contribution from right side of edge
-  quantity_flux_formula(e->qout, e->normal, p, flux_right);
+  // Flux contribution from inside of  edge
+  quantity_flux_formula(e->qin, e->normal, p, flux_in);
+
+  // Flux contribution from outside of edge
+  quantity_flux_formula(e->qout, e->normal, p, flux_out);
 
   // Flux computation
@@ -364 +401 @@
   } else {
     for (i=0; i<num_eqns; i++) {
-      edgeflux[i] = e->smax*flux_left[i] - e->smin*flux_right[i];
+      edgeflux[i] = e->smax*flux_in[i] - e->smin*flux_out[i];
       edgeflux[i] += e->smax*e->smin * (quantity_get_conserved(e->qout, i, e->normal) - quantity_get_conserved(e->qin, i, e->normal));
       edgeflux[i] /= denom;