GIT: resolve merge errors to ddt2, zeroGradient functionObjects (1e00bd7f) · 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.

Development
openfoam
Commits
1e00bd7f

Commit 1e00bd7f authored 8 years ago by

Mark Olesen

Downloads
- Patches
- Plain Diff

GIT: resolve merge errors to ddt2, zeroGradient functionObjects

- the function objects are from issue #224 and issue #235

parent 3c869951

Branches

Tags

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/functionObjects/field/ddt2/ddt2.C 47 additions, 49 deletions

src/functionObjects/field/ddt2/ddt2.C
src/functionObjects/field/ddt2/ddt2.H 2 additions, 5 deletions

src/functionObjects/field/ddt2/ddt2.H
src/functionObjects/field/ddt2/ddt2Templates.C 5 additions, 5 deletions

src/functionObjects/field/ddt2/ddt2Templates.C
src/functionObjects/field/zeroGradient/zeroGradient.C 45 additions, 45 deletions

src/functionObjects/field/zeroGradient/zeroGradient.C
src/functionObjects/field/zeroGradient/zeroGradient.H 5 additions, 6 deletions

src/functionObjects/field/zeroGradient/zeroGradient.H
src/functionObjects/field/zeroGradient/zeroGradientTemplates.C 7 additions, 4 deletions

...unctionObjects/field/zeroGradient/zeroGradientTemplates.C

with 111 additions and 114 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