From d791b27668aa5f51acb93c31feed7f240132c4dd Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 26 Jan 2011 12:24:32 +0000 Subject: [PATCH] ENH: Updated reactingParcelFilmFoam solver --- .../solvers/lagrangian/reactingParcelFilmFoam/Make/options | 4 +++- .../reactingParcelFilmFoam/createSurfaceFilmModel.H | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options index 34867be0b4..05fc5fad0c 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -14,7 +14,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/surfaceFilmModels/lnInclude \ + -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ + -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude @@ -33,6 +34,7 @@ EXE_LIBS = \ -lSLGThermo \ -lchemistryModel \ -lradiation \ + -lregionModels \ -lsurfaceFilmModels \ -llagrangianIntermediate \ -lODE diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H index 15046e3d49..1db870f0aa 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H @@ -1,6 +1,7 @@ Info<< "\nConstructing surface film model" << endl; -autoPtr - tsurfaceFilm(surfaceFilmModels::surfaceFilmModel::New(mesh, g)); -surfaceFilmModels::surfaceFilmModel& surfaceFilm = tsurfaceFilm(); +typedef regionModels::surfaceFilmModels::surfaceFilmModel filmModelType; + +autoPtr tsurfaceFilm(filmModelType::New(mesh, g)); +filmModelType& surfaceFilm = tsurfaceFilm();