Changeset 9130

Timestamp:

Jun 2, 2014, 12:50:04 PM (11 years ago)

Author:

davies

Message:

Adding a smoothing_timescale to parallel_boyd_box_operator

Location:

trunk/anuga_core/source

Files:

• anuga/structures/riverwall.py (modified) (1 diff)
• anuga/structures/structure_operator.py (modified) (2 diffs)
• anuga_parallel/parallel_boyd_box_operator.py (modified) (4 diffs)
• anuga_parallel/parallel_operator_factory.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/structures/riverwall.py

@@ -124 +124 @@
                                    }
 
-
-        self.hydraulic_variable_names=['Qfactor', 's1', 's2', 'h1', 'h2']
-        #self.hydraulic_variable_names=('Qfactor',)
+        # DO NOT CHANGE THE ORDER OF hydraulic_variable_names
+        # It needs to match hard-coded assumptions in C [compute_fluxes_central]
+        # If you add a variable, append it to the end of hydraulic_variable_names
+        self.hydraulic_variable_names=('Qfactor', 's1', 's2', 'h1', 'h2')
 
         self.ncol_hydraulic_properties=len(self.hydraulic_variable_names)

trunk/anuga_core/source/anuga/structures/structure_operator.py

@@ -212 +212 @@
             new_inflow_xmom = old_inflow_xmom*factor
             new_inflow_ymom = old_inflow_ymom*factor
-                
+            
             self.inflow.set_depths(new_inflow_depth)
     
@@ -251 +251 @@
             new_inflow_xmom = old_inflow_xmom/old_inflow_depth*new_inflow_depth 
             new_inflow_ymom = old_inflow_ymom/old_inflow_depth*new_inflow_depth
-                
             self.inflow.set_depths(new_inflow_depth)    
             self.inflow.set_xmoms(new_inflow_xmom)

trunk/anuga_core/source/anuga_parallel/parallel_boyd_box_operator.py

@@ -32 +32 @@
                  manning=0.013,
                  enquiry_gap=0.0,
+                 smoothing_timescale=0.0,
                  use_momentum_jet=True,
                  use_velocity_head=True,
@@ -96 +97 @@
         self.case = 'N/A'
 
+        self.domain=domain
+        # May/June 2014 -- allow 'smoothing ' of driving_energy, delta total energy, and outflow_enq_depth
+        self.smoothing_timescale=0.
+        self.smooth_driving_energy=0.
+        self.smooth_delta_total_energy=0.
+        self.smooth_outflow_enq_depth=0.
+        # Set them based on a call to the discharge routine with smoothing_timescale=0.
+        # [values of self.smooth_* are required in discharge_routine, hence dummy values above]
+        Qvd=self.discharge_routine()
+        self.smooth_driving_energy=1.0*self.driving_energy
+        self.smooth_delta_total_energy=1.0*self.delta_total_energy
+        self.smooth_outflow_enq_depth=Qvd[2]
+        # Finally, set the smoothing timescale we actually want
+        self.smoothing_timescale=smoothing_timescale
+
         '''
         print "ATTRIBUTES OF PARALLEL BOYD BOX::"
@@ -235 +251 @@
                     self.driving_energy = inflow_enq_depth
                     
+                # May/June 2014 -- change the driving forces gradually, with forward euler timestepping 
+                ts=self.domain.timestep/max(self.domain.timestep, self.smoothing_timescale,1.0e-06)
+                self.smooth_driving_energy=self.smooth_driving_energy+\
+                                        ts*(self.driving_energy-self.smooth_driving_energy)
+                self.smooth_delta_total_energy=self.smooth_delta_total_energy+\
+                                        ts*(self.delta_total_energy-self.smooth_delta_total_energy)
+                self.smooth_outflow_enq_depth=self.smooth_outflow_enq_depth+\
+                                        ts*(outflow_enq_depth-self.smooth_outflow_enq_depth)
+
             
                 Q, barrel_velocity, outlet_culvert_depth, flow_area, case = \
@@ -241 +266 @@
                                                 flow_width          =self.culvert_width,
                                                 length              =self.culvert_length,
-                                                driving_energy      =self.driving_energy,
-                                                delta_total_energy  =self.delta_total_energy,
-                                                outlet_enquiry_depth=outflow_enq_depth,
+                                                #driving_energy      =self.driving_energy,
+                                                #delta_total_energy  =self.delta_total_energy,
+                                                #outlet_enquiry_depth=outflow_enq_depth,
+                                                # Allow smoothing of the driving energies 
+                                                driving_energy      =self.smooth_driving_energy,
+                                                delta_total_energy  =self.smooth_delta_total_energy,
+                                                outlet_enquiry_depth=self.smooth_outflow_enq_depth,
                                                 sum_loss            =self.sum_loss,
                                                 manning             =self.manning)

trunk/anuga_core/source/anuga_parallel/parallel_operator_factory.py

@@ -127 +127 @@
                        manning=0.013,
                        enquiry_gap=0.0,
+                       smoothing_timescale=0.0,
                        use_momentum_jet=True,
                        use_velocity_head=True,
@@ -256 +257 @@
                                          manning=manning,
                                          enquiry_gap=enquiry_gap,
+                                         smoothing_timescale=smoothing_timescale,
                                          use_momentum_jet=use_momentum_jet,
                                          use_velocity_head=use_velocity_head,