Changeset 18054

Timestamp:

05/23/14 15:07:07 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying adjoint

File:

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

issm/trunk-jpl/src/c/analyses/AdjointBalancethickness2Analysis.cpp

@@ -49 +49 @@
         int         num_responses,i;
         IssmDouble  hobs,hu2,weight,NUMx,NUMy,DEN,Jdet;
-        IssmDouble  vx,vy,vbar2,nux,nuy,dphi[2];
+        IssmDouble  vx,vy,vbar2,nux,nuy,phi,dphi[2];
         int        *responses = NULL;
         IssmDouble *xyz_list  = NULL;
@@ -86 +86 @@
                 nux_input->GetInputValue(&nux,gauss);
                 nuy_input->GetInputValue(&nuy,gauss);
+                potential_input->GetInputValue(&phi,gauss);
                 potential_input->GetInputDerivativeValue(&dphi[0],xyz_list,gauss);
                 thicknessobs_input->GetInputValue(&hobs,gauss);
@@ -102 +103 @@
                         switch(responses[resp]){
                                 case Balancethickness2MisfitEnum:
-                                        for(i=0;i<numnodes;i++) pe->values[i]+=(NUMx+NUMy)/DEN *weight*Jdet*gauss->weight;
+                                        //for(i=0;i<numnodes;i++) pe->values[i]+=(NUMx+NUMy)/DEN *weight*Jdet*gauss->weight;
+                                        for(i=0;i<numnodes;i++) pe->values[i]+= phi*basis[i]*weight*Jdet*gauss->weight;
                                         break;
                                 default: