Merge branch 'vv-lagrangian-heat-transfer-models' into 'develop' (48cdf552) · Commits · Development / openfoam

Commit 48cdf552 authored 3 years ago by

Andrew Heather

Merge branch 'vv-lagrangian-heat-transfer-models' into 'develop'

ENH: CloudFunctionObject: new particle function objects

See merge request !443

parents a857c8d3 7788a1a0

Branches

Tags

1 merge request!443ENH: CloudFunctionObject: new particle function objects

Hide whitespace changes

Inline Side-by-side

Showing

src/lagrangian/intermediate/parcels/derived/basicHeterogeneousReactingParcel/makeBasicHeterogeneousReactingParcelSubmodels.C 3 additions, 3 deletions

...ingParcel/makeBasicHeterogeneousReactingParcelSubmodels.C
src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C 3 additions, 3 deletions

...iphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C 3 additions, 3 deletions

...ed/basicReactingParcel/makeBasicReactingParcelSubmodels.C
src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C 3 additions, 3 deletions

...erived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H 2 additions, 1 deletion

...rmediate/parcels/include/makeParcelCloudFunctionObjects.H
src/lagrangian/intermediate/parcels/include/makeReactingParcelCloudFunctionObjects.H 8 additions, 2 deletions

.../parcels/include/makeReactingParcelCloudFunctionObjects.H
src/lagrangian/intermediate/parcels/include/makeThermoParcelCloudFunctionObjects.H 74 additions, 0 deletions

...te/parcels/include/makeThermoParcelCloudFunctionObjects.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.C 114 additions, 0 deletions

...loudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.H 154 additions, 0 deletions

...loudFunctionObjects/HeatTransferCoeff/HeatTransferCoeff.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.C 100 additions, 0 deletions

...Objects/KinematicReynoldsNumber/KinematicReynoldsNumber.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.H 171 additions, 0 deletions

...Objects/KinematicReynoldsNumber/KinematicReynoldsNumber.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/NusseltNumber/NusseltNumber.C 114 additions, 0 deletions

...models/CloudFunctionObjects/NusseltNumber/NusseltNumber.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/NusseltNumber/NusseltNumber.H 154 additions, 0 deletions

...models/CloudFunctionObjects/NusseltNumber/NusseltNumber.H
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.C 110 additions, 0 deletions

...nctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.C
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.H 177 additions, 0 deletions

...nctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.H
src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C 2 additions, 8 deletions

...c/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H 83 additions, 7 deletions

...c/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C 1 addition, 34 deletions

...dynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H 46 additions, 8 deletions

...dynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C 13 additions, 10 deletions

...ermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C

with 1335 additions and 82 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'vv-lagrangian-heat-transfer-models' into 'develop'