From b1d623fff538a373502dde98bfe4a213577f2e84 Mon Sep 17 00:00:00 2001 From: ignis Date: Mon, 21 Aug 2017 13:32:07 +0900 Subject: [PATCH] SLFMFoam does not depend on *_POSTECH libraries --- solvers_post/SLFMFoam/Make/options | 9 ++++----- solvers_post/SLFMFoam/createFields.H | 13 +++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/solvers_post/SLFMFoam/Make/options b/solvers_post/SLFMFoam/Make/options index 8959491..5239a88 100644 --- a/solvers_post/SLFMFoam/Make/options +++ b/solvers_post/SLFMFoam/Make/options @@ -11,13 +11,12 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ - -I$(DEV_PATH)/chemistryModel_POSTECH/lnInclude \ - -I$(DEV_PATH)/combustionModels_POSTECH/lnInclude + -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ + -I$(LIB_SRC)/combustionModels/lnInclude EXE_LIBS = \ - -L$(FOAM_USER_LIBBIN) \ - -lchemistryModel_POSTECH \ - -lcombustionModels_POSTECH \ + -lchemistryModel \ + -lcombustionModels \ -lfiniteVolume \ -lfvOptions \ -lmeshTools \ diff --git a/solvers_post/SLFMFoam/createFields.H b/solvers_post/SLFMFoam/createFields.H index 0b611ba..11368f1 100644 --- a/solvers_post/SLFMFoam/createFields.H +++ b/solvers_post/SLFMFoam/createFields.H @@ -1,13 +1,12 @@ Info<< "\nCreating thermophysical model for Fluid mesh\n" << endl; #include "readGravitationalAcceleration.H" -combustionModels::rhoCombustionModel* pRxn = (combustionModels::rhoCombustionModel::New(mesh)).ptr(); -autoPtr combustion +autoPtr reaction ( - dynamic_cast (pRxn) + combustionModels::rhoCombustionModel::New(mesh) ); -autoPtr chemistry = combustion->chem(); -rhoReactionThermo& thermo = chemistry->thermo(); + +rhoReactionThermo& thermo = reaction->thermo(); thermo.validate(args.executable(), "h", "e"); basicSpecieMixture& composition = thermo.composition(); @@ -84,7 +83,8 @@ autoPtr turbulence ); // Set the turbulence into the reaction model -combustion->setTurbulence(turbulence()); +reaction->setTurbulence(turbulence()); + Info<< "Creating field dpdt\n" << endl; volScalarField dpdt @@ -102,6 +102,7 @@ volScalarField dpdt Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); + multivariateSurfaceInterpolationScheme::fieldTable fields; forAll(Y, i)