Changeset 13185

Timestamp:

08/30/12 06:59:13 (13 years ago)

Author:

utke

Message:

NEW : register externally differentiated function for ADOL-C ; introduce a generic parameter class to hold a structure of such registry items

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (2 diffs)
• classes/objects/Params/GenericParam.h (added)
• classes/objects/objects.h (modified) (1 diff)
• modules/Solverx/Solverx.h (modified) (1 diff)
• modules/Solverx/SolverxSeq.cpp (modified) (2 diffs)
• shared/Numerics/adolc_edf.h (added)
• solutions/issm.cpp (modified) (2 diffs)

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

@@ -136 +136 @@
                                         ./classes/matrix/Vector.cpp\
                                         ./classes/objects/Params/Param.h\
+                                        ./classes/objects/Params/GenericParam.h\
                                         ./classes/objects/Params/BoolParam.cpp\
                                         ./classes/objects/Params/BoolParam.h\
@@ -196 +197 @@
                                         ./shared/Matrix/matrix.h\
                                         ./shared/Matrix/MatrixUtils.cpp\
+                                        ./shared/Numerics/adolc_edf.h\
                                         ./shared/Numerics/numerics.h\
                                         ./shared/Numerics/Verbosity.h\

issm/trunk-jpl/src/c/classes/objects/objects.h

@@ -112 +112 @@
 
 /*Params: */
+#include "./Params/GenericParam.h"
 #include "./Params/BoolParam.h"
 #include "./Params/DoubleMatParam.h"

issm/trunk-jpl/src/c/modules/Solverx/Solverx.h

@@ -27 +27 @@
 void SolverxSeq(double** pX,double* A,double* B,int n);
 
+#ifdef _HAVE_ADOLC_
+ADOLC_ext_fct EDF_for_solverx;
+#endif
+
 #endif  /* _SOLVERX_H */
 

issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp

@@ -45 +45 @@
 }/*}}}*/
 #ifdef _HAVE_ADOLC_
+
+int EDF_for_solverx(int n, IssmPDouble *x, int m, IssmPDouble *y) {
+    if(m*(m+1)!=n)_error_("Stiffness matrix should be square!");
+    SolverxSeq(&y,x, x+m*m, m);
+    return 0;
+}
+
 void SolverxSeq(IssmDouble** pX,IssmDouble* A,IssmDouble* B,int n){//{{{
         /* if we use Adol-C then the IssmDouble will be an adouble
@@ -61 +68 @@
 
         /*First, transfer from IssmDouble to double all our matrices and vectors: */
-        pdoubleA=xNew<double>(n*n);
-        pdoubleB=xNew<double>(n);
+        pdoubleA=xNew<IssmPDouble>(n*n);
+        pdoubleB=xNew<IssmPDouble>(n);
         for(i=0;i<n*n;i++)pdoubleA[i]=reCast<IssmPDouble>(A[i]);
         for(i=0;i<n;i++)pdoubleB[i]=reCast<IssmPDouble>(B[i]);

issm/trunk-jpl/src/c/solutions/issm.cpp

@@ -5 +5 @@
 #include "../issm.h"
 #include "../include/globals.h"
+#include "../shared/Numerics/adolc_edf.h"
 
 int main(int argc,char **argv){
@@ -119 +120 @@
         /*If running AD, then initialize the tape: */
         #ifdef _HAVE_ADOLC_
+        GenericParam<Adolc_edf> *theAdolcEDF_p=new GenericParam<Adolc_edf>(AdolcParamEnum);
+        theAdolcEDF_p->GetParameterValue().myEDF_for_solverx_p=reg_ext_fct(EDF_for_solverx);
+        femmodel->parameters->AddObject(theAdolcEDF_p);
         if(autodiff) trace_on(1);
         #endif