Index: ../trunk-jpl/src/c/shared/Bamg/Abs.h =================================================================== --- ../trunk-jpl/src/c/shared/Bamg/Abs.h (revision 24458) +++ ../trunk-jpl/src/c/shared/Bamg/Abs.h (revision 24459) @@ -2,8 +2,6 @@ #define _BAMGABS_H_ namespace bamg { - template inline T Abs (const T &a){return a <0 ? -a : a;} - } #endif Index: ../trunk-jpl/src/c/shared/Bamg/BigPrimeNumber.h =================================================================== --- ../trunk-jpl/src/c/shared/Bamg/BigPrimeNumber.h (revision 24458) +++ ../trunk-jpl/src/c/shared/Bamg/BigPrimeNumber.h (revision 24459) @@ -2,8 +2,6 @@ #define _BIGPRIMENUMBER_H_ namespace bamg { - long BigPrimeNumber(long n); - } #endif Index: ../trunk-jpl/src/c/shared/Bamg/OppositeAngle.h =================================================================== --- ../trunk-jpl/src/c/shared/Bamg/OppositeAngle.h (revision 24458) +++ ../trunk-jpl/src/c/shared/Bamg/OppositeAngle.h (revision 24459) @@ -6,7 +6,7 @@ /*Return the opposite angle modulo 2 Pi*/ namespace bamg { inline float OppositeAngle(float a){return a<0 ? PI+a:a-PI;} - inline double OppositeAngle(double a){return a<0 ? PI+a:a- PI;} + inline double OppositeAngle(double a){return a<0 ? PI+a:a-PI;} } #endif Index: ../trunk-jpl/src/c/shared/Bamg/Exchange.h =================================================================== --- ../trunk-jpl/src/c/shared/Bamg/Exchange.h (revision 24458) +++ ../trunk-jpl/src/c/shared/Bamg/Exchange.h (revision 24459) @@ -1,6 +1,6 @@ #ifndef _EXCHANGE_H_ #define _EXCHANGE_H_ -template inline void Exchange (T &a,T &b) {T c=a;a=b;b=c;} +template inline void Exchange(T &a,T &b){T c=a;a=b;b=c;} #endif Index: ../trunk-jpl/src/c/classes/IoModel.h =================================================================== --- ../trunk-jpl/src/c/classes/IoModel.h (revision 24458) +++ ../trunk-jpl/src/c/classes/IoModel.h (revision 24459) @@ -14,7 +14,7 @@ class Elements; class Inputs2; class Param; -class Option; +class Options; class IoConstant { /*holds single IssmDouble, int, bool and char from input*/ public: Index: ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 24458) +++ ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 24459) @@ -1,9 +1,20 @@ #include "./StressbalanceAnalysis.h" #include "../toolkits/toolkits.h" -#include "../classes/classes.h" -#include "../shared/shared.h" -#include "../modules/modules.h" #include "../solutionsequences/solutionsequences.h" +#include "../classes/IoModel.h" +#include "../classes/FemModel.h" +#include "../classes/Constraints/Constraints.h" +#include "../classes/Constraints/Constraint.h" +#include "../classes/Constraints/SpcStatic.h" +#include "../classes/Params/Parameters.h" +#include "../classes/Nodes.h" +#include "../classes/Node.h" +#include "../classes/Elements/Elements.h" +#include "../classes/Elements/Element.h" +#include "../modules/ModelProcessorx/ModelProcessorx.h" +#include "../modules/IoModelToConstraintsx/IoModelToConstraintsx.h" +#include "../modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h" +#include "../modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h" #include "../cores/cores.h" //#define FSANALYTICAL 10