exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge /u/henrus/foam-extend-4.0/ branch bugfix/swak4foam into nextRelease

Browse source 
https://sourceforge.net/p/foam-extend/foam-extend-4.0/merge-requests/54/
This commit is contained in:
Henrik Rusche 2018-06-06 12:35:52 +00:00
commit 6eb6f12071
5 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ThirdParty/AllMake.stage5 vendored
View file

@ -62,7 +62,7 @@ echo
# which is also replicated under the Breeder_2.0 section of the Subversion repository # which is also replicated under the Breeder_2.0 section of the Subversion repository
# #
SWAK_RELEASE_VERSION=0.4.0 SWAK_RELEASE_VERSION=0.4.2
if [ -z "$SWAK4FOAM_SYSTEM" ] if [ -z "$SWAK4FOAM_SYSTEM" ]
then then
@ -78,16 +78,22 @@ then
then then
echo "Using Mercurial/hg to download the source code for swak4Foam" echo "Using Mercurial/hg to download the source code for swak4Foam"
( (
cd ./rpmBuild/BUILD; cd ./rpmBuild/BUILD
hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION; hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION
cd swak4Foam-$SWAK_RELEASE_VERSION; cd swak4Foam-$SWAK_RELEASE_VERSION
hg checkout version_${SWAK_RELEASE_VERSION}_v2.x #hg checkout version_${SWAK_RELEASE_VERSION}_v2.x
# We use dev-branch temporarily
hg checkout compile_foamExtend4.1
) )
else else
echo "Warning: Mercurial/hg is not installed. Switching to an alternate Subversion repository" echo "Warning: Mercurial/hg is not installed. Switching to an alternate Subversion repository"
command -v svn >/dev/null command -v svn >/dev/null
if [ $? -eq 0 ]; if [ $? -eq 0 ];
then then
# Disabled temporarily
echo "Subversion/svn is currently not supported"
exit -1
echo "Using Subversion/svn to download the source code for swak4Foam" echo "Using Subversion/svn to download the source code for swak4Foam"
(cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_2.0/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION) (cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_2.0/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION)
else else

2
bin/addr2line4Mac.py
View file

@ -11,6 +11,8 @@ if path.exists(filename):
fullFile=filename fullFile=filename
for v in ["PATH","LD_LIBRARY_PATH"]: for v in ["PATH","LD_LIBRARY_PATH"]:
if not v in environ:
continue
if not fullFile: if not fullFile:
for d in environ[v].split(':'): for d in environ[v].split(':'):
if path.exists(path.join(d,filename)): if path.exists(path.join(d,filename)):

2
etc/bashrc
View file

@ -91,7 +91,7 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty
# Use 'set' and 'unset' to adjust for your environent # Use 'set' and 'unset' to adjust for your environent
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# For AllMake.stage1 # For AllMake.stage1
export WM_THIRD_PARTY_USE_BISON_27=1 #export WM_THIRD_PARTY_USE_BISON_27=1
#export WM_THIRD_PARTY_USE_CMAKE_322=1 #export WM_THIRD_PARTY_USE_CMAKE_322=1
# #

2
etc/cshrc
View file

@ -77,7 +77,7 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_DIR/ThirdParty
# This can be overriden in prefs.sh # This can be overriden in prefs.sh
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# For AllMake.stage1 # For AllMake.stage1
setenv WM_THIRD_PARTY_USE_BISON_27 1 #setenv WM_THIRD_PARTY_USE_BISON_27 1
#setenv WM_THIRD_PARTY_USE_CMAKE_322 1 #setenv WM_THIRD_PARTY_USE_CMAKE_322 1
# #

16
src/foam/db/Time/foamTime.C
View file

@ -1132,6 +1132,22 @@ Foam::Time& Foam::Time::operator+=(const scalar deltaT)
Foam::Time& Foam::Time::operator++() Foam::Time& Foam::Time::operator++()
{ {
if (!subCycling_)
{
if (timeIndex_ == startTimeIndex_)
{
addProfile2(fo,"functionObjects_.start()");
functionObjects_.start();
}
else
{
addProfile2(fo,"functionObjects_.execute()");
functionObjects_.execute();
}
}
deltaT0_ = deltaTSave_; deltaT0_ = deltaTSave_;
deltaTSave_ = deltaT_; deltaTSave_ = deltaT_;