Changeset 23049

Timestamp:

08/03/18 09:35:39 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing ADOLC, added switch to select correct solver type when MUMPS and GSL are available in serial

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (1 diff)
• modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (modified) (1 diff)
• toolkits/issm/IssmDenseMat.h (modified) (2 diffs)

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

@@ -1944 +1944 @@
 
                                                         }
-                                                        if (!isarray){
+                                                        if(!isarray){
                                                                 Vector<IssmDouble> *vector_result = new Vector<IssmDouble>(size);
 

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

@@ -38 +38 @@
                 options=OptionsFromAnalysis(&toolkit,parameters,DefaultAnalysisEnum);
                 ToolkitOptions::Init(toolkit,options);
+                xDelete<char>(toolkit);
 
                 switch(IssmSolverTypeFromToolkitOptions()){

issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h

@@ -18 +18 @@
 
 #include "./IssmSeqVec.h"
+#include "./IssmToolkitUtils.h"
 #include "../../shared/shared.h"
 #include "../gsl/gslincludes.h"
@@ -272 +273 @@
                         pf=(IssmSeqVec<IssmDouble>*)pfin;
 
+                        switch(IssmSolverTypeFromToolkitOptions()){
                         #ifdef _HAVE_MUMPS_
-                        /*Assume we have a sequential vec, downcast*/
-                        uf=((IssmSeqVec<IssmDouble>*)pfin)->Duplicate();
-                        SeqDenseMumpsSolve(uf->vector,uf->M,uf->M, /*stiffness matrix:*/ this->matrix,this->M,this->N,this->M, /*right hand side load vector: */ pf->vector,pf->M,pf->M,parameters);
-                        return uf;
+                                case MumpsEnum: {
+                                        /*Assume we have a sequential vec, downcast*/
+                                        uf=((IssmSeqVec<IssmDouble>*)pfin)->Duplicate();
+                                        SeqDenseMumpsSolve(uf->vector,uf->M,uf->M, /*stiffness matrix:*/ this->matrix,this->M,this->N,this->M, /*right hand side load vector: */ pf->vector,pf->M,pf->M,parameters);
+                                        return uf;
+                                                                         }
                         #endif
-
                         #ifdef _HAVE_GSL_
-                        DenseGslSolve(/*output*/ &x,/*stiffness matrix:*/ this->matrix,this->M,this->N, /*right hand side load vector: */ pf->vector,pf->M,parameters);
-
-                        uf=new IssmSeqVec<IssmDouble>(x,this->N); xDelete(x);
-                        return uf;
+                                case GslEnum: {
+                                        DenseGslSolve(/*output*/ &x,/*stiffness matrix:*/ this->matrix,this->M,this->N, /*right hand side load vector: */ pf->vector,pf->M,parameters);
+                                        uf=new IssmSeqVec<IssmDouble>(x,this->N); xDelete(x);
+                                        return uf;
+                                                                  }
                         #endif
-
-                        _error_("No solver available");
+                                default: _error_("No solver available");
+                        }
+
                         return NULL;