Changeset 14975

Timestamp:

05/09/13 01:46:02 (12 years ago)

Author:

Eric.Larour

Message:

CHG: cleanup the shared/Numerics directory. Took out the IsInputConverged, ToolkitsOptionsFromAnalysis and OptionsFromAnalysis
and put them into the Container/ Inputs and Parameters files. This uncovered a bunch of cyclical dependencies that needed fixing.

Location:

issm/trunk-jpl/src/c

Files:

• Container/Constraints.h (modified) (1 diff)
• Container/DataSet.h (modified) (1 diff)
• Container/Elements.cpp (modified) (1 diff)
• Container/Elements.h (modified) (1 diff)
• Container/Inputs.cpp (modified) (1 diff)
• Container/Inputs.h (modified) (2 diffs)
• Container/Loads.cpp (modified) (1 diff)
• Container/Loads.h (modified) (1 diff)
• Container/Materials.h (modified) (1 diff)
• Container/Nodes.h (modified) (1 diff)
• Container/Options.cpp (modified) (1 diff)
• Container/Parameters.cpp (modified) (2 diffs)
• Container/Parameters.h (modified) (2 diffs)
• Container/Results.h (modified) (1 diff)
• Container/Vertices.cpp (modified) (1 diff)
• Container/Vertices.h (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• classes/IoModel.cpp (modified) (1 diff)
• classes/kriging/ExponentialVariogram.cpp (modified) (1 diff)
• classes/kriging/GaussianVariogram.cpp (modified) (1 diff)
• classes/kriging/PowerVariogram.cpp (modified) (1 diff)
• classes/kriging/SphericalVariogram.cpp (modified) (1 diff)
• classes/objects/DependentObject.h (modified) (1 diff)
• classes/objects/ElementResults/ElementResult.h (modified) (1 diff)
• classes/objects/Loads/Icefront.cpp (modified) (2 diffs)
• classes/objects/Loads/Icefront.h (modified) (1 diff)
• classes/objects/Loads/Load.h (modified) (1 diff)
• classes/objects/Loads/Numericalflux.cpp (modified) (2 diffs)
• classes/objects/Loads/Penpair.cpp (modified) (2 diffs)
• classes/objects/Materials/Matdamageice.cpp (modified) (2 diffs)
• classes/objects/Materials/Matice.cpp (modified) (2 diffs)
• classes/objects/Options/GenericOption.h (modified) (1 diff)
• classes/objects/Vertex.cpp (modified) (1 diff)
• modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (modified) (1 diff)
• modules/Reducevectorgtofx/Reducevectorgtofx.h (modified) (1 diff)
• modules/Reducevectorgtosx/Reducevectorgtosx.h (modified) (1 diff)
• shared/Elements/Arrhenius.cpp (modified) (1 diff)
• shared/Elements/elements.h (modified) (1 diff)
• shared/Numerics/IsInputConverged.cpp (deleted)
• shared/Numerics/OptionsFromAnalysis.cpp (deleted)
• shared/Numerics/ToolkitsOptionsFromAnalysis.cpp (deleted)
• shared/Numerics/numerics.h (modified) (2 diffs)
• shared/Numerics/recast.h (modified) (3 diffs)

issm/trunk-jpl/src/c/Container/Constraints.h

@@ -4 +4 @@
 /*forward declarations */
 #include "./DataSet.h"
-class Materials;
-class Parameters;
-class Elements;
-class Vertices;
-class Loads;
-class Nodes;
-class Inputs;
 
 #include "../shared/Enum/Enum.h"

issm/trunk-jpl/src/c/Container/DataSet.h

@@ -9 +9 @@
 /*forward declarations */
 class Object;
-class Elements;
-class Loads;
-class Nodes;
-class Vertices;
-class Materials;
-class Parameters;
-class Patch;
 class Results;
-class Patch;
 
 /*! \brief Declaration of DataSet class

issm/trunk-jpl/src/c/Container/Elements.cpp

@@ -12 +12 @@
 
 #include "./Elements.h"
+#include "./Results.h"
 #include "./Parameters.h"
 #include "../classes/classes.h"

issm/trunk-jpl/src/c/Container/Elements.h

@@ -6 +6 @@
 class Materials;
 class Parameters;
-class Elements;
 class Vertices;
 class Loads;
 class Nodes;
-class Inputs;
+class Patch;
 
 /*! \brief Declaration of Elements class 

issm/trunk-jpl/src/c/Container/Inputs.cpp

@@ -426 +426 @@
 }
 /*}}}*/
+
+/*Methods relating to inputs: */
+void IsInputConverged(IssmDouble* peps, Input** new_inputs,Input** old_inputs,int num_inputs,int criterion_enum){ /*{{{*/
+ 
+        /*figure out convergence at the input level. 
+          We are given a list of inputs, new and old, and a criterion, and using the
+          inputs, we return the value of the criterion test, which will be used at the
+          solution level to determine convergence.
+          */ 
+
+        int i,j;
+
+        /*output: */
+        IssmDouble eps;
+
+        /*intermediary: */
+        IssmDouble *newvalues     = NULL;
+        IssmDouble *oldvalues     = NULL;
+        int     num_values;
+        IssmDouble  ndu        = 0;
+        IssmDouble  nu         = 0;
+
+        if(criterion_enum==RelativeEnum){
+
+                /*conpute ndu/du (where u could be velocity, pressure, temperature, etc ...): */
+                for(i=0;i<num_inputs;i++){
+
+                        /*in debugging mode, check that the inputs are of the same type*/
+                        _assert_(new_inputs[i]->ObjectEnum()==old_inputs[i]->ObjectEnum());
+
+                        /*Get pointers*/
+                        new_inputs[i]->GetValuesPtr(&newvalues,&num_values);
+                        old_inputs[i]->GetValuesPtr(&oldvalues,&num_values);
+                        for(j=0;j<num_values;j++){
+                                ndu+=pow(newvalues[j]-oldvalues[j],2);
+                                nu+=pow(oldvalues[j],2);
+                        }
+                }
+
+                /*take square root: */
+                ndu=sqrt(ndu);
+                nu=sqrt(nu);
+
+                /*now, compute eps: */
+                if(reCast<bool>(nu))eps=ndu/nu;
+                else eps=0;
+        }
+        else _error_("convergence criterion " << EnumToStringx(criterion_enum) << " not supported yet!");
+
+        /*Assign output pointers:*/
+        *peps=eps;
+}
+/*}}}*/

issm/trunk-jpl/src/c/Container/Inputs.h

@@ -5 +5 @@
 class Parameters;
 class Input;
+
 #include "./DataSet.h"
 #include "../shared/Numerics/types.h"
@@ -42 +43 @@
 };
 
+/*Methods relating to inputs: */
+void IsInputConverged(IssmDouble* peps, Input** new_inputs,Input** old_inputs,int num_inputs,int criterion_enum);
+
 #endif //ifndef _INPUTS_H_

issm/trunk-jpl/src/c/Container/Loads.cpp

@@ -16 +16 @@
 #include <iostream>
 
-#include "./DataSet.h"
+#include "./Loads.h"
 #include "../shared/shared.h"
 #include "../shared/Enum/Enum.h"

issm/trunk-jpl/src/c/Container/Loads.h

@@ -3 +3 @@
 
 /*forward declarations */
+#include "./DataSet.h"
 class Materials;
 class Parameters;
 class Elements;
 class Vertices;
-class Loads;
 class Nodes;
-class DataSet;
-class Inputs;
 
 /*!\brief Declaration of Loads class.

issm/trunk-jpl/src/c/Container/Materials.h

@@ -9 +9 @@
 class Loads;
 class Nodes;
-class Inputs;
 
 /*! \brief Declaration of Materials class.

issm/trunk-jpl/src/c/Container/Nodes.h

@@ -3 +3 @@
 
 #include "./DataSet.h"
+class Parameters;
+class Elements;
+class Vertices;
+class Loads;
+class Nodes;
+class Materials;
+
 
 /*!\brief Declaration of Nodes class.

issm/trunk-jpl/src/c/Container/Options.cpp

@@ -16 +16 @@
 
 #include "./DataSet.h"
+#include "./Options.h"
 #include "../shared/shared.h"
 #include "../shared/io/io.h"

issm/trunk-jpl/src/c/Container/Parameters.cpp

@@ -16 +16 @@
 #include <iostream>
 
-#include "./DataSet.h"
+#include "./Parameters.h"
 #include "../shared/shared.h"
 #include "../shared/Enum/Enum.h"
@@ -490 +490 @@
 }
 /*}}}*/
+
+/*Methods relating to parameters: */
+char* OptionsFromAnalysis(Parameters* parameters,int analysis_type){ /*{{{*/
+
+        /* figure out ISSM options for current analysis, return a string. */ 
+
+        /*output: */
+        char*   outstring=NULL;
+
+        /*intermediary: */
+        int          dummy;
+        IssmDouble  *analyses    = NULL;
+        char       **strings     = NULL;
+        char        *string      = NULL;
+        int          numanalyses;
+        int          found       = -1;
+        int          i;
+
+        numanalyses=0;
+        parameters->FindParam(&strings,&numanalyses,ToolkitsOptionsStringsEnum);
+
+        parameters->FindParam(&analyses,&dummy,ToolkitsOptionsAnalysesEnum);
+
+        if(numanalyses==0)return NULL; //we did not find petsc options, don't bother.
+
+        /*ok, go through analyses and figure out if it corresponds to our analysis_type: */
+        for(i=0;i<numanalyses;i++){
+                if(analyses[i]==analysis_type){
+                        found=i;
+                        break;
+                }
+        }
+        if(found==-1){
+                /*still haven't found a list of petsc options, go find the default one, for analysis type NoneAnalysisEnum: */
+                for(i=0;i<numanalyses;i++){
+                        if(analyses[i]==DefaultAnalysisEnum){
+                                found=i;
+                                break;
+                        }
+                }
+        }
+        if (found==-1){
+                _error_("could find neither a default analysis nor analysis " << EnumToStringx(analysis_type));
+        }
+
+        /*ok, grab the option string: */
+        outstring=xNew<char>(strlen(strings[found])+1);
+        strcpy(outstring,strings[found]);
+
+        /*Free ressources*/
+        xDelete<IssmDouble>(analyses);
+        for(i=0;i<numanalyses;i++){
+                string=strings[i];
+                xDelete<char>(string);
+        }
+        xDelete<char*>(strings);
+        return outstring;
+} 
+/*}}}*/
+void ToolkitsOptionsFromAnalysis(Parameters* parameters,int analysis_type){ /*{{{*/
+
+        /*!\file:  ToolkitsOptionsFromAnalysis.cpp
+         * \brief: for each analysis, setup the issmoptions string. 
+         * This is mainly for the case where we run our toolkits using petsc. In this case, we need to 
+         * plug our toolkits options directly into the petsc options database. This is the case for each analysis type 
+         * and parameters
+         */ 
+
+
+        char* options=NULL;
+
+        /*Recover first the options string for this analysis: */
+        options=OptionsFromAnalysis(parameters,analysis_type);
+
+        /*Initialize our Toolkit Options: */
+        ToolkitOptions::Init(options);
+
+        #ifdef _HAVE_PETSC_
+                /*In case we are using PETSC, we do not rely on issmoptions. Instead, we dump issmoptions into the Petsc 
+                 * options database: */
+
+                #if _PETSC_MAJOR_ == 2 
+                PetscOptionsDestroy();
+                PetscOptionsCreate();
+                //PetscOptionsCheckInitial_Private();
+                //PetscOptionsCheckInitial_Components();
+                PetscOptionsSetFromOptions();
+                PetscOptionsInsertMultipleString(options); //our patch
+                #else
+                PetscOptionsSetFromOptions();
+                PetscOptionsClear();
+                //PetscOptionsSetFromOptions();
+                PetscOptionsInsertMultipleString(options); //our patch
+                #endif
+
+        #endif
+
+        xDelete<char>(options);
+}
+/*}}}*/

issm/trunk-jpl/src/c/Container/Parameters.h

@@ -6 +6 @@
 template <class doublematrix> class Matrix;
 template <class doubletype> class Vector;
-class Materials;
-class Parameters;
-class Elements;
-class Vertices;
-class Loads;
-class Nodes;
-class Inputs;
 #include "./DataSet.h"
 #include "../shared/Numerics/types.h"
@@ -65 +58 @@
 };
 
+/*Methods relating to parameters: */
+char       *OptionsFromAnalysis(Parameters *parameters,int analysis_type);
+void        ToolkitsOptionsFromAnalysis(Parameters* parameters,int analysis_type);
+
+
 #endif //ifndef _PARAMETERS_H_

issm/trunk-jpl/src/c/Container/Results.h

@@ -5 +5 @@
 
 /*forward declarations */
-class Materials;
 class Parameters;
-class Elements;
-class Vertices;
-class Loads;
-class Nodes;
-class Inputs;
 
 /*!\brief Declaration of Results class.

issm/trunk-jpl/src/c/Container/Vertices.cpp

@@ -16 +16 @@
 #include <iostream>
 
-#include "./DataSet.h"
+#include "./Vertices.h"
 #include "../shared/shared.h"
 #include "../shared/Enum/Enum.h"

issm/trunk-jpl/src/c/Container/Vertices.h

@@ -3 +3 @@
 
 /*forward declarations */
-class Materials;
-class Elements;
-class Vertices;
-class Loads;
-class Nodes;
-class DataSet;
-class Inputs;
+#include "./DataSet.h"
+#include "../shared/Numerics/types.h"
 
 /*!\brief Declaration of Vertices class.

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

@@ -200 +200 @@
                                         ./shared/Numerics/Verbosity.h\
                                         ./shared/Numerics/Verbosity.cpp\
-                                        ./shared/Numerics/IsInputConverged.cpp\
                                         ./shared/Numerics/GaussPoints.h\
                                         ./shared/Numerics/GaussPoints.cpp\
@@ -210 +209 @@
                                         ./shared/Numerics/XZvectorsToCoordinateSystem.cpp\
                                         ./shared/Numerics/UnitConversion.cpp\
-                                        ./shared/Numerics/OptionsFromAnalysis.cpp\
-                                        ./shared/Numerics/ToolkitsOptionsFromAnalysis.cpp\
                                         ./shared/Exceptions/exceptions.h\
                                         ./shared/Exceptions/Exceptions.cpp\

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

@@ -18 +18 @@
 #include "../shared/io/io.h"
 #include "../Container/Parameters.h"
+#include "../Container/Elements.h"
 #include "../shared/shared.h"
 

issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp

@@ -12 +12 @@
 #include <string.h>
 #include "../objects/objects.h"
-#include "../../shared/Enum/Enum.h"
 #include "../../shared/shared.h"
+#include "../../Container/Container.h"
 
 /*ExponentialVariogram constructors and destructor*/

issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp

@@ -12 +12 @@
 #include <string.h>
 #include "../objects/objects.h"
-#include "../../shared/Enum/Enum.h"
 #include "../../shared/shared.h"
+#include "../../Container/Container.h"
 
 /*GaussianVariogram constructors and destructor*/

issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp

