Changeset 28155

Timestamp:

03/15/24 09:29:34 (13 months ago)

Author:

poinelli

Message:

CHG: edit GetGroundedPart functions in c/classes/Elements/ to accomodate sub-element melt parameterization when using IntrusionMelt module

Location:

issm/trunk-jpl

Files:

• src/c/analyses/FreeSurfaceBaseAnalysis.cpp (modified) (1 diff)
• src/c/analyses/MasstransportAnalysis.cpp (modified) (3 diffs)
• src/c/analyses/StressbalanceAnalysis.cpp (modified) (6 diffs)
• src/c/classes/Elements/Element.h (modified) (1 diff)
• src/c/classes/Elements/Penta.cpp (modified) (4 diffs)
• src/c/classes/Elements/Penta.h (modified) (1 diff)
• src/c/classes/Elements/Seg.h (modified) (1 diff)
• src/c/classes/Elements/Tetra.h (modified) (1 diff)
• src/c/classes/Elements/Tria.cpp (modified) (4 diffs)
• src/c/classes/Elements/Tria.h (modified) (1 diff)
• test/Archives/Archive456.arch (modified) ( previous)
• test/Archives/Archive520.arch (modified) ( previous)

issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp

@@ -424 +424 @@
         Gauss*      gauss     = NULL;
         if(melt_style==SubelementMelt2Enum){
-                basalelement->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                basalelement->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,MaskOceanLevelsetEnum,0);
                 gauss = basalelement->NewGauss(point1,fraction1,fraction2,3);
         }
         if(melt_style==IntrusionMeltEnum){
-                basalelement->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                basalelement->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,DistanceToGroundinglineEnum,intrusiondist);
                 gauss = basalelement->NewGauss(point1,fraction1,fraction2,3);
         }

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

@@ -670 +670 @@
         phi=element->GetGroundedPortion(xyz_list);
         if(melt_style==SubelementMelt2Enum){
-                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,MaskOceanLevelsetEnum,0);
             gauss = element->NewGauss(point1,fraction1,fraction2,3);
         }
         else if(melt_style==IntrusionMeltEnum){
-            element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
-       gauss = element->NewGauss(point1,fraction1,fraction2,3);
+                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,DistanceToGroundinglineEnum,intrusiondist);
+        gauss = element->NewGauss(point1,fraction1,fraction2,3);
         }
         else{
@@ -804 +804 @@
    phi=element->GetGroundedPortion(xyz_list);
    if(melt_style==SubelementMelt2Enum){
-      element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+      element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,MaskOceanLevelsetEnum,0);
       gauss = element->NewGauss(point1,fraction1,fraction2,3);
    }
    else if(melt_style==IntrusionMeltEnum){
-            element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+            element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,DistanceToGroundinglineEnum,intrusiondist);
        gauss = element->NewGauss(point1,fraction1,fraction2,3);
         }
@@ -1145 +1145 @@
         phi=element->GetGroundedPortion(xyz_list);
         if(melt_style==SubelementMelt2Enum){
-                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,MaskOceanLevelsetEnum,0);
            gauss = element->NewGauss(point1,fraction1,fraction2,3);
         }

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -1366 +1366 @@
         if(friction_style==SubelementFriction2Enum){
                 gllevelset_input=element->GetInput(MaskOceanLevelsetEnum); _assert_(gllevelset_input);
-                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating, MaskOceanLevelsetEnum,0);
            gauss = element->NewGauss(point1,fraction1,fraction2,mainlyfloating,2);
         }
@@ -1646 +1646 @@
         int ig=-1;// needed for driving stress parameterization
         if(partly_floating){
-                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating, MaskOceanLevelsetEnum,0);
            gauss=element->NewGauss(point1,fraction1,fraction2,3); //considering the entire element
                 gauss_subelem=element->NewGauss(fraction1,fraction2,3);//gauss on each subelement
@@ -2682 +2682 @@
         if(friction_style==SubelementFriction2Enum){
                 gllevelset_input=element->GetInput(MaskOceanLevelsetEnum); _assert_(gllevelset_input);
-                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,MaskOceanLevelsetEnum,0);
            gauss = element->NewGauss(point1,fraction1,fraction2,mainlyfloating,2);
         }
@@ -3310 +3310 @@
         if(friction_style==SubelementFriction2Enum){
                 gllevelset_input=element->GetInput(MaskOceanLevelsetEnum); _assert_(gllevelset_input);
-                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating, MaskOceanLevelsetEnum,0);
                 gauss = element->NewGauss(point1,fraction1,fraction2,mainlyfloating,2);
         }
@@ -5029 +5029 @@
                 if(domaintype==Domain2DverticalEnum) _error_("Subelement Friction 2 not implemented yet for Flowline");
                 gllevelset_input=element->GetInput(MaskOceanLevelsetEnum); _assert_(gllevelset_input);
-                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating, MaskOceanLevelsetEnum,0);
                 //gauss = element->NewGauss(point1,fraction1,fraction2,mainlyfloating,2);
                 gauss=element->NewGaussBase(3);
@@ -5267 +5267 @@
                 if(domaintype==Domain2DverticalEnum) _error_("Subelement Friction 2 not implemented yet for Flowline");
                 gllevelset_input=element->GetInput(MaskOceanLevelsetEnum); _assert_(gllevelset_input);
-                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+                element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating, MaskOceanLevelsetEnum,0);
                 gauss=element->NewGaussBase(3);
         }

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

@@ -273 +273 @@
                 virtual int        GetElementType(void)=0;
                 virtual IssmDouble GetHorizontalSurfaceArea(void){_error_("not implemented");};
-                virtual void       GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating)=0;
+                virtual void       GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating,int distance_enum, IssmDouble intrusion_distance)=0;
                 virtual IssmDouble GetGroundedPortion(IssmDouble* xyz_list)=0;
                 virtual void        GetFractionGeometry(IssmDouble* weights, IssmDouble* pphi, int* ppoint1,IssmDouble* pfraction1,IssmDouble* pfraction2, bool* ptrapezeisnegative, IssmDouble* gl)=0;

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

@@ -1434 +1434 @@
 }
 /*}}}*/
-void       Penta::GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating){/*{{{*/
+void       Penta::GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating, int distance_enum, IssmDouble intrusion_distance){/*{{{*/
         /*Computeportion of the element that is grounded*/
 
         bool               floating=true;
-        int                point;
+        int                point, i;
         const IssmPDouble  epsilon= 1.e-15;
         IssmDouble         gl[NUMVERTICES];
@@ -1444 +1444 @@
 
         /*Recover parameters and values*/
-        Element::GetInputListOnVertices(&gl[0],MaskOceanLevelsetEnum);
+        Element::GetInputListOnVertices(&gl[0],distance_enum);
+
+        /*Determine where to apply sub-element melt using intrusion distance*/
+        for (i; i<NUMVERTICES; i++){
+                gl[i] -= intrusion_distance;
+        }
 
         /*Be sure that values are not zero*/
@@ -4249 +4254 @@
         ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
 
-        this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+        this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,MaskOceanLevelsetEnum,0);
         /* Start  looping on the number of gaussian points: */
         gauss = this->NewGauss(point1,fraction1,fraction2,1-mainlyfloating,3);
@@ -4292 +4297 @@
         ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
 
-        this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+        this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,MaskOceanLevelsetEnum,0);
         /* Start  looping on the number of gaussian points: */
         gauss = this->NewGauss(point1,fraction1,fraction2,mainlyfloating,3);

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

@@ -86 +86 @@
                 Penta*         GetBasalPenta(void);
                 int            GetElementType(void);
-                void           GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating);
+                void           GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating, int distance_enum, IssmDouble intrusion_distance);
                 IssmDouble     GetGroundedPortion(IssmDouble* xyz_list);
                 void           GetFractionGeometry(IssmDouble* weights, IssmDouble* pphi, int* ppoint1,IssmDouble* pfraction1,IssmDouble* pfraction2, bool* ptrapezeisnegative, IssmDouble* gl){_error_("not implemented yet");};

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

@@ -62 +62 @@
                 Element*    GetBasalElement(void){_error_("not implemented yet");};
                 int         GetElementType(void){_error_("not implemented yet");};
-                void        GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating){_error_("not implemented yet");};
+                void        GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating, int distance_enum, IssmDouble intrusion_distance){_error_("not implemented yet");};
                 IssmDouble  GetGroundedPortion(IssmDouble* xyz_list);
                 void        GetFractionGeometry(IssmDouble* weights, IssmDouble* pphi, int* ppoint1,IssmDouble* pfraction1,IssmDouble* pfraction2, bool* ptrapezeisnegative, IssmDouble* gl){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tetra.h

@@ -67 +67 @@
                 Element*    GetBasalElement(void){_error_("not implemented yet");};
                 int         GetElementType(void);
-                void        GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating){_error_("not implemented yet");};
+                void        GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating, int distance_enum, IssmDouble intrusion_distance){_error_("not implemented yet");};
                 IssmDouble  GetGroundedPortion(IssmDouble* xyz_list){_error_("not implemented yet");};
                 void        GetFractionGeometry(IssmDouble* weights, IssmDouble* pphi, int* ppoint1,IssmDouble* pfraction1,IssmDouble* pfraction2, bool* ptrapezeisnegative, IssmDouble* gl){_error_("not implemented yet");};

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

@@ -2053 +2053 @@
 }
 /*}}}*/
-void       Tria::GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* pmainlyfloating){/*{{{*/
-        /*Computeportion of the element that is grounded*/
+void       Tria::GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* pmainlyfloating, int distance_enum, IssmDouble intrusion_distance){/*{{{*/
+        /*Compute portion of the element that is grounded*/
 
         bool               floating=true;
-        int                point;
+        int                point, i;
         const IssmPDouble  epsilon= 1.e-15;
         IssmDouble         gl[NUMVERTICES];
@@ -2063 +2063 @@
 
         /*Recover parameters and values*/
-        Element::GetInputListOnVertices(&gl[0],MaskOceanLevelsetEnum);
+        Element::GetInputListOnVertices(&gl[0],distance_enum);
+        
+        /*Determine where to apply sub-element melt using intrusion distance*/
+        for (i; i<NUMVERTICES; i++){
+                gl[i] -= intrusion_distance;
+        }
 
         /*Be sure that values are not zero*/
@@ -5761 +5766 @@
         ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
 
-        this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+        this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,MaskOceanLevelsetEnum,0);
         /* Start  looping on the number of gaussian points: */
         gauss = this->NewGauss(point1,fraction1,fraction2,1-mainlyfloating,3);
@@ -5804 +5809 @@
         ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
 
-        this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
+        this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating,MaskOceanLevelsetEnum,0);
         /* Start  looping on the number of gaussian points: */
         gauss = this->NewGauss(point1,fraction1,fraction2,mainlyfloating,2);

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

@@ -89 +89 @@
                 Element*    GetBasalElement(void){_error_("not implemented yet");};
                 void        GetLevelsetPositivePart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlynegative,IssmDouble* levelsetvalues);
-                void        GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating);
+                void        GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating, int distance_enum, IssmDouble intrusion_distance);
                 IssmDouble  GetGroundedPortion(IssmDouble* xyz_list);
                 void        GetFractionGeometry(IssmDouble* weights, IssmDouble* pphi, int* ppoint1,IssmDouble* pfraction1,IssmDouble* pfraction2, bool* ptrapezeisnegative, IssmDouble* gl);