GIT: Resolved conflict merging master into develop (b53389ed) · Commits · Development / openfoam · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

openfoam
- Activity
- Members
- Labels
- Releases
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Admin message

Site will likely be offline for maintenance 27/28 March - more details soon

Development
openfoam
Commits
b53389ed

Commit b53389ed authored 8 years ago by

Andrew Heather

Downloads
- Plain Diff

GIT: Resolved conflict merging master into develop

parents 91f8176a 162a0eac

Branches

Tags

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C 1 addition, 1 deletion

...rFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C 6 additions, 1 deletion

.../solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C 9 additions, 9 deletions

...Tools/general/porosityModel/porosityModel/porosityModel.C
src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H 1 addition, 0 deletions

...diate/parcels/Templates/CollidingParcel/CollidingParcel.H
src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H 3 additions, 2 deletions

...ls/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C 35 additions, 34 deletions

...Mixed/humidityTemperatureCoupledMixedFvPatchScalarField.C

with 55 additions and 47 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment