Changeset 13546

Timestamp:

10/04/12 18:53:57 (12 years ago)

Author:

Eric.Larour

Message:

CHG: shielding CreateParametersAutodiff with HAVE_ADOLC macro.
Some cosmetics for ad_core (thanks Mathieu :)

Location:

issm/trunk-jpl/src/c

Files:

• modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (modified) (2 diffs)
• solutions/ad_core.cpp (modified) (6 diffs)

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

@@ -39 +39 @@
         
         if(autodiff_analysis){
+
+                #ifdef _HAVE_ADOLC_
         
                 /*Copy some parameters from IoModel to parameters dataset: */
@@ -122 +124 @@
         /*}}}*/
 
+                #endif
+
                 /*Assign output pointer: */
                 *pparameters=parameters;

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

@@ -45 +45 @@
                 #ifdef _HAVE_ADOLC_
 
-                        if(VerboseAutodiff())_pprintLine_("   start ad core");
                 
                         /*First, stop tracing: */
@@ -54 +53 @@
                         femmodel->parameters->FindParam(&num_independents,AutodiffNumIndependentsEnum);
                         if(!(num_dependents*num_independents)) return;
+                        
+                        if(VerboseAutodiff())_pprintLine_("   start ad core");
                         
                         /*retrieve state variable: */
@@ -119 +120 @@
                                 double  *theOutput     = NULL;
                                 std::set<unsigned int> anIndexSet;
+                                        
                                         
                                 /*retrieve directions:*/
@@ -276 +278 @@
                         else _error_("driver: " << driver << " not yet supported!");
 
+
                         /* delete the allocated space for the parameters:*/
                         xDelete(anEDF_for_solverx_p->dp_x);
@@ -288 +291 @@
                         xDelete(anEDF_for_solverx_p->dpp_Z);
         
-                        /*Print statistics: {{{*/
+                        /*Print statistics:*/
                         tapestats(1,tape_stats); //reading of tape statistics
                         if(VerboseAutodiff()){
@@ -300 +303 @@
                         }
                         if(VerboseAutodiff())_pprintLine_("   end AD core");
-                        /*}}}*/
                         
                         /*Free resources: */