Changeset 5281 for issm/trunk/src/c/objects/Elements/Penta.cpp

Timestamp:

08/16/10 11:37:04 (15 years ago)

Author:

Mathieu Morlighem

Message:

moved md.fit to md.cm_responses and 0-4 to enums

File:

• issm/trunk/src/c/objects/Elements/Penta.cpp (modified) (8 diffs)

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

@@ -666 +666 @@
 }
 /*}}}*/
-/*FUNCTION Penta::CostFunction {{{1*/
-double Penta::CostFunction(bool process_units){
+/*FUNCTION Penta::RegularizeInversion {{{1*/
+double Penta::RegularizeInversion(void){
 
         double J;
@@ -696 +696 @@
 
                 /*This element should be collapsed into a tria element at its base. Create this tria element, 
-                 * and compute CostFunction*/
+                 * and compute RegularizeInversion*/
 
                 /*Depth Average B*/
@@ -702 +702 @@
 
                 tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria (lower face).
-                J=tria->CostFunction(process_units);
+                J=tria->RegularizeInversion();
                 delete tria->matice; delete tria;
 
@@ -720 +720 @@
 
                 tria=(Tria*)SpawnTria(3,4,5); //grids 3, 4 and 5 make the new tria (upper face).
-                J=tria->CostFunction(process_units);
+                J=tria->RegularizeInversion();
                 delete tria->matice; delete tria;
 
@@ -1597 +1597 @@
 }
 /*}}}*/
-/*FUNCTION Penta::Misfit {{{1*/
-double Penta::Misfit(bool process_units){
+/*FUNCTION Penta::SurfaceAbsVelMisfit {{{1*/
+double Penta::SurfaceAbsVelMisfit(bool process_units){
 
         double J;
@@ -1627 +1627 @@
 
                 /*This element should be collapsed into a tria element at its base. Create this tria element, 
-                 * and compute Misfit*/
+                 * and compute SurfaceAbsVelMisfit*/
                 tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria (lower face).
-                J=tria->Misfit(process_units);
+                J=tria->SurfaceAbsVelMisfit(process_units);
                 delete tria->matice; delete tria;
                 return J;
@@ -1636 +1636 @@
 
                 tria=(Tria*)SpawnTria(3,4,5); //grids 3, 4 and 5 make the new tria (upper face).
-                J=tria->Misfit(process_units);
+                J=tria->SurfaceAbsVelMisfit(process_units);
+                delete tria->matice; delete tria;
+                return J;
+        }
+}
+/*}}}*/
+/*FUNCTION Penta::SurfaceRelVelMisfit {{{1*/
+double Penta::SurfaceRelVelMisfit(bool process_units){
+
+        double J;
+        Tria* tria=NULL;
+
+        /*inputs: */
+        bool onwater;
+        bool onsurface;
+        bool onbed;
+        int  approximation;
+
+        /*retrieve inputs :*/
+        inputs->GetParameterValue(&onwater,ElementOnWaterEnum);
+        inputs->GetParameterValue(&onbed,ElementOnBedEnum);
+        inputs->GetParameterValue(&onsurface,ElementOnSurfaceEnum);
+        inputs->GetParameterValue(&approximation,ApproximationEnum);
+
+        /*If on water, return 0: */
+        if(onwater)return 0;
+
+        /*Bail out if this element if:
+         * -> Non MacAyeal and not on the surface
+         * -> MacAyeal (2d model) and not on bed) */
+        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
+                return 0;
+        }
+        else if (MacAyealApproximationEnum){
+
+                /*This element should be collapsed into a tria element at its base. Create this tria element, 
+                 * and compute SurfaceRelVelMisfit*/
+                tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria (lower face).
+                J=tria->SurfaceRelVelMisfit(process_units);
+                delete tria->matice; delete tria;
+                return J;
+        }
+        else{
+
+                tria=(Tria*)SpawnTria(3,4,5); //grids 3, 4 and 5 make the new tria (upper face).
+                J=tria->SurfaceRelVelMisfit(process_units);
+                delete tria->matice; delete tria;
+                return J;
+        }
+}
+/*}}}*/
+/*FUNCTION Penta::SurfaceLogVelMisfit {{{1*/
+double Penta::SurfaceLogVelMisfit(bool process_units){
+
+        double J;
+        Tria* tria=NULL;
+
+        /*inputs: */
+        bool onwater;
+        bool onsurface;
+        bool onbed;
+        int  approximation;
+
+        /*retrieve inputs :*/
+        inputs->GetParameterValue(&onwater,ElementOnWaterEnum);
+        inputs->GetParameterValue(&onbed,ElementOnBedEnum);
+        inputs->GetParameterValue(&onsurface,ElementOnSurfaceEnum);
+        inputs->GetParameterValue(&approximation,ApproximationEnum);
+
+        /*If on water, return 0: */
+        if(onwater)return 0;
+
+        /*Bail out if this element if:
+         * -> Non MacAyeal and not on the surface
+         * -> MacAyeal (2d model) and not on bed) */
+        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
+                return 0;
+        }
+        else if (MacAyealApproximationEnum){
+
+                /*This element should be collapsed into a tria element at its base. Create this tria element, 
+                 * and compute SurfaceLogVelMisfit*/
+                tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria (lower face).
+                J=tria->SurfaceLogVelMisfit(process_units);
+                delete tria->matice; delete tria;
+                return J;
+        }
+        else{
+
+                tria=(Tria*)SpawnTria(3,4,5); //grids 3, 4 and 5 make the new tria (upper face).
+                J=tria->SurfaceLogVelMisfit(process_units);
+                delete tria->matice; delete tria;
+                return J;
+        }
+}
+/*}}}*/
+/*FUNCTION Penta::SurfaceLogVxVyMisfit {{{1*/
+double Penta::SurfaceLogVxVyMisfit(bool process_units){
+
+        double J;
+        Tria* tria=NULL;
+
+        /*inputs: */
+        bool onwater;
+        bool onsurface;
+        bool onbed;
+        int  approximation;
+
+        /*retrieve inputs :*/
+        inputs->GetParameterValue(&onwater,ElementOnWaterEnum);
+        inputs->GetParameterValue(&onbed,ElementOnBedEnum);
+        inputs->GetParameterValue(&onsurface,ElementOnSurfaceEnum);
+        inputs->GetParameterValue(&approximation,ApproximationEnum);
+
+        /*If on water, return 0: */
+        if(onwater)return 0;
+
+        /*Bail out if this element if:
+         * -> Non MacAyeal and not on the surface
+         * -> MacAyeal (2d model) and not on bed) */
+        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
+                return 0;
+        }
+        else if (MacAyealApproximationEnum){
+
+                /*This element should be collapsed into a tria element at its base. Create this tria element, 
+                 * and compute SurfaceLogVxVyMisfit*/
+                tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria (lower face).
+                J=tria->SurfaceLogVxVyMisfit(process_units);
+                delete tria->matice; delete tria;
+                return J;
+        }
+        else{
+
+                tria=(Tria*)SpawnTria(3,4,5); //grids 3, 4 and 5 make the new tria (upper face).
+                J=tria->SurfaceLogVxVyMisfit(process_units);
+                delete tria->matice; delete tria;
+                return J;
+        }
+}
+/*}}}*/
+/*FUNCTION Penta::SurfaceAverageVelMisfit {{{1*/
+double Penta::SurfaceAverageVelMisfit(bool process_units){
+
+        double J;
+        Tria* tria=NULL;
+
+        /*inputs: */
+        bool onwater;
+        bool onsurface;
+        bool onbed;
+        int  approximation;
+
+        /*retrieve inputs :*/
+        inputs->GetParameterValue(&onwater,ElementOnWaterEnum);
+        inputs->GetParameterValue(&onbed,ElementOnBedEnum);
+        inputs->GetParameterValue(&onsurface,ElementOnSurfaceEnum);
+        inputs->GetParameterValue(&approximation,ApproximationEnum);
+
+        /*If on water, return 0: */
+        if(onwater)return 0;
+
+        /*Bail out if this element if:
+         * -> Non MacAyeal and not on the surface
+         * -> MacAyeal (2d model) and not on bed) */
+        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
+                return 0;
+        }
+        else if (MacAyealApproximationEnum){
+
+                /*This element should be collapsed into a tria element at its base. Create this tria element, 
+                 * and compute SurfaceAverageVelMisfit*/
+                tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria (lower face).
+                J=tria->SurfaceAverageVelMisfit(process_units);
+                delete tria->matice; delete tria;
+                return J;
+        }
+        else{
+
+                tria=(Tria*)SpawnTria(3,4,5); //grids 3, 4 and 5 make the new tria (upper face).
+                J=tria->SurfaceAverageVelMisfit(process_units);
                 delete tria->matice; delete tria;
                 return J;
@@ -5900 +6080 @@
                                 name==TemperatureEnum ||
                                 name==ControlParameterEnum ||
-                                name==FitEnum ||
+                                name==CmResponseEnum ||
                                 name==DragCoefficientEnum ||
                                 name==GradientEnum ||