Changeset 22437 for issm/trunk-jpl/src/c/modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp

Timestamp:

02/21/18 10:35:16 (7 years ago)

Author:

erobo

Message:

ADD: allows AD to be used with m1qn3 core, not compliled in now (dead code)

File:

• issm/trunk-jpl/src/c/modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp

@@ -62 +62 @@
 
         /*Retrieve all inputs we will be needing: */
-        Input* weights_input=topelement->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input);
+//      Input* weights_input=topelement->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input);
         Input* vx_input     =topelement->GetInput(VxEnum);                                 _assert_(vx_input);
         Input* vxobs_input  =topelement->GetInput(InversionVxObsEnum);                     _assert_(vxobs_input);
@@ -82 +82 @@
 
                 /*Get all parameters at gaussian point*/
-                weights_input->GetInputValue(&weight,gauss,SurfaceLogVelMisfitEnum);
+                //weights_input->GetInputValue(&weight,gauss,SurfaceLogVelMisfitEnum);
                 vx_input->GetInputValue(&vx,gauss);
                 vxobs_input->GetInputValue(&vxobs,gauss);
@@ -106 +106 @@
 
                 misfit=4*pow(meanvel,2)*pow(log(velocity_mag/obs_velocity_mag),2);
-
+                weight = 1.;
                 /*Add to cost function*/
                 Jelem+=misfit*weight*Jdet*gauss->weight;