From 4626c032065f920003235ed061ed7743f37f2905 Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Thu, 23 Feb 2017 09:52:25 +0100 Subject: [PATCH] Minor changes to help cmake parser --- src/mesh/blockMesh/curvedEdges/ellipseEdge.C | 2 +- src/solidModels/Make/files | 17 ++++++----- .../reactionThermo/Make/files | 2 +- .../thermophysicalFunctions/Make/files | 29 ++++++++++--------- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/mesh/blockMesh/curvedEdges/ellipseEdge.C b/src/mesh/blockMesh/curvedEdges/ellipseEdge.C index 2863bb95f..5614d177d 100644 --- a/src/mesh/blockMesh/curvedEdges/ellipseEdge.C +++ b/src/mesh/blockMesh/curvedEdges/ellipseEdge.C @@ -31,7 +31,7 @@ Description #include "mathematicalConstants.H" #include "EulerCoordinateRotation.H" #include "coordinateSystem.H" -#include "curvedEdges/rotEllipse2D.H" +#include "rotEllipse2D.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/solidModels/Make/files b/src/solidModels/Make/files index 7bd7e1242..367dfabbc 100644 --- a/src/solidModels/Make/files +++ b/src/solidModels/Make/files @@ -23,13 +23,6 @@ $(boundaryConditions)/timeVaryingFixedDisplacementZeroShear/timeVaryingFixedDisp $(boundaryConditions)/timeVaryingFixedRotation/timeVaryingFixedRotationFvPatchVectorField.C $(boundaryConditions)/transitionalParabolicVelocity/transitionalParabolicVelocityFvPatchVectorField.C -cohesiveLaws = $(constitutiveModel)/cohesiveLaws -$(cohesiveLaws)/cohesiveLaw/cohesiveLaw.C -$(cohesiveLaws)/cohesiveLaw/newCohesiveLaw.C -$(cohesiveLaws)/multiMaterialCohesiveLaw/multiMaterialCohesiveLaw.C -$(cohesiveLaws)/dugdaleCohesiveLaw/dugdaleCohesiveLaw.C -$(cohesiveLaws)/linearCohesiveLaw/linearCohesiveLaw.C - contactModels = contactModels $(contactModels)/normalContactModels/normalContactModel/normalContactModel.C $(contactModels)/normalContactModels/normalContactModel/newNormalContactModel.C @@ -49,7 +42,7 @@ $(contactModels)/frictionContactModels/frictionLaws/coulombFriction/coulombFrict constitutiveModel = constitutiveModel $(constitutiveModel)/constitutiveModel.C $(constitutiveModel)/plasticityStressReturnMethods/plasticityStressReturn/plasticityStressReturn.C -$(constitutiveModel)/plasticityStressReturnMethods/plasticityStressReturn/newPlasticityStressReturn.Cr +$(constitutiveModel)/plasticityStressReturnMethods/plasticityStressReturn/newPlasticityStressReturn.C $(constitutiveModel)/plasticityStressReturnMethods/aravasMises/aravasMises.C $(constitutiveModel)/plasticityStressReturnMethods/yamadaMises/yamadaMises.C $(constitutiveModel)/solidInterfaces/solidInterface/solidInterface.C @@ -63,6 +56,14 @@ $(constitutiveModel)/solidInterfaces/largeStrainULCorrected/largeStrainULCorrect $(constitutiveModel)/solidInterfaces/none/noneSolidInterface.C $(constitutiveModel)/tractionBoundaryGradient/tractionBoundaryGradient.C +cohesiveLaws = $(constitutiveModel)/cohesiveLaws +$(cohesiveLaws)/cohesiveLaw/cohesiveLaw.C +$(cohesiveLaws)/cohesiveLaw/newCohesiveLaw.C +$(cohesiveLaws)/multiMaterialCohesiveLaw/multiMaterialCohesiveLaw.C +$(cohesiveLaws)/dugdaleCohesiveLaw/dugdaleCohesiveLaw.C +$(cohesiveLaws)/linearCohesiveLaw/linearCohesiveLaw.C + + finiteVolume = finiteVolume $(finiteVolume)/gradSchemes/leastSquaresSolidInterfaceGrad/leastSquaresSolidInterfaceGrads.C $(finiteVolume)/gradSchemes/leastSquaresSolidInterfaceGrad/leastSquaresSolidInterfaceVectors.C diff --git a/src/thermophysicalModels/reactionThermo/Make/files b/src/thermophysicalModels/reactionThermo/Make/files index 471dbb114..60c2dd9f2 100644 --- a/src/thermophysicalModels/reactionThermo/Make/files +++ b/src/thermophysicalModels/reactionThermo/Make/files @@ -1,5 +1,5 @@ chemistryReaders/chemkinReader/chemkinReader.C -chemistryReaders/chemkinReader/chemkinLexer.C +chemistryReaders/chemkinReader/chemkinLexer.L chemistryReaders/chemistryReader/makeChemistryReaders.C mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C diff --git a/src/thermophysicalModels/thermophysicalFunctions/Make/files b/src/thermophysicalModels/thermophysicalFunctions/Make/files index c4b22314d..20d0a19b5 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/Make/files +++ b/src/thermophysicalModels/thermophysicalFunctions/Make/files @@ -14,19 +14,20 @@ $(NSRDSfunctions)/NSRDSfunc7/NSRDSfunc7.C $(NSRDSfunctions)/NSRDSfunc14/NSRDSfunc14.C $(APIfunctions)/APIdiffCoefFunc/APIdiffCoefFunc.C -freesteam-2.1/common.c -freesteam-2.1/steam.c -freesteam-2.1/b23.c -freesteam-2.1/backwards.c -freesteam-2.1/viscosity.c -freesteam-2.1/thcond.c -freesteam-2.1/region1.c -freesteam-2.1/region2.c -freesteam-2.1/region3.c -freesteam-2.1/region4.c -freesteam-2.1/steam_pv.c -freesteam-2.1/steam_ph.c -freesteam-2.1/steam_pT.c -freesteam-2.1/zeroin.c +freesteam = freesteam-2.1 +$(freesteam)/common.c +$(freesteam)/steam.c +$(freesteam)/b23.c +$(freesteam)/backwards.c +$(freesteam)/viscosity.c +$(freesteam)/thcond.c +$(freesteam)/region1.c +$(freesteam)/region2.c +$(freesteam)/region3.c +$(freesteam)/region4.c +$(freesteam)/steam_pv.c +$(freesteam)/steam_ph.c +$(freesteam)/steam_pT.c +$(freesteam)/zeroin.c LIB = $(FOAM_LIBBIN)/libthermophysicalFunctions