Changeset 28155 for issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

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

File:

• issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (modified) (3 diffs)

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);
         }