@@ -12 +12 @@
 #include <string.h>
 #include "../objects/objects.h"
-#include "../../shared/Enum/Enum.h"
 #include "../../shared/shared.h"
+#include "../../Container/Container.h"
 
 /*PowerVariogram constructors and destructor*/

issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp

@@ -12 +12 @@
 #include <string.h>
 #include "../objects/objects.h"
-#include "../../shared/Enum/Enum.h"
 #include "../../shared/shared.h"
+#include "../../Container/Container.h"
 
 /*SphericalVariogram constructors and destructor*/

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

@@ -11 +11 @@
 /*}}}*/
 
-class Elements;
-class Nodes;
-class Vertices;
-class Loads;
-class Materials;
-class Parameters;
 class FemModel;
 

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

@@ -9 +9 @@
 /*{{{*/
 #include "../Object.h"
+class Patch;
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
+#include "../../../Container/Inputs.h"
+#include "../../../Container/Parameters.h"
 /*}}}*/ 
 
@@ -218 +220 @@
         /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective 
          * datasets, using internal ids and offsets hidden in hooks: */
-        hnodes->configure(nodesin);
-        hvertices->configure(verticesin);
-        helement->configure(elementsin);
-        hmatpar->configure(materialsin);
+        hnodes->configure((DataSet*)nodesin);
+        hvertices->configure((DataSet*)verticesin);
+        helement->configure((DataSet*)elementsin);
+        hmatpar->configure((DataSet*)materialsin);
 
         /*Initialize hooked fields*/

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

@@ -17 +17 @@
 class IoModel;
 class ElementVector;
+class Vertex;
 /*}}}*/
 

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

@@ -10 +10 @@
 /*Headers:*/
 /*{{{*/
-class Object;
+class Node;
 template <class doublematrix> class Matrix;
 template <class doubletype> class Vector;
+class Elements;
+class Loads;
+class Nodes;
+class Vertices;
+class Materials;
+class Parameters;
 
 #include "../Object.h"
 #include "../../Update.h"
-#include "../../../toolkits/toolkits.h"
-#include "../../../Container/Container.h"
+
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../classes.h"
+#include "../../../Container/Inputs.h"
+#include "../../../Container/Parameters.h"
 /*}}}*/ 
 
@@ -238 +240 @@
         /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective 
          * datasets, using internal ids and offsets hidden in hooks: */
-        hnodes->configure(nodesin);
-        hvertices->configure(verticesin);
-        helement->configure(elementsin);
+        hnodes->configure((DataSet*)nodesin);
+        hvertices->configure((DataSet*)verticesin);
+        helement->configure((DataSet*)elementsin);
 
         /*Initialize hooked fields*/

issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
+#include "../../../Container/Parameters.h"
 /*}}}*/
 
@@ -111 +112 @@
         /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective 
          * datasets, using internal ids and offsets hidden in hooks: */
-        hnodes->configure(nodesin);
+        hnodes->configure((DataSet*)nodesin);
 
         /*Initialize hooked fields*/

issm/trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
+#include "../../../Container/Inputs.h"
+#include "../../../Container/Parameters.h"
 
 /*Matdamageice constructors and destructor*/
@@ -112 +114 @@
         /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective 
          * datasets, using internal ids and offsets hidden in hooks: */
-        helement->configure(elementsin);
+        helement->configure((DataSet*)elementsin);
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/objects/Materials/Matice.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
+#include "../../../Container/Inputs.h"
+#include "../../../Container/Parameters.h"
 
 /*Matice constructors and destructor*/
@@ -112 +114 @@
         /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective 
          * datasets, using internal ids and offsets hidden in hooks: */
-        helement->configure(elementsin);
+        helement->configure((DataSet*)elementsin);
 }
 /*}}}*/

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

@@ -17 +17 @@
 #include "../../../shared/Exceptions/exceptions.h"
 #include "../../../shared/MemOps/MemOps.h"
