Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
fdb1c0be
Commit
fdb1c0be
authored
Sep 29, 2010
by
mattijs
Browse files
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
parents
e4aca56a
ad925d65
Changes
9
Hide whitespace changes
Inline
Side-by-side
applications/solvers/multiphase/bubbleFoam/createPhia.H
View file @
fdb1c0be
...
...
@@ -6,24 +6,26 @@
IOobject
::
NO_READ
);
surfaceScalarField
*
phiaPtr
;
autoPtr
<
surfaceScalarField
>
phiaPtr
(
NULL
);
if
(
phiaHeader
.
headerOk
())
{
Info
<<
"Reading face flux field phia
\n
"
<<
endl
;
phiaPtr
=
new
surfaceScalarField
phiaPtr
.
reset
(
IOobject
new
surfaceScalarField
(
"phia"
,
runTime
.
timeName
(),
mesh
,
IOobject
::
MUST_READ
,
IOobject
::
AUTO_WRITE
),
mesh
IOobject
(
"phia"
,
runTime
.
timeName
(),
mesh
,
IOobject
::
MUST_READ
,
IOobject
::
AUTO_WRITE
),
mesh
)
);
}
else
...
...
@@ -44,19 +46,22 @@
}
}
phiaPtr
=
new
surfaceScalarField
phiaPtr
.
reset
(
IOobject
new
surfaceScalarField
(
"phia"
,
runTime
.
timeName
(),
mesh
,
IOobject
::
NO_READ
,
IOobject
::
AUTO_WRITE
),
fvc
::
interpolate
(
Ua
)
&
mesh
.
Sf
(),
phiTypes
IOobject
(
"phia"
,
runTime
.
timeName
(),
mesh
,
IOobject
::
NO_READ
,
IOobject
::
AUTO_WRITE
),
fvc
::
interpolate
(
Ua
)
&
mesh
.
Sf
(),
phiTypes
)
);
}
surfaceScalarField
&
phia
=
*
phiaPtr
;
surfaceScalarField
&
phia
=
phiaPtr
()
;
applications/solvers/multiphase/bubbleFoam/createPhib.H
View file @
fdb1c0be
...
...
@@ -6,24 +6,26 @@
IOobject
::
NO_READ
);
surfaceScalarField
*
phibPtr
;
autoPtr
<
surfaceScalarField
>
phibPtr
(
NULL
);
if
(
phibHeader
.
headerOk
())
{
Info
<<
"Reading face flux field phib
\n
"
<<
endl
;
phibPtr
=
new
surfaceScalarField
phibPtr
.
reset
(
IOobject
new
surfaceScalarField
(
"phib"
,
runTime
.
timeName
(),
mesh
,
IOobject
::
MUST_READ
,
IOobject
::
AUTO_WRITE
),
mesh
IOobject
(
"phib"
,
runTime
.
timeName
(),
mesh
,
IOobject
::
MUST_READ
,
IOobject
::
AUTO_WRITE
),
mesh
)
);
}
else
...
...
@@ -44,19 +46,22 @@
}
}
phibPtr
=
new
surfaceScalarField
phibPtr
.
reset
(
IOobject
new
surfaceScalarField
(
"phib"
,
runTime
.
timeName
(),
mesh
,
IOobject
::
NO_READ
,
IOobject
::
AUTO_WRITE
),
fvc
::
interpolate
(
Ub
)
&
mesh
.
Sf
(),
phiTypes
IOobject
(
"phib"
,
runTime
.
timeName
(),
mesh
,
IOobject
::
NO_READ
,
IOobject
::
AUTO_WRITE
),
fvc
::
interpolate
(
Ub
)
&
mesh
.
Sf
(),
phiTypes
)
);
}
surfaceScalarField
&
phib
=
*
phibPtr
;
surfaceScalarField
&
phib
=
phibPtr
()
;
applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
View file @
fdb1c0be
...
...
@@ -80,7 +80,7 @@ Foam::threePhaseMixture::threePhaseMixture
viscosityModel
::
New
(
"nu3"
,
subDict
(
phase
2
Name_
),
subDict
(
phase
3
Name_
),
U
,
phi
)
...
...
etc/apps/paraview3/bashrc
View file @
fdb1c0be
...
...
@@ -50,9 +50,9 @@ do
done
# set VERSION and MAJOR (version) variables
if not already set
[
-n
"
$ParaView_VERSION
"
]
||
ParaView_VERSION
=
3.8.0
[
-n
"
$ParaView_MAJOR
"
]
||
ParaView_MAJOR
=
unknown
# set VERSION and MAJOR (version) variables
ParaView_VERSION
=
3.8.0
ParaView_MAJOR
=
unknown
# if needed, set MAJOR version to correspond to VERSION
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
...
...
@@ -95,4 +95,5 @@ fi
unset
cleaned cmake paraviewInstDir paraviewPython
# -----------------------------------------------------------------------------
etc/apps/paraview3/cshrc
View file @
fdb1c0be
...
...
@@ -48,9 +48,9 @@ foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 )
endif
end
# set VERSION and MAJOR (version) variables
if not already set
if
(
!
$?
ParaView_VERSION
)
setenv ParaView_VERSION 3.8.0
if
(
!
$?
ParaView_MAJOR
)
setenv ParaView_MAJOR unknown
# set VERSION and MAJOR (version) variables
setenv ParaView_VERSION 3.8.0
setenv ParaView_MAJOR unknown
# if needed, set MAJOR version to correspond to VERSION
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
...
...
@@ -91,4 +91,5 @@ endif
unset
cleaned cmake paraviewInstDir paraviewPython
# -----------------------------------------------------------------------------
etc/bashrc
View file @
fdb1c0be
...
...
@@ -32,7 +32,7 @@
#------------------------------------------------------------------------------
export
WM_PROJECT
=
OpenFOAM
[
-z
"
$WM_PROJECT_VERSION
"
]
&&
export
WM_PROJECT_VERSION
=
dev
export
WM_PROJECT_VERSION
=
dev
################################################################################
# USER EDITABLE PART. Note changes made here may be lost with the next upgrade
...
...
etc/cellModels
View file @
fdb1c0be
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.
6
|
| \\ / O peration | Version: 1.
7
|
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
...
...
etc/controlDict
View file @
fdb1c0be
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.
6
|
| \\ / O peration | Version: 1.
7
|
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
...
...
etc/cshrc
View file @
fdb1c0be
...
...
@@ -31,7 +31,7 @@
#------------------------------------------------------------------------------
setenv WM_PROJECT OpenFOAM
if
(
!
$?
WM_PROJECT_VERSION
)
setenv WM_PROJECT_VERSION dev
setenv WM_PROJECT_VERSION dev
################################################################################
# USER EDITABLE PART. Note changes made here may be lost with the next upgrade
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment