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
22b659d7
Commit
22b659d7
authored
Jan 07, 2019
by
Mark OLESEN
Browse files
ENH: export FOAM_API in dictionary (issue
#1158
)
- uses the value of foamVersion::api, which should be reliable.
parent
e7fde1db
Changes
7
Hide whitespace changes
Inline
Side-by-side
applications/test/dictionary/testDictAPI
0 → 100644
View file @
22b659d7
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v1812 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object testDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
_FOAM_API $FOAM_API;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.C
View file @
22b659d7
...
...
@@ -30,6 +30,7 @@ License
#include
"areaFaMesh.H"
#include
"faMesh.H"
#include
"fvMesh.H"
#include
"foamVersion.H"
#include
"Time.H"
#include
"patchZones.H"
#include
"IOobjectList.H"
...
...
@@ -314,6 +315,9 @@ Foam::vtkPVFoam::vtkPVFoam
fullCasePath
=
cwd
();
}
// OPENFOAM API
setEnv
(
"FOAM_API"
,
std
::
to_string
(
foamVersion
::
api
),
true
);
// The name of the executable, unless already present in the environment
setEnv
(
"FOAM_EXECUTABLE"
,
"paraview"
,
false
);
...
...
applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/vtkPVblockMesh.C
View file @
22b659d7
...
...
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2017
-2019
OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -29,6 +29,7 @@ License
// OpenFOAM includes
#include
"blockMesh.H"
#include
"blockMeshTools.H"
#include
"foamVersion.H"
#include
"Time.H"
#include
"patchZones.H"
#include
"StringStream.H"
...
...
@@ -206,6 +207,9 @@ Foam::vtkPVblockMesh::vtkPVblockMesh
fullCasePath
=
cwd
();
}
// OPENFOAM API
setEnv
(
"FOAM_API"
,
std
::
to_string
(
foamVersion
::
api
),
true
);
// The name of the executable, unless already present in the environment
setEnv
(
"FOAM_EXECUTABLE"
,
"paraview"
,
false
);
...
...
etc/config.csh/unset
View file @
22b659d7
...
...
@@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2016-201
7
OpenCFD Ltd.
# \\/ M anipulation | Copyright (C) 2016-201
9
OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
...
...
@@ -73,6 +73,7 @@ unsetenv WM_THIRD_PARTY_DIR
#------------------------------------------------------------------------------
# Unset FOAM_* environment variables
unsetenv FOAM_API
unsetenv FOAM_APPBIN
unsetenv FOAM_APP
unsetenv FOAM_CODE_TEMPLATES
...
...
etc/config.sh/unset
View file @
22b659d7
...
...
@@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2016-201
8
OpenCFD Ltd.
# \\/ M anipulation | Copyright (C) 2016-201
9
OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
...
...
@@ -63,6 +63,7 @@ unset WM_THIRD_PARTY_DIR
#------------------------------------------------------------------------------
# Unset FOAM_* environment variables
unset
FOAM_API
unset
FOAM_APPBIN
unset
FOAM_APP
unset
FOAM_CODE_TEMPLATES
...
...
src/OpenFOAM/global/argList/argList.C
View file @
22b659d7
...
...
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-201
8
OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-201
9
OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -672,6 +672,9 @@ void Foam::argList::setCasePaths()
globalCase_
=
caseDir
.
name
();
case_
=
globalCase_
;
// The (processor) local case name
// OPENFOAM API
setEnv
(
"FOAM_API"
,
std
::
to_string
(
foamVersion
::
api
),
true
);
// Global case (directory) and case-name as environment variables
setEnv
(
"FOAM_CASE"
,
caseDir
,
true
);
setEnv
(
"FOAM_CASENAME"
,
globalCase_
,
true
);
...
...
src/OpenFOAM/global/argList/argList.H
View file @
22b659d7
...
...
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016-201
8
OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2016-201
9
OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -57,6 +57,8 @@ Description
may be present for some solvers or utilities.
Environment variables set by argList or by Time:
- \par FOAM_API
The value of foamVersion::api
- \par FOAM_CASE
The path of the global case.
It is the same for serial and parallel jobs.
...
...
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