-#include "../../../shared/io/io.h"
-#include "../../../shared/Enum/Enum.h"
+#include "../../../shared/shared.h"
 #include "./OptionUtilities.h"
 

issm/trunk-jpl/src/c/classes/objects/Vertex.cpp

@@ -12 +12 @@
 #include <string.h>
 #include "../classes.h"
-#include "../../shared/Enum/Enum.h"
 #include "../../shared/shared.h"
+#include "../../Container/Parameters.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

@@ -7 +7 @@
 #include "../../toolkits/toolkits.h"
 #include "../../classes/objects/objects.h"
+#include "../../Container/Container.h"
 
 using namespace bamg;

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

@@ -8 +8 @@
 
 #include "../../classes/objects/objects.h"
+#include "../../Container/Parameters.h"
+#include "../../Container/Nodes.h"
 
 /* local prototypes: */

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

@@ -8 +8 @@
 
 #include "../../classes/objects/objects.h"
+#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/shared/Elements/Arrhenius.cpp

@@ -4 +4 @@
 
 #include <math.h>
-#include "./elements.h"
+#include "../Numerics/types.h"
 #include "../Exceptions/exceptions.h"
 

issm/trunk-jpl/src/c/shared/Elements/elements.h

@@ -7 +7 @@
 
 #include "../Numerics/types.h"
-class ElementMatrix;
-class ElementVector;
-class Vertex;
-class Node;
 
 IssmDouble Paterson(IssmDouble temperature);

issm/trunk-jpl/src/c/shared/Numerics/numerics.h

@@ -11 +11 @@
 #include "./recast.h"
 #include "./types.h"
+#include "./constants.h"
 
 class Input;
@@ -26 +27 @@
 void        OptimalSearch(IssmDouble *psearch_scalar,IssmDouble*pJ,OptPars*optpars,IssmDouble (*f)(IssmDouble,OptArgs*), OptArgs*optargs);
 void        cross(IssmDouble *result,IssmDouble*vector1,IssmDouble*vector2);
-void        IsInputConverged(IssmDouble *peps, Input**new_inputs,Input**old_inputs,int num_inputs,int criterion_enum);
 void        UnitConversion(IssmDouble *values, int numvalues,int direction_enum, int type_enum);
 IssmDouble  UnitConversion(IssmDouble value, int direction_enum, int type_enum);
-char       *OptionsFromAnalysis(Parameters *parameters,int analysis_type);
 void        XZvectorsToCoordinateSystem(IssmDouble *T,IssmDouble*xzvectors);
 int         cubic(IssmDouble a, IssmDouble b, IssmDouble c, IssmDouble d, double X[3], int *num);
-void        ToolkitsOptionsFromAnalysis(Parameters* parameters,int analysis_type);
 
 #endif //ifndef _NUMERICS_H_

issm/trunk-jpl/src/c/shared/Numerics/recast.h

@@ -17 +17 @@
 #if !defined(_HAVE_ADOLC_) || defined(_WRAPPERS_)
 
-template<class To, class From>
-To reCast(const From& from) {
+template<class To, class From> To reCast(const From& from) {
     return (To)from;
 }
@@ -25 +24 @@
 #include "./types.h"
 
-template<class To, class From>
-struct ForPartialSpecialization {
+template<class To, class From> struct ForPartialSpecialization {
     static  To reCast(const From& from ) { return (To) from;}
 };
 
-template<class To, class From>
-To reCast(const From& from) {
+template<class To, class From> To reCast(const From& from) {
     return ForPartialSpecialization<To,From>::reCast(from);
 }
@@ -37 +34 @@
  * partial specialization
  */
-template<class To>
-struct ForPartialSpecialization<To,adouble> {
+template<class To> struct ForPartialSpecialization<To,adouble> {
     static  To reCast(const adouble& from ) { return (To) (from.getValue());}
 };