Context Navigation

Changeset 8238

Timestamp:

Oct 25, 2011, 8:50:12 PM (14 years ago)

Author:

paul

Message:

Bulk modulus of fluid now in use for 1d domains

Location:

trunk/anuga_work/development/2010-projects/anuga_1d/sqpipe

Files:

r8236	r8238
69	69	N = 100
70	70	print "Evaluating domain with %d cells" %N
71		domain = dom.Domain(uniform_mesh(N, x_0 = -2.0L_x, x_1 = 2.0*L_x))
	71	domain = dom.Domain(uniform_mesh(N, x_0 = -2.0L_x, x_1 = 2.0*L_x), bulk_modulus = 75.0)
72	72
73	73	domain.set_spatial_order(2)

-                      r8236
+                      r8238
   double g;
   double h0;
+  double bulk_modulus;
 };
 …
   quantityflux[0] = (normal * pq->u) * pq->a;
   quantityflux[1] = normal * (pq->u * pq->d + (pq->h - pq->t) + 0.5 * sp->g * pq->t * pq->t);
+  quantityflux[1] = normal * (pq->u * pq->d + sp->bulk_modulus*(pq->h - pq->t) + 0.5 * sp->g * pq->t * pq->t);
   return quantityflux;
 …
 double sqpipe_quantity_pressurised_sound_speed (struct quantity *q, struct params *p) {
   return 1.0;
+  return ((struct sqpipe_params *)p)->bulk_modulus;
+}
 …
   cellforce[0] = 0.0;
   cellforce[1] = sp->g * (0.5*(qout->h + qin->h) - 0.5*(qout->t + qin->t)) * (qout->b - qin->b) + sp->g * (0.5*(qout->h + qin->h) - 0.5*(qout->t + qin->t)) * 0.5*(qout->b + qin->b) * (qout->t - qin->t) * 1/(0.5*(qout->t + qin->t));
+  cellforce[1] = sp->bulk_modulus * (sp->g * (0.5*(qout->h + qin->h) - 0.5*(qout->t + qin->t)) * (qout->b - qin->b) + sp->g * (0.5*(qout->h + qin->h) - 0.5*(qout->t + qin->t)) * 0.5*(qout->b + qin->b) * (qout->t - qin->t) * 1/(0.5*(qout->t + qin->t)));
   return cellforce;

-                      r8236
+                      r8238
 class Sqpipe_domain(Generic_domain):
     def __init__(self, coordinates, conserved_quantities, forcing_terms = [], boundary = None, state = None, update_state = True, tagged_elements = None):
+    def __init__(self, coordinates, conserved_quantities, forcing_terms = [], boundary = None, state = None, update_state = True, bulk_modulus = 1.0, tagged_elements = None):
         evolved_quantities = ['area', 'discharge', 'elevation', 'height', 'velocity','width','top','stage']
 …
                                 other_quantities     = other_quantities,
                                 tagged_elements      = tagged_elements)
+        self.bulk_modulus = bulk_modulus
         # Allocate space for tracking state (if not provided)

r8237	r8238
19	19	sp->g = get_python_double(domain,"g");
20	20	sp->h0 = get_python_double(domain,"h0");
	21	sp->bulk_modulus = get_python_double(domain, "bulk_modulus");
21	22
22	23	return sD;

-                      r8236
+                      r8238
 class Domain(Sqpipe_domain):
     def __init__(self, coordinates, boundary = None, tagged_elements = None):
+    def __init__(self, coordinates, boundary = None, tagged_elements = None, bulk_modulus = 1.0):
         conserved_quantities = ['area', 'discharge']
         forcing_terms = []
 …
                                boundary             = boundary,
                                state                = state,
+                               bulk_modulus         = bulk_modulus,
         #                       update_state         = False,
                                tagged_elements      = tagged_elements)
         self.__doc__ = 'sqpipe_area_discharge_domain'

Note: See TracChangeset for help on using the changeset viewer.