Changeset 16721

Timestamp:

11/12/13 16:38:58 (11 years ago)

Author:

seroussi

Message:

NEW: working on mass transport analyses for extrusion of solution

Location:

issm/trunk-jpl/src/c

Files:

• analyses/MasstransportAnalysis.cpp (modified) (2 diffs)
• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (1 diff)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Seg.h (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (1 diff)
• classes/Elements/Tria.h (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp ¶

@@ -217 +217 @@
 void MasstransportAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
 
-        int        i,hydroadjustment;
+        int        i,hydroadjustment,meshtype;
         int*       doflist=NULL;
         IssmDouble rho_ice,rho_water,minthickness;
-        //Element* basalelement=element->SpawnBasalElement();
-        Element* basalelement=element;
+        Element*   basalelement=NULL;
+
+        element->FindParam(&meshtype,MeshTypeEnum);
+        if(meshtype!=Mesh2DhorizontalEnum){
+                if(!element->IsOnBed()) return;
+                basalelement=element->SpawnBasalElement();
+        }
+        else{
+                basalelement = element;
+        }
 
         /*Fetch number of nodes for this finite element*/
@@ -289 +297 @@
         xDelete<IssmDouble>(phi);
         xDelete<int>(doflist);
-        if(basalelement!=element) delete element;
-}/*}}}*/
+        if(meshtype!=Mesh2DhorizontalEnum) delete element;
+}/*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Element.h ¶

@@ -101 +101 @@
                 virtual void   PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm)=0;
                 virtual void   Delta18oParameterization(void)=0;
-                virtual void   SmbGradients()=0;
+                virtual void   SmbGradients(void)=0;
+           virtual Element*   SpawnBasalElement(void)=0;
                 virtual IssmDouble TMeltingPoint(IssmDouble pressure)=0;
                 virtual void   ResetCoordinateSystem()=0;

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp ¶

@@ -3149 +3149 @@
 
         /*Return new Tria*/
+        return tria;
+}
+/*}}}*/
+/*FUNCTION Penta::SpawnBasalElement{{{*/
+Element*  Penta::SpawnBasalElement(void){
+
+        _assert_(this->IsOnBed());
+        Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
         return tria;
 }

issm/trunk-jpl/src/c/classes/Elements/Penta.h ¶

@@ -114 +114 @@
                 void   ResetCoordinateSystem(void);
                 void   SmbGradients();
+           Element* SpawnBasalElement(void);
                 IssmDouble  TMeltingPoint(IssmDouble pressure);
                 IssmDouble SurfaceArea(void);

issm/trunk-jpl/src/c/classes/Elements/Seg.h ¶

@@ -104 +104 @@
                 bool        IsFloating(){_error_("not implemented yet");};
                 bool        IsNodeOnShelfFromFlags(IssmDouble* flags){_error_("not implemented yet");};
+                bool        NoIceInElement(){_error_("not implemented yet");};
                 int         NumberofNodesVelocity(void){_error_("not implemented yet");};
                 int         NumberofNodesPressure(void){_error_("not implemented yet");};
+           Element*    SpawnBasalElement(void){_error_("not implemented yet");};
+                int         PressureInterpolation(void){_error_("not implemented yet");};
                 int         VelocityInterpolation(void){_error_("not implemented yet");};
-                int         PressureInterpolation(void){_error_("not implemented yet");};
-                bool        NoIceInElement(){_error_("not implemented yet");};
                 Input*      GetInput(int inputenum){_error_("not implemented yet");};
                 void        GetInputListOnVertices(IssmDouble* pvalue,int enumtype){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp ¶

@@ -2720 +2720 @@
         /*Return new Seg*/
         return seg;
+}
+/*}}}*/
+/*FUNCTION Tria::SpawnBasalElement{{{*/
+Element*  Tria::SpawnBasalElement(void){
+
+        int meshtype;
+
+        /*go into parameters and get the analysis_counter: */
+        this->parameters->FindParam(&meshtype,MeshTypeEnum);
+
+        if(meshtype==Mesh2DhorizontalEnum){
+                return this;
+        }
+        else _error_("not implemented yet");
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Tria.h ¶

@@ -120 +120 @@
                 void        ResetCoordinateSystem(void);
                 void          SmbGradients();
+           Element*    SpawnBasalElement(void);
                 IssmDouble  TMeltingPoint(IssmDouble pressure);
                 int         VelocityInterpolation();