mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
This commit is contained in:
@ -229,7 +229,8 @@ else
|
|||||||
echo "created temporary '$caseFile'"
|
echo "created temporary '$caseFile'"
|
||||||
}
|
}
|
||||||
|
|
||||||
paraview --data="$caseFile" "$@"
|
# For now filter out any ld.so errors. Caused by non-system compiler?
|
||||||
|
paraview --data="$caseFile" "$@" 2>&1 | fgrep -v 'Inconsistency detected by ld.so'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -36,7 +36,7 @@
|
|||||||
application: $(FOAM_TARGETS)
|
application: $(FOAM_TARGETS)
|
||||||
|
|
||||||
$(FOAM_TARGETS):
|
$(FOAM_TARGETS):
|
||||||
@(cd $@ && $(FOAM_APP))
|
+@(cd $@ && $(FOAM_APP))
|
||||||
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|||||||
@ -62,13 +62,13 @@ runParallel()
|
|||||||
shift
|
shift
|
||||||
echo "Running $APP_RUN in parallel on $PWD using $nProcs processes"
|
echo "Running $APP_RUN in parallel on $PWD using $nProcs processes"
|
||||||
|
|
||||||
if [ "$WM_SCHEDULER" ]
|
#if [ "$WM_SCHEDULER" ]
|
||||||
then
|
#then
|
||||||
echo "$PWD: $WM_SCHEDULER -np $nProcs" 1>&2
|
# echo "$PWD: $WM_SCHEDULER -np $nProcs" 1>&2
|
||||||
$WM_SCHEDULER -np $nProcs "( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )"
|
# $WM_SCHEDULER -np $nProcs "( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )"
|
||||||
else
|
#else
|
||||||
( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )
|
( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )
|
||||||
fi
|
#fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user