Changeset 24686 for issm/trunk/src/c/classes/Loads/Numericalflux.cpp

Timestamp:

04/01/20 21:54:40 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24684

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/Loads/Numericalflux.cpp (modified) (6 diffs)

issm/trunk/src/c/classes/Loads/Numericalflux.cpp

@@ -516 +516 @@
         /*Retrieve all inputs and parameters*/
         GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
-        Input* vxaverage_input=tria->inputs->GetInput(VxEnum);
-        Input* vyaverage_input=tria->inputs->GetInput(VyEnum);
+        Input2* vxaverage_input=tria->GetInput2(VxEnum); _assert_(vxaverage_input); 
+        Input2* vyaverage_input=tria->GetInput2(VyEnum); _assert_(vyaverage_input); 
         GetNormal(&normal[0],xyz_list);
 
@@ -591 +591 @@
         /*Retrieve all inputs and parameters*/
         GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
-        Input* vxaverage_input=tria->inputs->GetInput(VxEnum);
-        Input* vyaverage_input=tria->inputs->GetInput(VyEnum);
+        Input2* vxaverage_input=tria->GetInput2(VxEnum); _assert_(vxaverage_input); 
+        Input2* vyaverage_input=tria->GetInput2(VyEnum); _assert_(vyaverage_input); 
         GetNormal(&normal[0],xyz_list);
 
@@ -688 +688 @@
         GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
         IssmDouble dt = parameters->FindParam(TimesteppingTimeStepEnum);
-        Input* vxaverage_input=tria->inputs->GetInput(VxEnum); _assert_(vxaverage_input);
-        Input* vyaverage_input=tria->inputs->GetInput(VyEnum); _assert_(vyaverage_input);
+        Input2* vxaverage_input=tria->GetInput2(VxEnum); _assert_(vxaverage_input);
+        Input2* vyaverage_input=tria->GetInput2(VyEnum); _assert_(vyaverage_input);
         GetNormal(&normal[0],xyz_list);
 
@@ -764 +764 @@
         GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
         IssmDouble dt = parameters->FindParam(TimesteppingTimeStepEnum);
-        Input* vxaverage_input=tria->inputs->GetInput(VxEnum);
-        Input* vyaverage_input=tria->inputs->GetInput(VyEnum);
+        Input2* vxaverage_input=tria->GetInput2(VxEnum); _assert_(vxaverage_input); 
+        Input2* vyaverage_input=tria->GetInput2(VyEnum); _assert_(vyaverage_input); 
         GetNormal(&normal[0],xyz_list);
 
@@ -866 +866 @@
         /*Retrieve all inputs and parameters*/
         GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
-        Input* vxaverage_input = tria->inputs->GetInput(VxEnum);        _assert_(vxaverage_input);
-        Input* vyaverage_input = tria->inputs->GetInput(VyEnum);        _assert_(vyaverage_input);
-        Input* thickness_input = tria->inputs->GetInput(ThicknessEnum); _assert_(thickness_input);
+        Input2* vxaverage_input = tria->GetInput2(VxEnum);        _assert_(vxaverage_input);
+        Input2* vyaverage_input = tria->GetInput2(VyEnum);        _assert_(vyaverage_input);
+        Input2* thickness_input = tria->GetInput2(ThicknessEnum); _assert_(thickness_input);
         GetNormal(&normal[0],xyz_list);
 
@@ -947 +947 @@
         GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
         IssmDouble dt = parameters->FindParam(TimesteppingTimeStepEnum);
-        Input* vxaverage_input    = tria->inputs->GetInput(VxEnum);                        _assert_(vxaverage_input);
-        Input* vyaverage_input    = tria->inputs->GetInput(VyEnum);                        _assert_(vyaverage_input);
-        Input* spcthickness_input = tria->inputs->GetInput(MasstransportSpcthicknessEnum); _assert_(spcthickness_input);
+        Input2* vxaverage_input    = tria->GetInput2(VxEnum);                        _assert_(vxaverage_input);
+        Input2* vyaverage_input    = tria->GetInput2(VyEnum);                        _assert_(vyaverage_input);
+        Input2* spcthickness_input = tria->GetInput2(MasstransportSpcthicknessEnum); _assert_(spcthickness_input);
         GetNormal(&normal[0],xyz_list);