Changeset 13445

Timestamp:

09/26/12 07:42:29 (12 years ago)

Author:

Eric.Larour

Message:

CHG: move trace_on for ADOLC within the IoModel constructor.

Location:

issm/trunk-jpl/src/c

Files:

• classes/IoModel.cpp (modified) (2 diffs)
• solutions/issm.cpp (modified) (1 diff)

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

@@ -53 +53 @@
         for(int i=0;i<MaximumNumberOfEnums;i++) this->data[i]=NULL;
 
-        /*If we are running in AD mode, we need to declare our independent variables now, 
+        /*If we are running in AD mode, we need to start the trace and declare our independent variables now, 
          *and prevent them from being erased during successive calls to iomodel->FetchConstants, iomodel->FetchData and 
          iomodel->DeleteData:*/
@@ -220 +220 @@
         this->FetchData(&autodiff,AutodiffIsautodiffEnum);
         if(autodiff){
-        
+
                 this->FetchData(&numberofvertices,MeshNumberofverticesEnum);
                 
                 #ifdef _HAVE_ADOLC_
+
+                /*Start the trace: */
+                trace_on(1);
+
                 /*build dataset made of independent objects: */
                 this->independent_objects=new DataSet();

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

@@ -80 +80 @@
         /*out of solution_type, figure out types of analyses needed in the femmodel: */
         AnalysisConfiguration(&analyses,&numanalyses,solution_type);
-
-        /*before we create the model, start the trace on for AD mode: */
-        #ifdef _HAVE_ADOLC_
-        trace_on(1);
-        #endif
 
         /*Create femmodel, using input file: */