[24684] | 1 | Index: ../trunk-jpl/src/c/shared/Bamg/Abs.h
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/shared/Bamg/Abs.h (revision 24458)
|
---|
| 4 | +++ ../trunk-jpl/src/c/shared/Bamg/Abs.h (revision 24459)
|
---|
| 5 | @@ -2,8 +2,6 @@
|
---|
| 6 | #define _BAMGABS_H_
|
---|
| 7 |
|
---|
| 8 | namespace bamg {
|
---|
| 9 | -
|
---|
| 10 | template<class T> inline T Abs (const T &a){return a <0 ? -a : a;}
|
---|
| 11 | -
|
---|
| 12 | }
|
---|
| 13 | #endif
|
---|
| 14 | Index: ../trunk-jpl/src/c/shared/Bamg/BigPrimeNumber.h
|
---|
| 15 | ===================================================================
|
---|
| 16 | --- ../trunk-jpl/src/c/shared/Bamg/BigPrimeNumber.h (revision 24458)
|
---|
| 17 | +++ ../trunk-jpl/src/c/shared/Bamg/BigPrimeNumber.h (revision 24459)
|
---|
| 18 | @@ -2,8 +2,6 @@
|
---|
| 19 | #define _BIGPRIMENUMBER_H_
|
---|
| 20 |
|
---|
| 21 | namespace bamg {
|
---|
| 22 | -
|
---|
| 23 | long BigPrimeNumber(long n);
|
---|
| 24 | -
|
---|
| 25 | }
|
---|
| 26 | #endif
|
---|
| 27 | Index: ../trunk-jpl/src/c/shared/Bamg/OppositeAngle.h
|
---|
| 28 | ===================================================================
|
---|
| 29 | --- ../trunk-jpl/src/c/shared/Bamg/OppositeAngle.h (revision 24458)
|
---|
| 30 | +++ ../trunk-jpl/src/c/shared/Bamg/OppositeAngle.h (revision 24459)
|
---|
| 31 | @@ -6,7 +6,7 @@
|
---|
| 32 | /*Return the opposite angle modulo 2 Pi*/
|
---|
| 33 | namespace bamg {
|
---|
| 34 | inline float OppositeAngle(float a){return a<0 ? PI+a:a-PI;}
|
---|
| 35 | - inline double OppositeAngle(double a){return a<0 ? PI+a:a- PI;}
|
---|
| 36 | + inline double OppositeAngle(double a){return a<0 ? PI+a:a-PI;}
|
---|
| 37 | }
|
---|
| 38 |
|
---|
| 39 | #endif
|
---|
| 40 | Index: ../trunk-jpl/src/c/shared/Bamg/Exchange.h
|
---|
| 41 | ===================================================================
|
---|
| 42 | --- ../trunk-jpl/src/c/shared/Bamg/Exchange.h (revision 24458)
|
---|
| 43 | +++ ../trunk-jpl/src/c/shared/Bamg/Exchange.h (revision 24459)
|
---|
| 44 | @@ -1,6 +1,6 @@
|
---|
| 45 | #ifndef _EXCHANGE_H_
|
---|
| 46 | #define _EXCHANGE_H_
|
---|
| 47 |
|
---|
| 48 | -template<class T> inline void Exchange (T &a,T &b) {T c=a;a=b;b=c;}
|
---|
| 49 | +template<class T> inline void Exchange(T &a,T &b){T c=a;a=b;b=c;}
|
---|
| 50 |
|
---|
| 51 | #endif
|
---|
| 52 | Index: ../trunk-jpl/src/c/classes/IoModel.h
|
---|
| 53 | ===================================================================
|
---|
| 54 | --- ../trunk-jpl/src/c/classes/IoModel.h (revision 24458)
|
---|
| 55 | +++ ../trunk-jpl/src/c/classes/IoModel.h (revision 24459)
|
---|
| 56 | @@ -14,7 +14,7 @@
|
---|
| 57 | class Elements;
|
---|
| 58 | class Inputs2;
|
---|
| 59 | class Param;
|
---|
| 60 | -class Option;
|
---|
| 61 | +class Options;
|
---|
| 62 |
|
---|
| 63 | class IoConstant { /*holds single IssmDouble, int, bool and char from input*/
|
---|
| 64 | public:
|
---|
| 65 | Index: ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp
|
---|
| 66 | ===================================================================
|
---|
| 67 | --- ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 24458)
|
---|
| 68 | +++ ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 24459)
|
---|
| 69 | @@ -1,9 +1,20 @@
|
---|
| 70 | #include "./StressbalanceAnalysis.h"
|
---|
| 71 | #include "../toolkits/toolkits.h"
|
---|
| 72 | -#include "../classes/classes.h"
|
---|
| 73 | -#include "../shared/shared.h"
|
---|
| 74 | -#include "../modules/modules.h"
|
---|
| 75 | #include "../solutionsequences/solutionsequences.h"
|
---|
| 76 | +#include "../classes/IoModel.h"
|
---|
| 77 | +#include "../classes/FemModel.h"
|
---|
| 78 | +#include "../classes/Constraints/Constraints.h"
|
---|
| 79 | +#include "../classes/Constraints/Constraint.h"
|
---|
| 80 | +#include "../classes/Constraints/SpcStatic.h"
|
---|
| 81 | +#include "../classes/Params/Parameters.h"
|
---|
| 82 | +#include "../classes/Nodes.h"
|
---|
| 83 | +#include "../classes/Node.h"
|
---|
| 84 | +#include "../classes/Elements/Elements.h"
|
---|
| 85 | +#include "../classes/Elements/Element.h"
|
---|
| 86 | +#include "../modules/ModelProcessorx/ModelProcessorx.h"
|
---|
| 87 | +#include "../modules/IoModelToConstraintsx/IoModelToConstraintsx.h"
|
---|
| 88 | +#include "../modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h"
|
---|
| 89 | +#include "../modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h"
|
---|
| 90 | #include "../cores/cores.h"
|
---|
| 91 |
|
---|
| 92 | //#define FSANALYTICAL 10
|
---|