Changeset 23252

Timestamp:

09/11/18 09:51:31 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: compile the code with CoDiPack in

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/FemModel.cpp (modified) (1 diff)
• classes/IoModel.cpp (modified) (1 diff)
• cores/controlm1qn3_core.cpp (modified) (1 diff)
• cores/transient_core.cpp (modified) (5 diffs)
• modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (modified) (1 diff)
• modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am ¶

@@ -51 +51 @@
                                          ./modules/BamgTriangulatex/BamgTriangulatex.cpp
 
-#do not include AmrBamg with ADOLC
+#do not include AmrBamg with AD
 if ADOLC
 else
+if CODIPACK
+else
 issm_sources += ./classes/AmrBamg.cpp
+endif
 endif
 endif

issm/trunk-jpl/src/c/classes/FemModel.cpp ¶

@@ -2545 +2545 @@
 
 /*AMR*/
-#if !defined(_HAVE_ADOLC_)
+#ifndef _HAVE_AD_
 void FemModel::ReMesh(void){/*{{{*/
 

issm/trunk-jpl/src/c/classes/IoModel.cpp ¶

@@ -2635 +2635 @@
                 tape_codi.registerInput(y_t);
                 int codi_allocn = 0;
-                this->FetchData(&codi_allocn, AutodiffTapeAllocEnum);
+                this->FetchData(&codi_allocn,"md.autodiff.tapeAlloc");
                 for(int i = 0;i < codi_allocn;++i) {
                         x_t = y_t * y_t;

issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp ¶

@@ -11 +11 @@
 #include "../solutionsequences/solutionsequences.h"
 
-#if defined (_HAVE_M1QN3_) && !defined(_HAVE_ADOLC_)
+#if defined (_HAVE_M1QN3_) && !defined(_HAVE_AD_)
 /*m1qn3 prototypes*/
 extern "C" void *ctonbe_; // DIS mode : Conversion

issm/trunk-jpl/src/c/cores/transient_core.cpp ¶

@@ -70 +70 @@
         if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,TransientRequestedOutputsEnum);
 
-        #if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
+        #if defined(_HAVE_BAMG_) && !defined(_HAVE_AD_)
         if(amr_frequency){
                 femmodel->parameters->FindParam(&amr_restart,AmrRestartEnum);
@@ -78 +78 @@
 
         if(isoceancoupling){ /*{{{*/
-                #ifndef _HAVE_ADOLC_
+                #ifndef _HAVE_AD_
                 if(VerboseSolution()) _printf0_("   ocean coupling: initialization \n");
                 int my_rank;
@@ -247 +247 @@
                 if(isoceancoupling){ /*{{{*/
 
-                        #ifndef _HAVE_ADOLC_
+                        #ifndef _HAVE_AD_
                         if(VerboseSolution()) _printf0_("   ocean coupling: exchanging information\n");
                         int my_rank;
@@ -460 +460 @@
                 if(amr_frequency){
 
-                        #if !defined(_HAVE_ADOLC_)
+                        #if !defined(_HAVE_AD_)
                         if(save_results) femmodel->WriteMeshInResults();
                         if(step%amr_frequency==0 && time<finaltime){
@@ -468 +468 @@
 
                         #else
-                        _error_("AMR not suppored with ADOLC");
+                        _error_("AMR not suppored with AD");
                         #endif
                 }

issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp ¶

@@ -94 +94 @@
 
 /*For autodiff, we sometimes need to cast our vectors to passive*/
-#ifdef _HAVE_ADOLC_
+#ifdef _HAVE_AD_
 void GetPassiveVectorFromControlInputsx(Vector<IssmPDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data){/*{{{*/
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp ¶

@@ -77 +77 @@
                 /*initialize a placeholder to store solver pointers: {{{*/
                 /*Solver pointers depend on what type of solver we are implementing: */
-                options=OptionsFromAnalysis(parameters,DefaultAnalysisEnum); //options database is not filled in yet, use default.
-                ToolkitOptions::Init(options);
+                options=OptionsFromAnalysis(&toolkit,parameters,DefaultAnalysisEnum);
+                ToolkitOptions::Init(toolkit,options);
+                xDelete<char>(toolkit);
 
                 switch(IssmSolverTypeFromToolkitOptions()){