Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
OpenFOAM-plus
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Development
OpenFOAM-plus
Commits
20ffdb88
Commit
20ffdb88
authored
7 years ago
by
Andrew Heather
Browse files
Options
Downloads
Patches
Plain Diff
GIT: corrected incorrect merge artefacts
parent
d1a20c9f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+0
-6
0 additions, 6 deletions
...d/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
with
0 additions
and
6 deletions
src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+
0
−
6
View file @
20ffdb88
...
@@ -101,12 +101,6 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
...
@@ -101,12 +101,6 @@ Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
patchInternalField
()
patchInternalField
()
+
gradient
()
*
(
patch
().
nf
()
&
patch
().
delta
())
+
gradient
()
*
(
patch
().
nf
()
&
patch
().
delta
())
);
);
}
else
{
// Enforce mapping of values so we have a valid starting value. This
// constructor is used when reconstructing fields
this
->
map
(
ptf
,
mapper
);
}
}
}
}
else
else
...
...
This diff is collapsed.
Click to expand it.
Bas Nieuwboer
@bjnieuwboer
mentioned in issue
#802 (closed)
·
7 years ago
mentioned in issue
#802 (closed)
mentioned in issue #802
Toggle commit list
Bas Nieuwboer
@bjnieuwboer
mentioned in issue
#821
·
7 years ago
mentioned in issue
#821
mentioned in issue #821
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment