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

Timestamp:

06/16/11 14:13:46 (14 years ago)

Author:

Mathieu Morlighem

Message:

Deleted noisedmp, use DragCoefficientAbsGradientEnum as a cost function instead

File:

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

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

@@ -3876 +3876 @@
 /*FUNCTION Penta::Gradj {{{1*/
 void  Penta::Gradj(Vec gradient,int control_type){
+        /*dJ/dalpha = ∂L/∂alpha = ∂J/∂alpha + ∂/∂alpha(KU-F)*/
 
         int              i,approximation;
@@ -3883 +3884 @@
         if(IsOnWater())return;
 
+        /*First deal with ∂/∂alpha(KU-F)*/
         switch(control_type){
 
@@ -3962 +3964 @@
                 default:
                         _error_("control type %s not supported yet: ",EnumToStringx(control_type));
+        }
+
+        /*Now deal with ∂J/∂alpha*/
+        int        *responses = NULL;
+        int         num_responses,resp;
+        this->parameters->FindParam(&num_responses,NumResponsesEnum);
+        this->parameters->FindParam(&responses,NULL,NULL,StepResponsesEnum);
+
+        for(resp=0;resp<num_responses;resp++) switch(responses[resp]){
+
+                case ThicknessAbsMisfitEnum:
+                case SurfaceAbsVelMisfitEnum:
+                case SurfaceRelVelMisfitEnum:
+                case SurfaceLogVelMisfitEnum:
+                case SurfaceLogVxVyMisfitEnum:
+                case SurfaceAverageVelMisfitEnum:
+                        /*Nothing, J does not depends on the parameter being inverted for*/
+                        break;
+                case DragCoefficientAbsGradientEnum:
+                        if (!IsOnBed()) return;
+                        tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria.
+                        tria->GradjDragGradient(gradient,resp);
+                        delete tria->matice; delete tria;
+                        break;
+                default:
+                        _error_("response %s not supported yet",EnumToStringx(responses[resp]));
         }
 }
@@ -5046 +5074 @@
                 /*Create inputs and add to DataSetInput*/
                 DatasetInput* datasetinput=new DatasetInput(WeightsEnum);
-                for(j=0;j<iomodel->num_cm_responses;j++){
-                        for(i=0;i<6;i++)nodeinputs[i]=iomodel->weights[penta_vertex_ids[i]-1];
+                for(i=0;i<iomodel->num_cm_responses;i++){
+                        for(j=0;j<6;j++)nodeinputs[j]=iomodel->weights[(penta_vertex_ids[j]-1)*iomodel->num_cm_responses+i];
                         datasetinput->inputs->AddObject(new PentaVertexInput(WeightsEnum,nodeinputs));
                 }