Changeset 13516 for issm/trunk-jpl/src/c/classes/IoModel.cpp

Timestamp:

10/03/12 09:09:23 (12 years ago)

Author:

Eric.Larour

Message:

CHG: modified the way we set keep for trace initialization in AD mode. This is now
decided by the AutodiffKeepEnum boolean, which is initialized by the autodiff class,
instead of this logic happening inside IoModel.cpp.
Also added test3020 which tests forward difference vs AD driver.

File:

• issm/trunk-jpl/src/c/classes/IoModel.cpp (modified) (2 diffs)

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

@@ -212 +212 @@
         int         numberofvertices;
         int         dummy;
-        char*       driver=NULL;
+        bool        keep=false;
 
 
@@ -226 +226 @@
                 #ifdef _HAVE_ADOLC_
 
-                /*Start the trace:  {{{
-                 * to do so, figure out what kind of driver we are running. Then, according to ADOLC documentation, 
-                 * we'll need to activate keep. 
-                 *
-                 * From ADOLC userdoc: 
-                 * The optional integer argument keep of trace on determines whether the numerical values of all active variables are 
-                 * recorded in a buffered temporary array or file called the taylor stack. This option takes effect if keep = 1 and 
-                 * prepares the scene for an immediately following gradient evaluation by a call to a routine implementing the reverse 
-                 * mode as described in the Section 4 and Section 5. 
-                 *
-                 */
-                this->FetchData(&driver,AutodiffDriverEnum);
-                if (strlen(driver)<=3){
-                        /*there is no "_reverse" string within the driver string: */
-                        if(VerboseAutodiff())_pprintLine_("   trace activated with keep off");
-                        trace_on(1);
-                }
-                else{
-                        if (strncmp((const char*)(driver+3),"_reverse",8)==0){
-                                if(VerboseAutodiff())_pprintLine_("   trace activated with keep on");
-                                trace_on(1,1);
-                        }
-                        else{
-                                if(VerboseAutodiff())_pprintLine_("   trace activated with keep off");
-                                trace_on(1);
-                        }
-                }
-                xDelete<char>(driver);
+                /*Start trace: {{{*/
+                this->FetchData(&keep,AutodiffKeepEnum);
+                if(keep)trace_on(1,1);
+                else    trace_on(1);
+
                 /*}}}*/
                 /*build dataset made of independent objects: {{{*/