Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
OpenFOAM-plus
Commits
22de6376
Commit
22de6376
authored
Apr 18, 2017
by
mark
Browse files
BUG: paraFoam inside processor directory always looks for parent (fixes
#452
)
parent
12d7b715
Changes
1
Hide whitespace changes
Inline
Side-by-side
bin/paraFoam
View file @
22de6376
...
...
@@ -172,14 +172,12 @@ fvControls="system"
if
[
-n
"
$regionName
"
]
then
if
[
!
-d
constant/
$regionName
]
then
[
-d
constant/
$regionName
]
||
{
echo
"FATAL ERROR: Region
$regionName
does not exist"
1>&2
exit
1
else
caseFile
=
"
$caseName
{
$regionName
}.
$extension
"
fvControls
=
"
$fvControls
/
$regionName
"
fi
}
caseFile
=
"
$caseName
{
$regionName
}.
$extension
"
fvControls
=
"
$fvControls
/
$regionName
"
fi
case
"
${
optTouch
:-
false
}
"
in
...
...
@@ -212,11 +210,42 @@ true)
esac
# Parent directory for normal or parallel results
case
"
$caseName
"
in
processor
*
)
parentDir
=
".."
;;
*
)
parentDir
=
"."
;;
esac
# Check existence of some essential OpenFOAM files.
# If caseName appears to be a processor directory, check parent as fallback
hasFiles
()
{
local
warn
=
"Cannot locate OpenFOAM-format case files:"
local
parent
case
"
$caseName
"
in
(
processor
*
)
parent
=
"../"
;;
esac
for
file
do
if
[
-s
"
$file
"
]
then
continue
elif
[
-n
"
$parent
"
-a
-s
"
$parent$file
"
]
then
continue
else
# Not found
[
-n
"
$warn
"
]
&&
echo
"
$warn
"
1>&2
unset
warn
if
[
-n
"
$parent
"
]
then
echo
"
$file
, or
$parent$file
"
1>&2
else
echo
"
$file
"
1>&2
fi
fi
done
if
[
-n
"
$warn
"
]
then
return
0
# No warnings were triggered
else
echo
1>&2
# Emit an additional separator line
return
1
fi
}
if
[
"
${
hasData
:-
false
}
"
=
true
]
...
...
@@ -228,7 +257,7 @@ then
else
# Check existence of essential files
warn
=
"WARN file does not exist:"
warn
=
false
case
$extension
in
blockMesh
)
blockMeshDict
=
system/blockMeshDict
...
...
@@ -236,40 +265,22 @@ else
then
blockMeshDict
=
constant/polyMesh/blockMeshDict
fi
for
check
in
\
system/controlDict
\
$blockMeshDict
\
;
do
[
-s
"
$parentDir
/
$check
"
]
||
{
[
-n
"
$warn
"
]
&&
echo
"
$warn
"
1>&2
echo
"
$parentDir
/
$check
"
1>&2
unset
warn
}
done
hasFiles system/controlDict
$blockMeshDict
||
warn
=
true
;;
OpenFOAM
)
for
check
in
\
hasFiles
\
system/controlDict
\
$fvControls
/fvSchemes
\
$fvControls
/fvSolution
\
;
do
[
-s
"
$parentDir
/
$check
"
]
||
{
[
-n
"
$warn
"
]
&&
echo
"
$warn
"
1>&2
echo
"
$parentDir
/
$check
"
1>&2
unset
warn
}
done
$fvControls
/fvSchemes
\
$fvControls
/fvSolution
||
warn
=
true
;;
esac
[
-n
"
$warn
"
]
||
{
echo
"Cannot locate OpenFOAM-format case files"
echo
-n
"Would you like to open ParaView anyway <Y|n>:"
[
"
${
warn
:-
false
}
"
=
false
]
||
{
echo
-n
"Would you like to open paraview anyway <Y|n>: "
read
open
[
"
$open
"
=
""
]
||
echo
$open
|
grep
-iqE
"^y"
&&
paraview
case
"
${
open
:-
y
}
"
in
([
Yy]
*
)
paraview
;;
esac
exit
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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