diff --git a/ThirdParty/AllMake.eigen b/ThirdParty/AllMake.eigen index 222618aaf..009c39b55 100755 --- a/ThirdParty/AllMake.eigen +++ b/ThirdParty/AllMake.eigen @@ -57,7 +57,7 @@ echo ======================================== echo # Eigen -if [ -d $(WM_THIRD_PARTY_DIR)/packages/eigen3 ] +if [ -d $WM_THIRD_PARTY_DIR/packages/eigen3 ] then echo "eigen3 found." else @@ -67,11 +67,8 @@ else \tar xvzf 3.2.8.tar.gz \rm -f 3.2.8.tar.gz \mv eigen-eigen-07105f7124f9 ./packages/eigen3 - fi fi - - echo ======================================== echo Done ThirdParty AllMake: Stage3 echo ======================================== diff --git a/applications/solvers/FSI/Allwmake b/applications/solvers/FSI/Allwmake index 91f924cf0..491ae63c3 100755 --- a/applications/solvers/FSI/Allwmake +++ b/applications/solvers/FSI/Allwmake @@ -3,6 +3,9 @@ set -x wmake libso fluidSolidInteraction +# Create Eigen soft link +ln -srf ../../../ThirdParty/packages/eigen3/Eigen/ fluidSolidInteraction/lnInclude/ + wmake solvers/fsiFoam wmake solvers/ampFsiFoam wmake solvers/weakFsiFoam diff --git a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/pisoFluid/pisoFluid.C b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/pisoFluid/pisoFluid.C index 9c4427d3b..a83074c8c 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/pisoFluid/pisoFluid.C +++ b/applications/solvers/FSI/fluidSolidInteraction/fluidSolvers/pisoFluid/pisoFluid.C @@ -308,7 +308,7 @@ void pisoFluid::evolve() ( fvm::ddt(U_) + fvm::div(phi_, U_) - + turbulence_->divDevReff(U_) + + turbulence_->divDevReff() ); solve(UEqn == -gradp_); diff --git a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsIncrTotalLagrangianSolid/unsIncrTotalLagrangianSolid.C b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsIncrTotalLagrangianSolid/unsIncrTotalLagrangianSolid.C index 93ae74c5d..9b0ac6ceb 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsIncrTotalLagrangianSolid/unsIncrTotalLagrangianSolid.C +++ b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsIncrTotalLagrangianSolid/unsIncrTotalLagrangianSolid.C @@ -1095,7 +1095,7 @@ bool unsIncrTotalLagrangianSolid::evolve() int iCorr = 0; scalar initialResidual = 0; - lduMatrix::solverPerformance solverPerf; + lduSolverPerformance solverPerf; scalar res = 1; scalar maxRes = 0; scalar curConvergenceTolerance = convergenceTolerance; diff --git a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsIncrTotalLagrangianSolid/unsIncrTotalLagrangianSolidSolve.C b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsIncrTotalLagrangianSolid/unsIncrTotalLagrangianSolidSolve.C index 6bc8157ce..2597c1b8d 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsIncrTotalLagrangianSolid/unsIncrTotalLagrangianSolidSolve.C +++ b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsIncrTotalLagrangianSolid/unsIncrTotalLagrangianSolidSolve.C @@ -261,7 +261,7 @@ scalar unsIncrTotalLagrangianSolid::smooth int iCorr = 0; scalar initialResidual = 0; - lduMatrix::solverPerformance solverPerf; + lduSolverPerformance solverPerf; scalar residual = GREAT; lduMatrix::debug = debug; @@ -498,7 +498,7 @@ scalar unsIncrTotalLagrangianSolid::smooth int iCorr = 0; scalar initialResidual = 0; - lduMatrix::solverPerformance solverPerf; + lduSolverPerformance solverPerf; scalar residual = GREAT; lduMatrix::debug = debug; diff --git a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsTotalLagrangianSolid/unsTotalLagrangianSolid.C b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsTotalLagrangianSolid/unsTotalLagrangianSolid.C index 96e986e94..364116f91 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsTotalLagrangianSolid/unsTotalLagrangianSolid.C +++ b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsTotalLagrangianSolid/unsTotalLagrangianSolid.C @@ -1191,7 +1191,7 @@ bool unsTotalLagrangianSolid::evolve() int iCorr = 0; scalar initialResidual = 0; - lduMatrix::solverPerformance solverPerf; + lduSolverPerformance solverPerf; scalar res = 1; scalar maxRes = 0; scalar curConvergenceTolerance = convergenceTolerance; diff --git a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsTotalLagrangianSolid/unsTotalLagrangianSolidSolve.C b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsTotalLagrangianSolid/unsTotalLagrangianSolidSolve.C index 4d97f1c50..a0e00498b 100644 --- a/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsTotalLagrangianSolid/unsTotalLagrangianSolidSolve.C +++ b/applications/solvers/FSI/fluidSolidInteraction/solidSolvers/unsTotalLagrangianSolid/unsTotalLagrangianSolidSolve.C @@ -310,7 +310,7 @@ scalar unsTotalLagrangianSolid::smooth int iCorr = 0; scalar initialResidual = 0; - lduMatrix::solverPerformance solverPerf; + lduSolverPerformance solverPerf; scalar residual = GREAT; lduMatrix::debug = debug; @@ -471,7 +471,7 @@ scalar unsTotalLagrangianSolid::smooth int iCorr = 0; scalar initialResidual = 0; - lduMatrix::solverPerformance solverPerf; + lduSolverPerformance solverPerf; scalar residual = GREAT; lduMatrix::debug = debug;