Changeset 25836 for issm/trunk/src/c/analyses/LoveAnalysis.cpp

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/analyses/LoveAnalysis.cpp (modified) (2 diffs)

issm/trunk/src/c

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

issm/trunk/src/c/analyses/LoveAnalysis.cpp

@@ -15 +15 @@
         _error_("not needed!");
 }/*}}}*/
-void LoveAnalysis::UpdateElements(Elements* elements,Inputs2* inputs2,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
+void LoveAnalysis::UpdateElements(Elements* elements,Inputs* inputs,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
 
 }/*}}}*/
@@ -67 +67 @@
            _error_("not implemented yet");
 }/*}}}*/
-void           LoveAnalysis::GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index){/*{{{*/
+void           LoveAnalysis::GradientJ(Vector<IssmDouble>* gradient,Element*  element,int control_type,int control_interp,int control_index){/*{{{*/
         _error_("Not implemented yet");
 }/*}}}*/

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post