From 0ad918f659bbb4d8d582838b4bf339084863ae8d Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 12 Dec 2019 10:34:08 +0000 Subject: [PATCH] surfaceFilmModels: Rewritten in mass conservative form All of the film transport equations are now formulated with respect to the film volume fraction in the region cell layer rather than the film thickness which ensures mass conservation of the film even as it flows over curved surfaces and around corners. (In the previous formulation the conservation error could be as large as 15% for a film flowing around a corner.) The film Courant number is now formulated in terms of the film cell volumetric flux which avoids the stabilised division by the film thickness and provides a more reliable estimate for time-step evaluation. As a consequence the film solution is substantially more robust even though the time-step is now significantly higher. For film flow dominated problem the simulations now runs 10-30x faster. The inconsistent extended PISO controls have been replaced by the standard PIMPLE control system used in all other flow solvers, providing consistent input, a flexible structure and easier maintenance. The momentum corrector has been re-formulated to be consistent with the momentum predictor so the optional PIMPLE outer-corrector loop converges which it did not previously. nonuniformTransformCyclic patches and corresponding fields are no longer needed and have been removed which paves the way for a future rationalisation of the handling of cyclic transformations in OpenFOAM to improve robustness, usability and maintainability. Film sources have been simplified to avoid the need for fictitious boundary conditions, in particular mappedFixedPushedInternalValueFvPatchField which has been removed. Film variables previously appended with an "f" for "film" rather than "face" have been renamed without the unnecessary and confusing "f" as they are localised to the film region and hence already directly associated with it. All film tutorials have been updated to test and demonstrate the developments and improvements listed above. Henry G. Weller CFD Direct Ltd. --- .../VoFPatchTransfer/VoFPatchTransfer.C | 43 +- .../extrudeToRegionMesh/extrudeToRegionMesh.C | 99 --- etc/caseDicts/setConstraintTypes | 5 - src/OpenFOAM/Make/files | 3 - ...nonuniformTransformCyclicPointPatchField.C | 109 --- ...nonuniformTransformCyclicPointPatchField.H | 147 ---- ...onuniformTransformCyclicPointPatchFields.C | 43 -- ...onuniformTransformCyclicPointPatchFields.H | 49 -- .../nonuniformTransformCyclicPointPatch.C | 73 -- .../nonuniformTransformCyclicPointPatch.H | 102 --- .../nonuniformTransformCyclicPolyPatch.C | 50 -- .../nonuniformTransformCyclicPolyPatch.H | 203 ----- src/finiteVolume/Make/files | 4 - .../nonuniformTransformCyclicFvPatchField.C | 92 --- .../nonuniformTransformCyclicFvPatchField.H | 145 ---- .../nonuniformTransformCyclicFvPatchFields.C | 43 -- .../nonuniformTransformCyclicFvPatchFields.H | 49 -- ...onuniformTransformCyclicFvPatchFieldsFwd.H | 50 -- ...ppedFixedPushedInternalValueFvPatchField.C | 122 --- ...ppedFixedPushedInternalValueFvPatchField.H | 187 ----- ...pedFixedPushedInternalValueFvPatchFields.C | 43 -- ...pedFixedPushedInternalValueFvPatchFields.H | 49 -- ...FixedPushedInternalValueFvPatchFieldsFwd.H | 50 -- .../nonuniformTransformCyclicFvsPatchField.C | 92 --- .../nonuniformTransformCyclicFvsPatchField.H | 139 ---- .../nonuniformTransformCyclicFvsPatchFields.C | 43 -- .../nonuniformTransformCyclicFvsPatchFields.H | 49 -- ...nuniformTransformCyclicFvsPatchFieldsFwd.H | 50 -- .../nonuniformTransformCyclicFvPatch.C | 49 -- .../nonuniformTransformCyclicFvPatch.H | 83 --- .../ThermoSurfaceFilm/ThermoSurfaceFilm.C | 11 +- .../regionModel/regionModel/regionModel.C | 15 +- .../regionModel/regionModel/regionModel.H | 45 +- .../regionModel/regionModelTemplates.C | 75 +- .../regionModel/regionModel1D/regionModel1D.C | 7 +- .../singleLayerRegion/singleLayerRegion.C | 198 ++--- .../singleLayerRegion/singleLayerRegion.H | 47 +- .../singleLayerRegionTemplates.C | 22 +- ...ilmHeightInletVelocityFvPatchVectorField.C | 6 +- .../kinematicSingleLayer.C | 705 ++++++++---------- .../kinematicSingleLayer.H | 135 ++-- .../kinematicSingleLayerI.H | 93 ++- .../kinematicSingleLayerTemplates.C | 40 +- .../filmTurbulenceModel/laminar/laminar.C | 29 +- .../contactAngleForce/contactAngleForce.C | 43 +- .../distributionContactAngleForce.C | 55 +- .../distributionContactAngleForce.H | 6 + ...bedTemperatureDependentContactAngleForce.C | 9 +- .../temperatureDependentContactAngleForce.C | 9 +- .../kinematic/force/forceList/forceList.C | 4 +- .../thermocapillaryForce.C | 6 +- .../transferModel/transferModel.C | 7 +- .../constantRadiation/constantRadiation.C | 38 +- .../constantRadiation/constantRadiation.H | 2 +- .../filmRadiationModel/filmRadiationModel.H | 2 +- .../noRadiation/noRadiation.C | 8 +- .../noRadiation/noRadiation.H | 2 +- .../primaryRadiation/primaryRadiation.C | 43 +- .../primaryRadiation/primaryRadiation.H | 6 +- .../standardRadiation/standardRadiation.C | 62 +- .../standardRadiation/standardRadiation.H | 9 +- .../thixotropicViscosity.C | 16 +- .../waxSolventViscosity/waxSolventViscosity.C | 14 +- .../constantHeatTransfer.C | 4 +- .../constantHeatTransfer.H | 2 +- .../heatTransferModel/heatTransferModel.H | 2 +- .../mappedConvectiveHeatTransfer.C | 20 +- .../mappedConvectiveHeatTransfer.H | 6 +- .../solidification/solidification.C | 20 +- .../solidification/solidification.H | 4 +- .../standardPhaseChange/standardPhaseChange.C | 6 +- .../waxSolventEvaporation.C | 55 +- .../surfaceFilmRegionModel.H | 20 +- .../thermoSingleLayer/thermoSingleLayer.C | 236 +++--- .../thermoSingleLayer/thermoSingleLayer.H | 35 +- .../thermoSingleLayer/thermoSingleLayerI.H | 40 +- .../thermalBaffle/thermalBaffle.C | 5 +- .../cylinder/0/wallFilmRegion/{Tf => T} | 2 +- .../cylinder/0/wallFilmRegion/{Uf => U} | 2 +- .../0/wallFilmRegion/{deltaf => delta} | 2 +- .../cylinder/system/wallFilmRegion/fvSchemes | 43 +- .../cylinder/system/wallFilmRegion/fvSolution | 16 +- .../hotBoxes/{0.orig => 0}/H2O | 0 .../hotBoxes/{0.orig => 0}/N2 | 0 .../hotBoxes/{0.orig => 0}/O2 | 0 .../hotBoxes/{0.orig => 0}/T | 2 +- .../hotBoxes/{0.orig => 0}/U | 2 +- .../hotBoxes/{0.orig => 0}/alphat | 0 .../hotBoxes/{0.orig => 0}/epsilon | 0 .../hotBoxes/{0.orig => 0}/htcConv | 0 .../hotBoxes/{0.orig => 0}/k | 0 .../hotBoxes/{0.orig => 0}/nut | 0 .../hotBoxes/{0.orig => 0}/p | 0 .../hotBoxes/{0.orig => 0}/p_rgh | 0 .../wallFilmRegion/Tf => 0/wallFilmRegion/T} | 10 +- .../wallFilmRegion/Uf => 0/wallFilmRegion/U} | 10 +- .../deltaf => 0/wallFilmRegion/delta} | 10 +- .../reactingParcelFoam/hotBoxes/Allclean | 2 - .../reactingParcelFoam/hotBoxes/Allmesh | 6 - .../reactingParcelFoam/hotBoxes/Allrun | 5 +- .../hotBoxes/system/controlDict | 2 +- .../system/wallFilmRegion.orig/fvSchemes | 63 -- .../decomposeParDict | 0 .../hotBoxes/system/wallFilmRegion/fvSchemes | 50 ++ .../fvSolution | 16 +- .../rivuletPanel/0/wallFilmRegion/{Tf => T} | 2 +- .../rivuletPanel/0/wallFilmRegion/{Uf => U} | 2 +- .../0/wallFilmRegion/{deltaf => delta} | 2 +- .../rivuletPanel/system/controlDict | 6 +- .../system/wallFilmRegion/fvSchemes | 40 +- .../system/wallFilmRegion/fvSolution | 18 +- .../splashPanel/0/wallFilm/{Tf => T} | 2 +- .../splashPanel/0/wallFilm/{Uf => U} | 2 +- .../splashPanel/0/wallFilm/{deltaf => delta} | 2 +- .../splashPanel/system/wallFilm/fvSchemes | 40 +- .../splashPanel/system/wallFilm/fvSolution | 16 +- 116 files changed, 1174 insertions(+), 3690 deletions(-) delete mode 100644 src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C delete mode 100644 src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H delete mode 100644 src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.C delete mode 100644 src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.H delete mode 100644 src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C delete mode 100644 src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.H delete mode 100644 src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C delete mode 100644 src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.C delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.H delete mode 100644 src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFieldsFwd.H delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.C delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.H delete mode 100644 src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.C delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.H delete mode 100644 src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFieldsFwd.H delete mode 100644 src/finiteVolume/fvMesh/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C delete mode 100644 src/finiteVolume/fvMesh/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.H rename tutorials/lagrangian/reactingParcelFoam/cylinder/0/wallFilmRegion/{Tf => T} (98%) rename tutorials/lagrangian/reactingParcelFoam/cylinder/0/wallFilmRegion/{Uf => U} (98%) rename tutorials/lagrangian/reactingParcelFoam/cylinder/0/wallFilmRegion/{deltaf => delta} (97%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/H2O (100%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/N2 (100%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/O2 (100%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/T (97%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/U (97%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/alphat (100%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/epsilon (100%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/htcConv (100%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/k (100%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/nut (100%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/p (100%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig => 0}/p_rgh (100%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig/wallFilmRegion/Tf => 0/wallFilmRegion/T} (80%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig/wallFilmRegion/Uf => 0/wallFilmRegion/U} (78%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/{0.orig/wallFilmRegion/deltaf => 0/wallFilmRegion/delta} (79%) delete mode 100644 tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/{wallFilmRegion.orig => wallFilmRegion}/decomposeParDict (100%) create mode 100644 tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion/fvSchemes rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/{wallFilmRegion.orig => wallFilmRegion}/fvSolution (89%) rename tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/wallFilmRegion/{Tf => T} (98%) rename tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/wallFilmRegion/{Uf => U} (98%) rename tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/wallFilmRegion/{deltaf => delta} (97%) rename tutorials/lagrangian/reactingParcelFoam/splashPanel/0/wallFilm/{Tf => T} (97%) rename tutorials/lagrangian/reactingParcelFoam/splashPanel/0/wallFilm/{Uf => U} (97%) rename tutorials/lagrangian/reactingParcelFoam/splashPanel/0/wallFilm/{deltaf => delta} (97%) diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C index 7fa88e1a7f..0979bb3386 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,7 @@ License #include "VoFPatchTransfer.H" #include "twoPhaseMixtureThermo.H" +#include "thermoSingleLayer.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -143,16 +144,18 @@ void VoFPatchTransfer::correct // Do not correct if no patches selected if (!patchIDs_.size()) return; - const scalarField& delta = film().delta(); - const scalarField& rho = film().rho(); - const scalarField& magSf = film().magSf(); + const thermoSingleLayer& film = filmType(); - const polyBoundaryMesh& pbm = film().regionMesh().boundaryMesh(); + const scalarField& delta = film.delta(); + const scalarField& rho = film.rho(); + const scalarField& magSf = film.magSf(); + + const polyBoundaryMesh& pbm = film.regionMesh().boundaryMesh(); const twoPhaseMixtureThermo& thermo ( - film().primaryMesh().lookupObject + film.primaryMesh().lookupObject ( twoPhaseMixtureThermo::dictName ) @@ -169,13 +172,13 @@ void VoFPatchTransfer::correct const label patchi = patchIDs_[pidi]; label primaryPatchi = -1; - forAll(film().intCoupledPatchIDs(), i) + forAll(film.intCoupledPatchIDs(), i) { - const label filmPatchi = film().intCoupledPatchIDs()[i]; + const label filmPatchi = film.intCoupledPatchIDs()[i]; if (filmPatchi == patchi) { - primaryPatchi = film().primaryPatchIDs()[i]; + primaryPatchi = film.primaryPatchIDs()[i]; } } @@ -183,31 +186,31 @@ void VoFPatchTransfer::correct { scalarField deltaCoeffs ( - film().primaryMesh().boundary()[primaryPatchi].deltaCoeffs() + film.primaryMesh().boundary()[primaryPatchi].deltaCoeffs() ); - film().toRegion(patchi, deltaCoeffs); + film.toRegion(patchi, deltaCoeffs); scalarField hp(heVoF.boundaryField()[primaryPatchi]); - film().toRegion(patchi, hp); + film.toRegion(patchi, hp); scalarField Tp(TVoF.boundaryField()[primaryPatchi]); - film().toRegion(patchi, Tp); + film.toRegion(patchi, Tp); scalarField Cpp(CpVoF.boundaryField()[primaryPatchi]); - film().toRegion(patchi, Cpp); + film.toRegion(patchi, Cpp); scalarField rhop(rhoVoF.boundaryField()[primaryPatchi]); - film().toRegion(patchi, rhop); + film.toRegion(patchi, rhop); scalarField alphap(alphaVoF.boundaryField()[primaryPatchi]); - film().toRegion(patchi, alphap); + film.toRegion(patchi, alphap); scalarField Vp ( - film().primaryMesh().boundary()[primaryPatchi] - .patchInternalField(film().primaryMesh().V()) + film.primaryMesh().boundary()[primaryPatchi] + .patchInternalField(film.primaryMesh().V()) ); - film().toRegion(patchi, Vp); + film.toRegion(patchi, Vp); const polyPatch& pp = pbm[patchi]; const labelList& faceCells = pp.faceCells(); @@ -231,7 +234,7 @@ void VoFPatchTransfer::correct transferRateCoeff_*delta[celli]*rho[celli]*magSf[celli]; massToTransfer[celli] += dMass; - energyToTransfer[celli] += dMass*film().hs()[celli]; + energyToTransfer[celli] += dMass*film.h()[celli]; } if diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C index cc600b06c4..eca7ecb836 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C +++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C @@ -35,8 +35,6 @@ Description - if extruding boundary faces: - convert boundary faces to mappedWall patches - extrude edges of faceZone as a \_sidePatch - - extrude edges in between different faceZones as a - (nonuniformTransform)cyclic \_\ - extrudes into master direction (i.e. away from the owner cell if flipMap is false) @@ -123,7 +121,6 @@ Notes: #include "syncTools.H" #include "cyclicPolyPatch.H" #include "wedgePolyPatch.H" -#include "nonuniformTransformCyclicPolyPatch.H" #include "extrudeModel.H" #include "faceSet.H" #include "fvMeshTools.H" @@ -1051,89 +1048,6 @@ void addZoneSidePatches } -void addInterZonePatches -( - const fvMesh& mesh, - const wordList& zoneNames, - const bool oneD, - - labelList& zoneZonePatch_min, - labelList& zoneZonePatch_max, - DynamicList& newPatches -) -{ - Pout<< "Adding inter-zone patches:" << nl << nl - << "patchID\tpatch" << nl - << "-------\t-----" - << endl; - - dictionary transformDict; - transformDict.add - ( - "transform", - cyclicPolyPatch::transformTypeNames[cyclicPolyPatch::NOORDERING] - ); - - // Allow arbitrary matching for nonuniformTransformCyclicPolyPatch - transformDict.add("matchTolerance", 1e6); - - label nOldPatches = newPatches.size(); - - if (!oneD) - { - forAll(zoneZonePatch_min, minZone) - { - for (label maxZone = minZone; maxZone < zoneNames.size(); maxZone++) - { - label index = minZone*zoneNames.size()+maxZone; - - if (zoneZonePatch_min[index] > 0) - { - word minToMax = - zoneNames[minZone] - + "_to_" - + zoneNames[maxZone]; - word maxToMin = - zoneNames[maxZone] - + "_to_" - + zoneNames[minZone]; - - { - transformDict.set("neighbourPatch", maxToMin); - zoneZonePatch_min[index] = - addPatch - ( - mesh.boundaryMesh(), - minToMax, - transformDict, - newPatches - ); - Pout<< zoneZonePatch_min[index] << '\t' << minToMax - << nl; - } - { - transformDict.set("neighbourPatch", minToMax); - zoneZonePatch_max[index] = - addPatch - ( - mesh.boundaryMesh(), - maxToMin, - transformDict, - newPatches - ); - Pout<< zoneZonePatch_max[index] << '\t' << maxToMin - << nl; - } - - } - } - } - } - Pout<< "Added " << newPatches.size()-nOldPatches << " inter-zone patches." - << nl << endl; -} - - tmp calcOffset ( const primitiveFacePatch& extrudePatch, @@ -2042,19 +1956,6 @@ int main(int argc, char *argv[]) ); - // Add the patches in between zones - addInterZonePatches - ( - mesh, - zoneNames, - oneD, - - zoneZonePatch_min, - zoneZonePatch_max, - regionPatches - ); - - // Sets sidePatchID[edgeI] to interprocessor patch. Adds any // interprocessor or cyclic patches if necessary. labelList sidePatchID; diff --git a/etc/caseDicts/setConstraintTypes b/etc/caseDicts/setConstraintTypes index bfd6d50fdd..481fb975a2 100644 --- a/etc/caseDicts/setConstraintTypes +++ b/etc/caseDicts/setConstraintTypes @@ -37,11 +37,6 @@ empty type empty; } -nonuniformTransformCyclic -{ - type nonuniformTransformCyclic; -} - cyclicRepeatAMI { type cyclicRepeatAMI; diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index 38ba302a12..558b5f2510 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -473,7 +473,6 @@ $(constraintPolyPatches)/cyclic/cyclicPolyPatch.C $(constraintPolyPatches)/cyclicSlip/cyclicSlipPolyPatch.C $(constraintPolyPatches)/oldCyclic/oldCyclicPolyPatch.C $(constraintPolyPatches)/empty/emptyPolyPatch.C -$(constraintPolyPatches)/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C $(constraintPolyPatches)/processorCyclic/processorCyclicPolyPatch.C $(constraintPolyPatches)/processor/processorPolyPatch.C $(constraintPolyPatches)/symmetryPlane/symmetryPlanePolyPatch.C @@ -595,7 +594,6 @@ constraintPointPatches = $(pointPatches)/constraint $(constraintPointPatches)/cyclic/cyclicPointPatch.C $(constraintPointPatches)/cyclicSlip/cyclicSlipPointPatch.C $(constraintPointPatches)/empty/emptyPointPatch.C -$(constraintPointPatches)/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C $(constraintPointPatches)/processor/processorPointPatch.C $(constraintPointPatches)/processorCyclic/processorCyclicPointPatch.C $(constraintPointPatches)/symmetryPlane/symmetryPlanePointPatch.C @@ -670,7 +668,6 @@ constraintPointPatchFields = $(pointPatchFields)/constraint $(constraintPointPatchFields)/cyclic/cyclicPointPatchFields.C $(constraintPointPatchFields)/cyclicSlip/cyclicSlipPointPatchFields.C $(constraintPointPatchFields)/empty/emptyPointPatchFields.C -$(constraintPointPatchFields)/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.C $(constraintPointPatchFields)/processor/processorPointPatchFields.C $(constraintPointPatchFields)/processorCyclic/processorCyclicPointPatchFields.C $(constraintPointPatchFields)/symmetryPlane/symmetryPlanePointPatchFields.C diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C deleted file mode 100644 index 18ce782d88..0000000000 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C +++ /dev/null @@ -1,109 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "nonuniformTransformCyclicPointPatchField.H" -#include "transformField.H" -#include "symmTransformField.H" - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::nonuniformTransformCyclicPointPatchField:: -nonuniformTransformCyclicPointPatchField -( - const pointPatch& p, - const DimensionedField& iF -) -: - cyclicPointPatchField(p, iF) -{} - - -template -Foam::nonuniformTransformCyclicPointPatchField:: -nonuniformTransformCyclicPointPatchField -( - const pointPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - cyclicPointPatchField(p, iF, dict) -{} - - -template -Foam::nonuniformTransformCyclicPointPatchField:: -nonuniformTransformCyclicPointPatchField -( - const nonuniformTransformCyclicPointPatchField& ptf, - const pointPatch& p, - const DimensionedField& iF, - const pointPatchFieldMapper& mapper -) -: - cyclicPointPatchField(ptf, p, iF, mapper) -{} - - -template -Foam::nonuniformTransformCyclicPointPatchField:: -nonuniformTransformCyclicPointPatchField -( - const nonuniformTransformCyclicPointPatchField& ptf, - const DimensionedField& iF -) -: - cyclicPointPatchField(ptf, iF) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::nonuniformTransformCyclicPointPatchField::evaluate -( - const Pstream::commsTypes -) -{ - const vectorField& nHat = this->patch().pointNormals(); - - tmp> tvalues = - ( - ( - this->patchInternalField() - + transform(I - 2.0*sqr(nHat), this->patchInternalField()) - )/2.0 - ); - - // Get internal field to insert values into - Field& iF = const_cast&>(this->primitiveField()); - - this->setInInternalField(iF, tvalues()); -} - - -// ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H deleted file mode 100644 index efe7bf19aa..0000000000 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H +++ /dev/null @@ -1,147 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::nonuniformTransformCyclicPointPatchField - -Description - Cyclic + slip constraints - -SourceFiles - nonuniformTransformCyclicPointPatchField.C - -\*---------------------------------------------------------------------------*/ - -#ifndef nonuniformTransformCyclicPointPatchField_H -#define nonuniformTransformCyclicPointPatchField_H - -#include "cyclicPointPatchField.H" -#include "nonuniformTransformCyclicPointPatch.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class nonuniformTransformCyclicPointPatchField Declaration -\*---------------------------------------------------------------------------*/ - -template -class nonuniformTransformCyclicPointPatchField -: - public cyclicPointPatchField -{ - -public: - - //- Runtime type information - TypeName(nonuniformTransformCyclicPointPatch::typeName_()); - - - // Constructors - - //- Construct from patch and internal field - nonuniformTransformCyclicPointPatchField - ( - const pointPatch&, - const DimensionedField& - ); - - //- Construct from patch, internal field and dictionary - nonuniformTransformCyclicPointPatchField - ( - const pointPatch&, - const DimensionedField&, - const dictionary& - ); - - //- Construct by mapping given patchField onto a new patch - nonuniformTransformCyclicPointPatchField - ( - const nonuniformTransformCyclicPointPatchField&, - const pointPatch&, - const DimensionedField&, - const pointPatchFieldMapper& - ); - - //- Construct and return a clone - virtual autoPtr> clone() const - { - return autoPtr> - ( - new nonuniformTransformCyclicPointPatchField - ( - *this - ) - ); - } - - //- Construct as copy setting internal field reference - nonuniformTransformCyclicPointPatchField - ( - const nonuniformTransformCyclicPointPatchField&, - const DimensionedField& - ); - - //- Construct and return a clone setting internal field reference - virtual autoPtr> clone - ( - const DimensionedField& iF - ) const - { - return autoPtr> - ( - new nonuniformTransformCyclicPointPatchField - ( - *this, iF - ) - ); - } - - - // Member Functions - - //- Evaluate the patch field - virtual void evaluate - ( - const Pstream::commsTypes commsType=Pstream::commsTypes::blocking - ); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "nonuniformTransformCyclicPointPatchField.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.C deleted file mode 100644 index 22b4912c71..0000000000 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.C +++ /dev/null @@ -1,43 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "nonuniformTransformCyclicPointPatchFields.H" -#include "pointPatchFields.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makePointPatchFields(nonuniformTransformCyclic); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.H b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.H deleted file mode 100644 index 047c2a968d..0000000000 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchFields.H +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#ifndef nonuniformTransformCyclicPointPatchFields_H -#define nonuniformTransformCyclicPointPatchFields_H - -#include "nonuniformTransformCyclicPointPatchField.H" -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -makePointPatchFieldTypedefs(nonuniformTransformCyclic); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C deleted file mode 100644 index 7dcfcc867f..0000000000 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.C +++ /dev/null @@ -1,73 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "nonuniformTransformCyclicPointPatch.H" -#include "pointConstraint.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -defineTypeNameAndDebug(nonuniformTransformCyclicPointPatch, 0); - -addToRunTimeSelectionTable -( - facePointPatch, - nonuniformTransformCyclicPointPatch, - polyPatch -); - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -const vectorField& nonuniformTransformCyclicPointPatch::pointNormals() const -{ - // Use underlying patch normals - return refCast - ( - *this - ).facePointPatch::pointNormals(); -} - - -void nonuniformTransformCyclicPointPatch::applyConstraint -( - const label pointi, - pointConstraint& pc -) const -{ - pc.applyConstraint(pointNormals()[pointi]); -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.H deleted file mode 100644 index 962ec5b9a9..0000000000 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatch.H +++ /dev/null @@ -1,102 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::nonuniformTransformCyclicPointPatch - -Description - Cyclic patch with slip constraint - -SourceFiles - nonuniformTransformCyclicPointPatch.C - -\*---------------------------------------------------------------------------*/ - -#ifndef nonuniformTransformCyclicPointPatch_H -#define nonuniformTransformCyclicPointPatch_H - -#include "cyclicPointPatch.H" -#include "nonuniformTransformCyclicPolyPatch.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class nonuniformTransformCyclicPointPatch Declaration -\*---------------------------------------------------------------------------*/ - -class nonuniformTransformCyclicPointPatch -: - public cyclicPointPatch -{ - -public: - - //- Runtime type information - TypeName(nonuniformTransformCyclicPolyPatch::typeName_()); - - - // Constructors - - //- Construct from components - nonuniformTransformCyclicPointPatch - ( - const polyPatch& patch, - const pointBoundaryMesh& bm - ) - : - cyclicPointPatch(patch, bm) - {} - - - // Destructor - - virtual ~nonuniformTransformCyclicPointPatch() - {} - - - // Member Functions - - //- Return point unit normals. - virtual const vectorField& pointNormals() const; - - //- Accumulate the effect of constraint direction of this patch - virtual void applyConstraint - ( - const label pointi, - pointConstraint& - ) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C deleted file mode 100644 index 3e33613924..0000000000 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "nonuniformTransformCyclicPolyPatch.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(nonuniformTransformCyclicPolyPatch, 0); - - addToRunTimeSelectionTable - ( - polyPatch, - nonuniformTransformCyclicPolyPatch, - word - ); - addToRunTimeSelectionTable - ( - polyPatch, - nonuniformTransformCyclicPolyPatch, - dictionary - ); -} - - -// ************************************************************************* // diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H deleted file mode 100644 index 39fca3642d..0000000000 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H +++ /dev/null @@ -1,203 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::nonuniformTransformCyclicPolyPatch - -Description - Transform boundary used in extruded regions. Allows non-uniform transforms. - Wip. - -SourceFiles - nonuniformTransformCyclicPolyPatch.C - -\*---------------------------------------------------------------------------*/ - -#ifndef nonuniformTransformCyclicPolyPatch_H -#define nonuniformTransformCyclicPolyPatch_H - -#include "cyclicPolyPatch.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class nonuniformTransformCyclicPolyPatch Declaration -\*---------------------------------------------------------------------------*/ - -class nonuniformTransformCyclicPolyPatch -: - public cyclicPolyPatch -{ - -public: - - //- Runtime type information - TypeName("nonuniformTransformCyclic"); - - - // Constructors - - //- Construct from components - nonuniformTransformCyclicPolyPatch - ( - const word& name, - const label size, - const label start, - const label index, - const polyBoundaryMesh& bm, - const word& patchType, - const transformType transform = UNKNOWN - ) - : - cyclicPolyPatch(name, size, start, index, bm, patchType, transform) - {} - - //- Construct from dictionary - nonuniformTransformCyclicPolyPatch - ( - const word& name, - const dictionary& dict, - const label index, - const polyBoundaryMesh& bm, - const word& patchType - ) - : - cyclicPolyPatch(name, dict, index, bm, patchType) - {} - - //- Construct as copy, resetting the boundary mesh - nonuniformTransformCyclicPolyPatch - ( - const nonuniformTransformCyclicPolyPatch& pp, - const polyBoundaryMesh& bm - ) - : - cyclicPolyPatch(pp, bm) - {} - - //- Construct given the original patch and resetting the - // face list and boundary mesh information - nonuniformTransformCyclicPolyPatch - ( - const nonuniformTransformCyclicPolyPatch& pp, - const polyBoundaryMesh& bm, - const label index, - const label newSize, - const label newStart, - const word& neighbPatchName - ) - : - cyclicPolyPatch(pp, bm, index, newSize, newStart, neighbPatchName) - {} - - //- Construct given the original patch and a map - nonuniformTransformCyclicPolyPatch - ( - const nonuniformTransformCyclicPolyPatch& pp, - const polyBoundaryMesh& bm, - const label index, - const labelUList& mapAddressing, - const label newStart - ) - : - cyclicPolyPatch(pp, bm, index, mapAddressing, newStart) - {} - - //- Construct and return a clone, resetting the boundary mesh - virtual autoPtr clone(const polyBoundaryMesh& bm) const - { - return autoPtr - ( - new nonuniformTransformCyclicPolyPatch(*this, bm) - ); - } - - //- Construct and return a clone, resetting the face list - // and boundary mesh - virtual autoPtr clone - ( - const polyBoundaryMesh& bm, - const label index, - const label newSize, - const label newStart - ) const - { - return autoPtr - ( - new nonuniformTransformCyclicPolyPatch - ( - *this, - bm, - index, - newSize, - newStart, - neighbPatchName() - ) - ); - } - - //- Construct and return a clone, resetting the face list - // and boundary mesh - virtual autoPtr clone - ( - const polyBoundaryMesh& bm, - const label index, - const labelUList& mapAddressing, - const label newStart - ) const - { - return autoPtr - ( - new nonuniformTransformCyclicPolyPatch - ( - *this, - bm, - index, - mapAddressing, - newStart - ) - ); - } - - - // Destructor - - virtual ~nonuniformTransformCyclicPolyPatch() - {} - - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index e5a85885f9..82d66d0556 100644 --- a/src/finiteVolume/Make/files +++ b/src/finiteVolume/Make/files @@ -20,7 +20,6 @@ $(constraintFvPatches)/cyclicAMI/cyclicAMIFvPatch.C $(constraintFvPatches)/cyclicACMI/cyclicACMIFvPatch.C $(constraintFvPatches)/cyclicSlip/cyclicSlipFvPatch.C $(constraintFvPatches)/empty/emptyFvPatch.C -$(constraintFvPatches)/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C $(constraintFvPatches)/cyclicRepeatAMI/cyclicRepeatAMIFvPatch.C $(constraintFvPatches)/processor/processorFvPatch.C $(constraintFvPatches)/processorCyclic/processorCyclicFvPatch.C @@ -120,7 +119,6 @@ $(constraintFvPatchFields)/cyclicSlip/cyclicSlipFvPatchFields.C $(constraintFvPatchFields)/empty/emptyFvPatchFields.C $(constraintFvPatchFields)/jumpCyclic/jumpCyclicFvPatchFields.C $(constraintFvPatchFields)/jumpCyclicAMI/jumpCyclicAMIFvPatchFields.C -$(constraintFvPatchFields)/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.C $(constraintFvPatchFields)/cyclicRepeatAMI/cyclicRepeatAMIFvPatchFields.C $(constraintFvPatchFields)/processor/processorFvPatchFields.C $(constraintFvPatchFields)/processor/processorFvPatchScalarField.C @@ -159,7 +157,6 @@ $(derivedFvPatchFields)/inletOutlet/inletOutletFvPatchFields.C $(derivedFvPatchFields)/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C $(derivedFvPatchFields)/mappedField/mappedFieldFvPatchFields.C $(derivedFvPatchFields)/mappedFixedInternalValue/mappedFixedInternalValueFvPatchFields.C -$(derivedFvPatchFields)/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.C $(derivedFvPatchFields)/mappedFixedValue/mappedFixedValueFvPatchFields.C $(derivedFvPatchFields)/mappedFlowRate/mappedFlowRateFvPatchVectorField.C $(derivedFvPatchFields)/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C @@ -231,7 +228,6 @@ $(constraintFvsPatchFields)/cyclicAMI/cyclicAMIFvsPatchFields.C $(constraintFvsPatchFields)/cyclicACMI/cyclicACMIFvsPatchFields.C $(constraintFvsPatchFields)/cyclicSlip/cyclicSlipFvsPatchFields.C $(constraintFvsPatchFields)/empty/emptyFvsPatchFields.C -$(constraintFvsPatchFields)/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.C $(constraintFvsPatchFields)/cyclicRepeatAMI/cyclicRepeatAMIFvsPatchFields.C $(constraintFvsPatchFields)/processor/processorFvsPatchFields.C $(constraintFvsPatchFields)/processorCyclic/processorCyclicFvsPatchFields.C diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C deleted file mode 100644 index 8313eafc4c..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C +++ /dev/null @@ -1,92 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "nonuniformTransformCyclicFvPatchField.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::nonuniformTransformCyclicFvPatchField:: -nonuniformTransformCyclicFvPatchField -( - const fvPatch& p, - const DimensionedField& iF -) -: - cyclicFvPatchField(p, iF) -{} - - -template -Foam::nonuniformTransformCyclicFvPatchField:: -nonuniformTransformCyclicFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - cyclicFvPatchField(p, iF, dict) -{} - - -template -Foam::nonuniformTransformCyclicFvPatchField:: -nonuniformTransformCyclicFvPatchField -( - const nonuniformTransformCyclicFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - cyclicFvPatchField(ptf, p, iF, mapper) -{} - - -template -Foam::nonuniformTransformCyclicFvPatchField:: -nonuniformTransformCyclicFvPatchField -( - const nonuniformTransformCyclicFvPatchField& ptf -) -: - cyclicFvPatchField(ptf) -{} - - -template -Foam::nonuniformTransformCyclicFvPatchField:: -nonuniformTransformCyclicFvPatchField -( - const nonuniformTransformCyclicFvPatchField& ptf, - const DimensionedField& iF -) -: - cyclicFvPatchField(ptf, iF) -{} - - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H deleted file mode 100644 index 1facb5936e..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H +++ /dev/null @@ -1,145 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::nonuniformTransformCyclicFvPatchField - -Description - This boundary condition enforces a cyclic condition between a pair of - boundaries, incorporating a non-uniform transformation. - -SourceFiles - nonuniformTransformCyclicFvPatchField.C - nonuniformTransformCyclicFvPatchFields.H - nonuniformTransformCyclicFvPatchFields.C - nonuniformTransformCyclicFvPatchFieldsFwd.H - -\*---------------------------------------------------------------------------*/ - -#ifndef nonuniformTransformCyclicFvPatchField_H -#define nonuniformTransformCyclicFvPatchField_H - -#include "cyclicFvPatchField.H" -#include "nonuniformTransformCyclicFvPatch.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class nonuniformTransformCyclicFvPatch Declaration -\*---------------------------------------------------------------------------*/ - -template -class nonuniformTransformCyclicFvPatchField -: - public cyclicFvPatchField -{ - // Private Data - -public: - - //- Runtime type information - TypeName(nonuniformTransformCyclicFvPatch::typeName_()); - - - // Constructors - - //- Construct from patch and internal field - nonuniformTransformCyclicFvPatchField - ( - const fvPatch&, - const DimensionedField& - ); - - //- Construct from patch, internal field and dictionary - nonuniformTransformCyclicFvPatchField - ( - const fvPatch&, - const DimensionedField&, - const dictionary& - ); - - //- Construct by mapping given - // nonuniformTransformCyclicFvPatchField onto a new patch - nonuniformTransformCyclicFvPatchField - ( - const nonuniformTransformCyclicFvPatchField&, - const fvPatch&, - const DimensionedField&, - const fvPatchFieldMapper& - ); - - //- Copy constructor - nonuniformTransformCyclicFvPatchField - ( - const nonuniformTransformCyclicFvPatchField& - ); - - //- Construct and return a clone - virtual tmp> clone() const - { - return tmp> - ( - new nonuniformTransformCyclicFvPatchField(*this) - ); - } - - //- Copy constructor setting internal field reference - nonuniformTransformCyclicFvPatchField - ( - const nonuniformTransformCyclicFvPatchField&, - const DimensionedField& - ); - - //- Construct and return a clone setting internal field reference - virtual tmp> clone - ( - const DimensionedField& iF - ) const - { - return tmp> - ( - new nonuniformTransformCyclicFvPatchField(*this, iF) - ); - } - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "nonuniformTransformCyclicFvPatchField.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.C deleted file mode 100644 index d42784ee14..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.C +++ /dev/null @@ -1,43 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "nonuniformTransformCyclicFvPatchFields.H" -#include "addToRunTimeSelectionTable.H" -#include "volFields.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makePatchFields(nonuniformTransformCyclic); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.H deleted file mode 100644 index 7c7fde7322..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFields.H +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#ifndef nonuniformTransformCyclicFvPatchFields_H -#define nonuniformTransformCyclicFvPatchFields_H - -#include "nonuniformTransformCyclicFvPatchField.H" -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -makePatchTypeFieldTypedefs(nonuniformTransformCyclic); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFieldsFwd.H deleted file mode 100644 index c5d28d0d36..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchFieldsFwd.H +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#ifndef nonuniformTransformCyclicFvPatchFieldsFwd_H -#define nonuniformTransformCyclicFvPatchFieldsFwd_H - -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -template class nonuniformTransformCyclicFvPatchField; - -makePatchTypeFieldTypedefs(nonuniformTransformCyclic); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C deleted file mode 100644 index 1f4f83ab3e..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C +++ /dev/null @@ -1,122 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "mappedFixedPushedInternalValueFvPatchField.H" -#include "UIndirectList.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::mappedFixedPushedInternalValueFvPatchField:: -mappedFixedPushedInternalValueFvPatchField -( - const fvPatch& p, - const DimensionedField& iF -) -: - mappedFixedValueFvPatchField(p, iF) -{} - - -template -Foam::mappedFixedPushedInternalValueFvPatchField:: -mappedFixedPushedInternalValueFvPatchField -( - const mappedFixedPushedInternalValueFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mappedFixedValueFvPatchField(ptf, p, iF, mapper) -{} - - -template -Foam::mappedFixedPushedInternalValueFvPatchField:: -mappedFixedPushedInternalValueFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - mappedFixedValueFvPatchField(p, iF, dict) -{} - - -template -Foam::mappedFixedPushedInternalValueFvPatchField:: -mappedFixedPushedInternalValueFvPatchField -( - const mappedFixedPushedInternalValueFvPatchField& ptf -) -: - mappedFixedValueFvPatchField(ptf) -{} - - -template -Foam::mappedFixedPushedInternalValueFvPatchField:: -mappedFixedPushedInternalValueFvPatchField -( - const mappedFixedPushedInternalValueFvPatchField& ptf, - const DimensionedField& iF -) -: - mappedFixedValueFvPatchField(ptf, iF) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::mappedFixedPushedInternalValueFvPatchField::updateCoeffs() -{ - if (this->updated()) - { - return; - } - - // Retrieve the neighbour values and assign to this patch boundary field - mappedFixedValueFvPatchField::updateCoeffs(); - - // Assign the patch internal field to its boundary value - Field& intFld = const_cast&>(this->primitiveField()); - UIndirectList(intFld, this->patch().faceCells()) = *this; -} - - -template -void Foam::mappedFixedPushedInternalValueFvPatchField::write -( - Ostream& os -) const -{ - mappedFixedValueFvPatchField::write(os); -} - - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H deleted file mode 100644 index cce45afc25..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.H +++ /dev/null @@ -1,187 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::mappedFixedPushedInternalValueFvPatchField - -Description - This boundary condition maps the boundary values of a neighbour patch - field to the boundary and internal cell values of *this. - -Usage - \table - Property | Description | Required | Default value - fieldName | name of field to be mapped | no | this field name - setAverage | flag to activate setting of average value | yes | - average | average value to apply if \c setAverage = yes | yes | - \endtable - - Example of the boundary condition specification: - \verbatim - - { - type mappedFixedPushedInternalValue; - fieldName T; - setAverage no; - average 0; - value uniform 0; - } - \endverbatim - -Note - This boundary condition can only be applied to patches that are of - the \c mappedPolyPatch type. - -See also - Foam::mappedPatchBase - Foam::mappedPolyPatch - Foam::mappedFvPatch - Foam::mappedFixedValueFvPatchField - -SourceFiles - mappedFixedPushedInternalValueFvPatchField.C - -\*---------------------------------------------------------------------------*/ - -#ifndef mappedFixedPushedInternalValueFvPatchField_H -#define mappedFixedPushedInternalValueFvPatchField_H - -#include "mappedFixedValueFvPatchField.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class mappedFixedPushedInternalValueFvPatchField Declaration -\*---------------------------------------------------------------------------*/ - -template -class mappedFixedPushedInternalValueFvPatchField -: - public mappedFixedValueFvPatchField -{ - -public: - - //- Runtime type information - TypeName("mappedFixedPushedInternalValue"); - - - // Constructors - - //- Construct from patch and internal field - mappedFixedPushedInternalValueFvPatchField - ( - const fvPatch&, - const DimensionedField& - ); - - //- Construct from patch, internal field and dictionary - mappedFixedPushedInternalValueFvPatchField - ( - const fvPatch&, - const DimensionedField&, - const dictionary& - ); - - //- Construct by mapping given a - // mappedFixedPushedInternalValueFvPatchField onto a new patch - mappedFixedPushedInternalValueFvPatchField - ( - const mappedFixedPushedInternalValueFvPatchField&, - const fvPatch&, - const DimensionedField&, - const fvPatchFieldMapper& - ); - - //- Copy constructor - mappedFixedPushedInternalValueFvPatchField - ( - const mappedFixedPushedInternalValueFvPatchField& - ); - - //- Construct and return a clone - virtual tmp> clone() const - { - return tmp> - ( - new mappedFixedPushedInternalValueFvPatchField - ( - *this - ) - ); - } - - //- Copy constructor setting internal field reference - mappedFixedPushedInternalValueFvPatchField - ( - const mappedFixedPushedInternalValueFvPatchField&, - const DimensionedField& - ); - - //- Construct and return a clone setting internal field reference - virtual tmp> clone - ( - const DimensionedField& iF - ) const - { - return tmp> - ( - new mappedFixedPushedInternalValueFvPatchField - ( - *this, - iF - ) - ); - } - - - // Member Functions - - // Evaluation functions - - //- Update the coefficients associated with the patch field - virtual void updateCoeffs(); - - //- Write - virtual void write(Ostream&) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "mappedFixedPushedInternalValueFvPatchField.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.C deleted file mode 100644 index a9e6b47b8e..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.C +++ /dev/null @@ -1,43 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "mappedFixedPushedInternalValueFvPatchFields.H" -#include "volMesh.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makePatchFields(mappedFixedPushedInternalValue); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.H deleted file mode 100644 index 441bb8978b..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFields.H +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#ifndef mappedFixedPushedInternalValueFvPatchFields_H -#define mappedFixedPushedInternalValueFvPatchFields_H - -#include "mappedFixedPushedInternalValueFvPatchField.H" -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -makePatchTypeFieldTypedefs(mappedFixedPushedInternalValue) - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H deleted file mode 100644 index 4bb91ec047..0000000000 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchFieldsFwd.H +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#ifndef mappedFixedPushedInternalValueFvPatchFieldsFwd_H -#define mappedFixedPushedInternalValueFvPatchFieldsFwd_H - -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -template class mappedFixedPushedInternalValueFvPatchField; - -makePatchTypeFieldTypedefs(mappedFixedPushedInternalValue) - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C deleted file mode 100644 index 65ea0910a5..0000000000 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C +++ /dev/null @@ -1,92 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "nonuniformTransformCyclicFvsPatchField.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::nonuniformTransformCyclicFvsPatchField:: -nonuniformTransformCyclicFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF -) -: - cyclicFvsPatchField(p, iF) -{} - - -template -Foam::nonuniformTransformCyclicFvsPatchField:: -nonuniformTransformCyclicFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - cyclicFvsPatchField(p, iF, dict) -{} - - -template -Foam::nonuniformTransformCyclicFvsPatchField:: -nonuniformTransformCyclicFvsPatchField -( - const nonuniformTransformCyclicFvsPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - cyclicFvsPatchField(ptf, p, iF, mapper) -{} - - -template -Foam::nonuniformTransformCyclicFvsPatchField:: -nonuniformTransformCyclicFvsPatchField -( - const nonuniformTransformCyclicFvsPatchField& ptf -) -: - cyclicFvsPatchField(ptf) -{} - - -template -Foam::nonuniformTransformCyclicFvsPatchField:: -nonuniformTransformCyclicFvsPatchField -( - const nonuniformTransformCyclicFvsPatchField& ptf, - const DimensionedField& iF -) -: - cyclicFvsPatchField(ptf, iF) -{} - - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H deleted file mode 100644 index 6f4201adc7..0000000000 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H +++ /dev/null @@ -1,139 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::nonuniformTransformCyclicFvsPatchField - -Description - Foam::nonuniformTransformCyclicFvsPatchField - -SourceFiles - nonuniformTransformCyclicFvsPatchField.C - -\*---------------------------------------------------------------------------*/ - -#ifndef nonuniformTransformCyclicFvsPatchField_H -#define nonuniformTransformCyclicFvsPatchField_H - -#include "cyclicFvsPatchField.H" -#include "nonuniformTransformCyclicFvPatch.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class nonuniformTransformCyclicFvsPatch Declaration -\*---------------------------------------------------------------------------*/ - -template -class nonuniformTransformCyclicFvsPatchField -: - public cyclicFvsPatchField -{ - -public: - - //- Runtime type information - TypeName(nonuniformTransformCyclicFvPatch::typeName_()); - - - // Constructors - - //- Construct from patch and internal field - nonuniformTransformCyclicFvsPatchField - ( - const fvPatch&, - const DimensionedField& - ); - - //- Construct from patch, internal field and dictionary - nonuniformTransformCyclicFvsPatchField - ( - const fvPatch&, - const DimensionedField&, - const dictionary& - ); - - //- Construct by mapping given - // nonuniformTransformCyclicFvsPatchField onto a new patch - nonuniformTransformCyclicFvsPatchField - ( - const nonuniformTransformCyclicFvsPatchField&, - const fvPatch&, - const DimensionedField&, - const fvPatchFieldMapper& - ); - - //- Copy constructor - nonuniformTransformCyclicFvsPatchField - ( - const nonuniformTransformCyclicFvsPatchField& - ); - - //- Construct and return a clone - virtual tmp> clone() const - { - return tmp> - ( - new nonuniformTransformCyclicFvsPatchField(*this) - ); - } - - //- Copy constructor setting internal field reference - nonuniformTransformCyclicFvsPatchField - ( - const nonuniformTransformCyclicFvsPatchField&, - const DimensionedField& - ); - - //- Construct and return a clone setting internal field reference - virtual tmp> clone - ( - const DimensionedField& iF - ) const - { - return tmp> - ( - new nonuniformTransformCyclicFvsPatchField(*this, iF) - ); - } -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "nonuniformTransformCyclicFvsPatchField.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.C deleted file mode 100644 index 4f8e3d83fe..0000000000 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.C +++ /dev/null @@ -1,43 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "nonuniformTransformCyclicFvsPatchFields.H" -#include "fvsPatchFields.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeFvsPatchFields(nonuniformTransformCyclic); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.H b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.H deleted file mode 100644 index 84306e9eba..0000000000 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFields.H +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#ifndef nonuniformTransformCyclicFvsPatchFields_H -#define nonuniformTransformCyclicFvsPatchFields_H - -#include "nonuniformTransformCyclicFvsPatchField.H" -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -makeFvsPatchTypeFieldTypedefs(nonuniformTransformCyclic); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFieldsFwd.H b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFieldsFwd.H deleted file mode 100644 index 2ede9f9dc8..0000000000 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchFieldsFwd.H +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#ifndef nonuniformTransformCyclicFvsPatchFieldsFwd_H -#define nonuniformTransformCyclicFvsPatchFieldsFwd_H - -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -template class nonuniformTransformCyclicFvsPatchField; - -makeFvsPatchTypeFieldTypedefs(nonuniformTransformCyclic); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C deleted file mode 100644 index 9f882eca9b..0000000000 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "nonuniformTransformCyclicFvPatch.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -defineTypeNameAndDebug(nonuniformTransformCyclicFvPatch, 0); -addToRunTimeSelectionTable -( - fvPatch, - nonuniformTransformCyclicFvPatch, - polyPatch -); - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.H deleted file mode 100644 index ded9a87b47..0000000000 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.H +++ /dev/null @@ -1,83 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::nonuniformTransformCyclicFvPatch - -Description - Cyclic-plane patch. - -SourceFiles - nonuniformTransformCyclicFvPatch.C - -\*---------------------------------------------------------------------------*/ - -#ifndef nonuniformTransformCyclicFvPatch_H -#define nonuniformTransformCyclicFvPatch_H - -#include "cyclicFvPatch.H" -#include "nonuniformTransformCyclicPolyPatch.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class nonuniformTransformCyclicFvPatch Declaration -\*---------------------------------------------------------------------------*/ - -class nonuniformTransformCyclicFvPatch -: - public cyclicFvPatch -{ - -public: - - //- Runtime type information - TypeName(nonuniformTransformCyclicPolyPatch::typeName_()); - - - // Constructors - - //- Construct from polyPatch - nonuniformTransformCyclicFvPatch - ( - const polyPatch& patch, - const fvBoundaryMesh& bm - ) - : - cyclicFvPatch(patch, bm) - {} -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C index 8d851929d3..d7e1775ac9 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C @@ -24,6 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "ThermoSurfaceFilm.H" +#include "thermoSingleLayer.H" #include "addToRunTimeSelectionTable.H" #include "mathematicalConstants.H" #include "Pstream.H" @@ -618,10 +619,16 @@ void Foam::ThermoSurfaceFilm::cacheFilmFields filmModel ); - TFilmPatch_ = filmModel.Ts().boundaryField()[filmPatchi]; + const regionModels::surfaceFilmModels::thermoSingleLayer& thermalFilmModel = + refCast + ( + filmModel + ); + + TFilmPatch_ = thermalFilmModel.Ts().boundaryField()[filmPatchi]; filmModel.toPrimary(filmPatchi, TFilmPatch_); - CpFilmPatch_ = filmModel.Cp().boundaryField()[filmPatchi]; + CpFilmPatch_ = thermalFilmModel.Cp().boundaryField()[filmPatchi]; filmModel.toPrimary(filmPatchi, CpFilmPatch_); } diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C index e012ac835c..e182797118 100644 --- a/src/regionModels/regionModel/regionModel/regionModel.C +++ b/src/regionModels/regionModel/regionModel/regionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,10 +65,7 @@ void Foam::regionModels::regionModel::constructMeshObjects() void Foam::regionModels::regionModel::initialise() { - if (debug) - { - Pout<< "regionModel::initialise()" << endl; - } + DebugInFunction << endl; label nBoundaryFaces = 0; DynamicList