Changeset 17047

Timestamp:

12/23/13 13:36:23 (11 years ago)

Author:

Eric.Larour

Message:

CHG: added MisfitArea function

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.h (modified) (1 diff)
• Penta.h (modified) (1 diff)
• Seg.h (modified) (1 diff)
• Tria.cpp (modified) (3 diffs)
• Tria.h (modified) (1 diff)

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

@@ -237 +237 @@
                 virtual IssmDouble TotalSmb(void)=0;
                 virtual IssmDouble Misfit(int modelenum,int observationenum,int weightsenum)=0;
+                virtual IssmDouble MisfitArea(int weightsenum)=0;
                 virtual int    VertexConnectivity(int vertexindex)=0;
                 virtual void   VerticalSegmentIndices(int** pindices,int* pnumseg)=0;

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

@@ -184 +184 @@
                 void   InputControlUpdate(IssmDouble scalar,bool save_parameter);
                 IssmDouble Misfit(int modelenum,int observationenum,int weightsenum){_error_("not implemented yet");};
+                IssmDouble MisfitArea(int weightsenum){_error_("not implemented yet");};
                 #endif
 

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

@@ -206 +206 @@
                 void       MaxVz(IssmDouble* pmaxvz){_error_("not implemented yet");};
                 IssmDouble Misfit(int modelenum,int observationenum,int weightsenum){_error_("not implemented yet");};
+                IssmDouble MisfitArea(int weightsenum){_error_("not implemented yet");};
 #endif
 

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

@@ -2240 +2240 @@
 
         /*If on water, return 0: */
-        if(NoIceInElement())return 0;
+        if(NoIceInElement()){
+                printf("no ice in element!\n");
+                return 0;
+        }
 
         ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
@@ -2883 +2886 @@
 }
 /*}}}*/
+/*FUNCTION Tria::MisfitArea{{{*/
+IssmDouble Tria::MisfitArea(int weightsenum){
+
+        /*Intermediaries*/
+        IssmDouble weight;
+        IssmDouble Jdet;
+        IssmDouble Jelem = 0;
+        IssmDouble xyz_list[NUMVERTICES][3];
+        GaussTria *gauss = NULL;
+
+        /*If on water, return 0: */
+        if(NoIceInElement())return 0;
+
+        /*Retrieve all inputs we will be needing: */
+        ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
+        Input* weights_input     =inputs->GetInput(weightsenum);     _assert_(weights_input);
+
+        /* Start  looping on the number of gaussian points: */
+        gauss=new GaussTria(2);
+        for(int ig=gauss->begin();ig<gauss->end();ig++){
+
+                gauss->GaussPoint(ig);
+
+                /* Get Jacobian determinant: */
+                GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss);
+
+                /*Get parameters at gauss point*/
+                weights_input->GetInputValue(&weight,gauss);
+
+                /*compute misfit between model and observation */
+                Jelem+=Jdet*weight*gauss->weight;
+        }
+
+        /* clean up and Return: */
+        delete gauss;
+        return Jelem;
+}
+/*}}}*/
 /*FUNCTION Tria::Misfit{{{*/
 IssmDouble Tria::Misfit(int modelenum,int observationenum,int weightsenum){
@@ -2917 +2958 @@
 
                 /*compute misfit between model and observation */
-                Jelem+=0.5*(model-observation)*(model-observation)*weight*Jdet*gauss->weight;
+                Jelem+=0.5*(model-observation)*(model-observation)*Jdet*weight*gauss->weight;
         }
 

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

@@ -152 +152 @@
                 void       MaxVz(IssmDouble* pmaxvz);
                 IssmDouble Misfit(int modelenum,int observationenum,int weightsenum);
+                IssmDouble MisfitArea(int weightsenum);
                 #endif