Changeset 24335 for issm/trunk-jpl/src/c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp

Timestamp:

11/15/19 16:28:40 (5 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added Inputs2, TODO: still AMR, GEMB and DC do not work, and need to delete current Inputs

File:

• issm/trunk-jpl/src/c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp (modified) (2 diffs)

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

@@ -7 +7 @@
 #include "../../shared/shared.h"
 #include "../../toolkits/toolkits.h"
+#include "../../classes/Inputs2/DatasetInput2.h"
 
 void SurfaceAbsVelMisfitx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
@@ -59 +60 @@
 
         /*Retrieve all inputs we will be needing: */
-        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);
-        Input* vy_input     = NULL;
-        Input* vyobs_input  = NULL;
+        DatasetInput2* weights_input=topelement->GetDatasetInput2(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input);
+        Input2* vx_input     =topelement->GetInput2(VxEnum);                                 _assert_(vx_input);
+        Input2* vxobs_input  =topelement->GetInput2(InversionVxObsEnum);                     _assert_(vxobs_input);
+        Input2* vy_input     = NULL;
+        Input2* vyobs_input  = NULL;
         if(numcomponents==2){
-                vy_input    =topelement->GetInput(VyEnum);              _assert_(vy_input);
-                vyobs_input =topelement->GetInput(InversionVyObsEnum);  _assert_(vyobs_input);
+                vy_input    =topelement->GetInput2(VyEnum);              _assert_(vy_input);
+                vyobs_input =topelement->GetInput2(InversionVyObsEnum);  _assert_(vyobs_input);
         }