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

Timestamp:

10/23/13 10:34:47 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removing Surfaceslopes and bedslopes analysis, replaced by L2ProjectionBase

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (modified) (7 diffs)

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

@@ -447 +447 @@
                         break;
                 #endif
-                case BedSlopeXAnalysisEnum: case SurfaceSlopeXAnalysisEnum: case BedSlopeYAnalysisEnum: case SurfaceSlopeYAnalysisEnum:
+                case L2ProjectionBaseAnalysisEnum:
                         return CreateBasalMassMatrix();
                         break;
@@ -484 +484 @@
                 #endif
                 default:
-                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
+                        _error_("analysis " << EnumToStringx(analysis_type) << " not supported yet");
         }
 
@@ -673 +673 @@
                         break;
                 #endif
-                case BedSlopeXAnalysisEnum: case SurfaceSlopeXAnalysisEnum: case BedSlopeYAnalysisEnum: case SurfaceSlopeYAnalysisEnum:
-                        return CreatePVectorSlope();
+                case L2ProjectionBaseAnalysisEnum:
+                        return CreatePVectorL2ProjectionBase();
                         break;
                 case MasstransportAnalysisEnum:
@@ -756 +756 @@
 }
 /*}}}*/
-/*FUNCTION Penta::CreatePVectorSlope {{{*/
-ElementVector* Penta::CreatePVectorSlope(void){
+/*FUNCTION Penta::CreatePVectorL2ProjectionBase {{{*/
+ElementVector* Penta::CreatePVectorL2ProjectionBase(void){
 
         if (!IsOnBed()) return NULL;
@@ -763 +763 @@
         /*Call Tria function*/
         Tria* tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1.
-        ElementVector* pe=tria->CreatePVectorSlope();
+        ElementVector* pe=tria->CreatePVectorL2Projection();
         delete tria->material; delete tria;
 
@@ -2201 +2201 @@
 void  Penta::InputUpdateFromSolution(IssmDouble* solution){
 
-        int analysis_type;
+        int analysis_type,inputenum;
 
         /*retreive parameters: */
@@ -2242 +2242 @@
                 break;
         #endif
-        case BedSlopeXAnalysisEnum:
-                InputUpdateFromSolutionOneDofCollapsed(solution,BedSlopeXEnum);
-                break;
-        case BedSlopeYAnalysisEnum:
-                InputUpdateFromSolutionOneDofCollapsed(solution,BedSlopeYEnum);
-                break;
-        case SurfaceSlopeXAnalysisEnum:
-                InputUpdateFromSolutionOneDofCollapsed(solution,SurfaceSlopeXEnum);
-                break;
-        case SurfaceSlopeYAnalysisEnum:
-                InputUpdateFromSolutionOneDofCollapsed(solution,SurfaceSlopeYEnum);
+        case L2ProjectionBaseAnalysisEnum:
+                this->parameters->FindParam(&inputenum,InputToL2ProjectEnum);
+                InputUpdateFromSolutionOneDofCollapsed(solution,inputenum);
                 break;
         case MasstransportAnalysisEnum: