Changeset 11189

Timestamp:

01/24/12 10:42:41 (13 years ago)

Author:

schlegel

Message:

Added 3d Mass Flux calculation

Location:

issm/trunk-jpl/src/c/objects/Elements

Files:

• Penta.cpp (modified) (1 diff)
• Tria.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/objects/Elements/Penta.cpp

@@ -2964 +2964 @@
 /*FUNCTION Penta::MassFlux {{{1*/
 double Penta::MassFlux( double* segment,bool process_units){
-        _error_(" not supported yet!");
+
+        double mass_flux=0;
+
+        if(!IsOnBed()) return mass_flux;
+
+        /*Depth Averaging Vx and Vy*/
+        this->InputDepthAverageAtBase(VxEnum,VxAverageEnum);
+        this->InputDepthAverageAtBase(VyEnum,VyAverageEnum);
+
+        /*Spawn Tria element from the base of the Penta: */
+        Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria.
+        mass_flux=tria->MassFlux(segment,process_units);
+        delete tria->matice; delete tria;
+
+        /*Delete Vx and Vy averaged*/
+        this->inputs->DeleteInput(VxAverageEnum);
+        this->inputs->DeleteInput(VyAverageEnum);
+
+        /*clean up and return*/
+        return mass_flux;
 }
 /*}}}*/

issm/trunk-jpl/src/c/objects/Elements/Tria.cpp

@@ -2415 +2415 @@
         const int    numdofs=2;
 
-        int        i;
+        int        i,dim;
         double     mass_flux=0;
         double     xyz_list[NUMVERTICES][3];
@@ -2449 +2449 @@
 
         Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input);
-        Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input);
-        Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);
+        this->parameters->FindParam(&dim,MeshDimensionEnum);
+        Input* vx_input=NULL;
+        Input* vy_input=NULL;
+        if(dim==2){
+                vx_input=inputs->GetInput(VxEnum); _assert_(vx_input);
+                vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);
+        }
+        else{
+                vx_input=inputs->GetInput(VxAverageEnum); _assert_(vx_input);
+                vy_input=inputs->GetInput(VyAverageEnum); _assert_(vy_input);
+        }
 
         thickness_input->GetInputValue(&h1, gauss_1);