mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-21 08:42:23 +00:00
Upgrade Code_Saturne to 1.3.2.
Code_Saturne 1.3.2 contains important corrections in the extended neighbourhood (used for gradient calculation with options IMRGRA=2 and 3 and for the LES dynamic model), in the steady-state algorithm and for rotation periodicity. Therefore it is strongly advised to upgrade to version 1.3.2. Earlier releases of version 1.3 (especially versions 1.3.f and 1.3.1) are considered obsolete and have been removed from the website. Note: the pdf handbooks don't build at the moment, but they are available from the Code_Saturne's main site.
This commit is contained in:
parent
1419d70e42
commit
d3f07698a5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=212381
@ -6,20 +6,22 @@
|
||||
#
|
||||
|
||||
PORTNAME= bft
|
||||
PORTVERSION= 1.0.5
|
||||
PORTVERSION= 1.0.6
|
||||
CATEGORIES= science parallel
|
||||
MASTER_SITES= http://www.edf.fr/html/RetD/livraison_saturne_${REL_DATE}/
|
||||
MASTER_SITES= http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
|
||||
EXTRACT_SUFX= .tgz
|
||||
|
||||
MAINTAINER= thierry@FreeBSD.org
|
||||
COMMENT= Code_Saturne Base Functions and Types library
|
||||
|
||||
REL_DATE= 20071218
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
|
||||
|
||||
USE_LDCONFIG= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
|
||||
|
||||
TESTSBIN= bft_test
|
||||
TESTSBIN= bft_test bft_mem_usage_test bft_printf_test
|
||||
|
||||
pre-configure:
|
||||
# No useful doc there
|
||||
@ -27,7 +29,7 @@ pre-configure:
|
||||
|
||||
regression-test:
|
||||
.for pg in ${TESTSBIN}
|
||||
@(cd ${WRKSRC}/tests; ./${pg} arg1 arg2)
|
||||
(cd ${WRKSRC}/tests; ./${pg} arg1 arg2)
|
||||
.endfor
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (bft-1.0.5.tar.gz) = 81f09d00dc050e79050428eddf1578c6
|
||||
SHA256 (bft-1.0.5.tar.gz) = bf3534d916d368889ebd1f34ce45048b3922d7436eedb648b57c2dad944f028f
|
||||
SIZE (bft-1.0.5.tar.gz) = 826828
|
||||
MD5 (bft-106.tgz) = 1282bc2401e69e3862ef9e429c569191
|
||||
SHA256 (bft-106.tgz) = c58de6bee0d9121a229b03548db7f966054e576ce31ba359a27114c5bb62e195
|
||||
SIZE (bft-106.tgz) = 413482
|
||||
|
@ -6,9 +6,11 @@
|
||||
#
|
||||
|
||||
PORTNAME= ecs
|
||||
PORTVERSION= 1.3.1
|
||||
PORTVERSION= 1.3.2
|
||||
CATEGORIES= science
|
||||
MASTER_SITES= http://www.edf.fr/html/RetD/livraison_saturne_${REL_DATE}/
|
||||
MASTER_SITES= http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
|
||||
EXTRACT_SUFX= .tgz
|
||||
|
||||
MAINTAINER= thierry@FreeBSD.org
|
||||
COMMENT= Code_Saturne Preprocessor
|
||||
@ -18,15 +20,15 @@ LIB_DEPENDS= med.2:${PORTSDIR}/french/med \
|
||||
hdf5.0:${PORTSDIR}/science/hdf5 \
|
||||
cgns.0:${PORTSDIR}/science/cgnslib
|
||||
|
||||
REL_DATE= 20071218
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
|
||||
CONFIGURE_ARGS= --with-bft-prefix=${LOCALBASE} \
|
||||
--with-hdf5-prefix=${LOCALBASE} \
|
||||
--with-cgns-prefix=${LOCALBASE} \
|
||||
--with-med-prefix=${LOCALBASE} \
|
||||
--with-metis-prefix=${LOCALBASE}
|
||||
CONFIGURE_ARGS= --with-bft=${LOCALBASE} \
|
||||
--with-hdf5=${LOCALBASE} \
|
||||
--with-cgns=${LOCALBASE} \
|
||||
--with-med=${LOCALBASE} \
|
||||
--with-metis=${LOCALBASE}
|
||||
CONFIGURE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
|
||||
|
||||
.if defined(WITHOUT_NLS)
|
||||
@ -42,7 +44,11 @@ PLIST_SUB+= NLS=""
|
||||
CONFIGURE_ARGS+= --enable-debug
|
||||
.endif
|
||||
|
||||
NOPORTDOCS= yes # PDF not produced ATM
|
||||
.if !defined(NOPORTDOCS)
|
||||
BUILD_DEPENDS+= pdflatex:${PORTSDIR}/print/teTeX-base
|
||||
PORTDOCS= mi_ecs.pdf mu_ecs.pdf
|
||||
.endif
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
@ -54,6 +60,11 @@ LIB_DEPENDS+= metis.1:${PORTSDIR}/math/metis
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/lib/libmetis.a:${PORTSDIR}/math/metis-edf
|
||||
.endif
|
||||
|
||||
pre-configure:
|
||||
.if !defined(NOPORTDOCS)
|
||||
${REINPLACE_CMD} -e '/^SUBDIRS/s| po| po doc|' ${WRKSRC}/Makefile.in
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
.if !defined(NOPORTDOCS)
|
||||
${MKDIR} ${DOCSDIR}
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (ecs-1.3.1.tar.gz) = 27a595d350952dea2221633ccf311934
|
||||
SHA256 (ecs-1.3.1.tar.gz) = bdd5c9c85e40567e95a6b93f5b836344410ba167984aa88bd764dfda0fea7926
|
||||
SIZE (ecs-1.3.1.tar.gz) = 2085349
|
||||
MD5 (ecs-132.tgz) = 45c2b164ab1b82aa9f7e776f8566594d
|
||||
SHA256 (ecs-132.tgz) = 85122081b2f670a990df14a3b40190e9a615add8c82110006ae3250476149867
|
||||
SIZE (ecs-132.tgz) = 1225995
|
||||
|
@ -6,9 +6,11 @@
|
||||
#
|
||||
|
||||
PORTNAME= fvm
|
||||
PORTVERSION= 0.9.0
|
||||
PORTVERSION= 0.10.0
|
||||
CATEGORIES= science parallel
|
||||
MASTER_SITES= http://www.edf.fr/html/RetD/livraison_saturne_${REL_DATE}/
|
||||
MASTER_SITES= http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
|
||||
EXTRACT_SUFX= .tgz
|
||||
|
||||
MAINTAINER= thierry@FreeBSD.org
|
||||
COMMENT= Code_Saturne Finite Volume Mesh
|
||||
@ -18,29 +20,29 @@ LIB_DEPENDS= med.2:${PORTSDIR}/french/med \
|
||||
hdf5.0:${PORTSDIR}/science/hdf5 \
|
||||
cgns.0:${PORTSDIR}/science/cgnslib
|
||||
|
||||
REL_DATE= 20071218
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
|
||||
|
||||
USE_LDCONFIG= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
|
||||
CONFIGURE_ARGS= --with-bft-prefix=${LOCALBASE} \
|
||||
--with-hdf5-prefix=${LOCALBASE} \
|
||||
--with-cgns-prefix=${LOCALBASE} \
|
||||
--with-med-prefix=${LOCALBASE}
|
||||
CONFIGURE_ARGS= --with-bft=${LOCALBASE} \
|
||||
--with-hdf5=${LOCALBASE} \
|
||||
--with-cgns=${LOCALBASE} \
|
||||
--with-med=${LOCALBASE}
|
||||
CONFIGURE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
|
||||
|
||||
.if defined(WITH_LAM)
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/lib/liblam.a:${PORTSDIR}/net/lam
|
||||
RUN_DEPENDS+= ${LOCALBASE}/bin/lamboot:${PORTSDIR}/net/lam
|
||||
CONFIGURE_ARGS+= --with-mpi-prefix=${LOCALBASE}
|
||||
CONFIGURE_ARGS+= --with-mpi=${LOCALBASE}
|
||||
.elif defined(WITH_OPENMPI)
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
|
||||
RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
|
||||
CONFIGURE_ARGS+= --with-mpi-prefix=${LOCALBASE}/mpi/openmpi
|
||||
CONFIGURE_ARGS+= --with-mpi=${LOCALBASE}/mpi/openmpi
|
||||
.else
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
|
||||
RUN_DEPENDS+= ${LOCALBASE}/mpich2/bin/mpirun:${PORTSDIR}/net/mpich2
|
||||
CONFIGURE_ARGS+= --with-mpi-prefix=${LOCALBASE}/mpich2
|
||||
CONFIGURE_ARGS+= --with-mpi=${LOCALBASE}/mpich2
|
||||
.endif
|
||||
|
||||
.if defined(WITH_DEBUG)
|
||||
@ -55,7 +57,7 @@ pre-configure:
|
||||
|
||||
regression-test:
|
||||
.for pg in ${TESTSBIN}
|
||||
@(cd ${WRKSRC}/tests; ./${pg})
|
||||
(cd ${WRKSRC}/tests; ./${pg})
|
||||
.endfor
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (fvm-0.9.0.tar.gz) = 9f6a7f59e15245997b060f98fdfbe195
|
||||
SHA256 (fvm-0.9.0.tar.gz) = 70a61717d5bd9d79f862335744cddeb25eb1ed5aee788d1fa038ef533bf70275
|
||||
SIZE (fvm-0.9.0.tar.gz) = 664087
|
||||
MD5 (fvm-0100.tgz) = 54f34da0267746765d0d6d6b5f6eaae3
|
||||
SHA256 (fvm-0100.tgz) = 5e05c61936006d67e473db9a6793f14fb406379c1f6e886eaff0614c983ac5e5
|
||||
SIZE (fvm-0100.tgz) = 668698
|
||||
|
@ -1,4 +1,4 @@
|
||||
BFT stands for Finite Volume Mesh.
|
||||
FVM stands for Finite Volume Mesh.
|
||||
It is intended to provide finite volume mesh I/O and some other services such
|
||||
as interpolation, possibly in parallel using MPI.
|
||||
|
||||
|
@ -6,9 +6,11 @@
|
||||
#
|
||||
|
||||
PORTNAME= ics
|
||||
PORTVERSION= 1.3.1
|
||||
PORTVERSION= 1.3.2
|
||||
CATEGORIES= science
|
||||
MASTER_SITES= http://www.edf.com/html/RetD/livraison_saturne_${REL_DATE}/
|
||||
MASTER_SITES= http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
|
||||
EXTRACT_SUFX= .tgz
|
||||
|
||||
MAINTAINER= thierry@FreeBSD.org
|
||||
COMMENT= Code_Saturne Graphical User Interface
|
||||
@ -17,10 +19,9 @@ LIB_DEPENDS= tix8184:${PORTSDIR}/x11-toolkits/tix
|
||||
RUN_DEPENDS= ${CS_HOME}/bin/info_cs:${PORTSDIR}/science/ncs \
|
||||
${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
|
||||
|
||||
REL_DATE= 20071218
|
||||
|
||||
NO_BUILD= yes
|
||||
USE_PYTHON= yes
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
|
||||
|
||||
PATHCS= ${PREFIX}/Saturne
|
||||
CS_HOME= ${LOCALBASE}/Saturne/Noyau/ncs
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (ics-1.3.1.tar.gz) = 6d23f2715fba64a5c687a1ff38f6f53f
|
||||
SHA256 (ics-1.3.1.tar.gz) = 46f94060b4ce7a644218427498e5ea8aa4d2c3b73f8f54c447d67fc13822f6a6
|
||||
SIZE (ics-1.3.1.tar.gz) = 490070
|
||||
MD5 (ics-132.tgz) = bc67030639fe0ce7837c5e9d4be8f41f
|
||||
SHA256 (ics-132.tgz) = 00d3566d71ba842d21e86838967d0d16e2fb42629f0cacd509c8046fd7ee7779
|
||||
SIZE (ics-132.tgz) = 482697
|
||||
|
@ -46,7 +46,6 @@
|
||||
%%ICS%%/Pages/BatchRunning.py
|
||||
%%ICS%%/Pages/BatchRunning.pyc
|
||||
%%ICS%%/Pages/BatchRunning.pyo
|
||||
%%ICS%%/Pages/BatchRunning.save
|
||||
%%ICS%%/Pages/BatchRunningModel.py
|
||||
%%ICS%%/Pages/BatchRunningModel.pyc
|
||||
%%ICS%%/Pages/BatchRunningModel.pyo
|
||||
|
@ -6,9 +6,11 @@
|
||||
#
|
||||
|
||||
PORTNAME= ncs
|
||||
PORTVERSION= 1.3.1
|
||||
PORTVERSION= 1.3.2
|
||||
CATEGORIES= science parallel
|
||||
MASTER_SITES= http://www.edf.fr/html/RetD/livraison_saturne_${REL_DATE}/
|
||||
MASTER_SITES= http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
|
||||
EXTRACT_SUFX= .tgz
|
||||
|
||||
MAINTAINER= thierry@FreeBSD.org
|
||||
COMMENT= Code_Saturne Kernel
|
||||
@ -17,10 +19,9 @@ LIB_DEPENDS= fvm.0:${PORTSDIR}/science/fvm
|
||||
RUN_DEPENDS= xmgrace:${PORTSDIR}/math/grace \
|
||||
ecs:${PORTSDIR}/science/ecs
|
||||
|
||||
REL_DATE= 20071218
|
||||
|
||||
USE_GNOME= libxml2
|
||||
USE_PYTHON= yes
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
|
||||
BUILD_WRKSRC= ${WRKSRC}/bin
|
||||
MAKE_ENV= NOM_ARCH=${OPSYS} CS_HOME=${WRKSRC} CS_MPI_PATH=${MPI_HOME}/bin \
|
||||
PTHREAD_LIBS=${PTHREAD_LIBS} TERM=${TERM} \
|
||||
@ -73,7 +74,8 @@ MPI_LIBS= -lmpich
|
||||
.endif
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
BUILD_DEPENDS+= pdftex:${PORTSDIR}/print/teTeX-base
|
||||
# No PDF at the moment
|
||||
#BUILD_DEPENDS+= pdftex:${PORTSDIR}/print/teTeX-base
|
||||
DOCS= AUTHORS COMPATIBILITY Changelog TODO
|
||||
.endif
|
||||
|
||||
@ -96,13 +98,6 @@ RUN_DEPENDS+= acroread:${PORTSDIR}/print/acroreadwrapper
|
||||
RUN_DEPENDS+= xpdf:${PORTSDIR}/graphics/xpdf
|
||||
.endif
|
||||
|
||||
.if exists(${LOCALBASE}/apps/homard/homard)
|
||||
WITH_HOMARD= yes
|
||||
.endif
|
||||
.if defined(WITH_HOMARD)
|
||||
RUN_DEPENDS+= ${LOCALBASE}/apps/homard/homard:${PORTSDIR}/french/homard
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "By default ncs is built with MPICH2, but you can set WITH_LAM or WITH_OPENMPI"
|
||||
@ -145,9 +140,9 @@ do-build:
|
||||
${GREP} -B 10 '^Stop in ') || ${TRUE}
|
||||
.if !defined(NOPORTDOCS)
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "===> Building documentation."
|
||||
#@${ECHO_MSG} "===> Building documentation."
|
||||
@${ECHO_MSG}
|
||||
(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ./lance_install DOC)
|
||||
#(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ./lance_install DOC)
|
||||
.endif
|
||||
|
||||
do-install:
|
||||
@ -170,15 +165,16 @@ do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/arch/${OPSYS}/bin/cs13.exe \
|
||||
${CS_HOME}/arch/${OPSYS}/bin
|
||||
.if !defined(NOPORTDOCS)
|
||||
${MKDIR} ${DOCSDIR} ${CS_HOME}/doc/THEORY/ ${CS_HOME}/doc/USER/ \
|
||||
${MKDIR} ${DOCSDIR}
|
||||
#${MKDIR} ${DOCSDIR} ${CS_HOME}/doc/THEORY/ ${CS_HOME}/doc/USER/ \
|
||||
${CS_HOME}/doc/TUTORIAL/
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/THEORY/theory.pdf ${CS_HOME}/doc/THEORY/
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/TUTORIAL/tutorial.pdf ${CS_HOME}/doc/TUTORIAL/
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/USER/user.pdf ${CS_HOME}/doc/USER/
|
||||
${LN} -sf ${CS_HOME}/doc/THEORY/theory.pdf ${CS_HOME}/doc/TUTORIAL/tutorial.pdf \
|
||||
${CS_HOME}/doc/USER/user.pdf ${DOCSDIR}/
|
||||
#${INSTALL_DATA} ${WRKSRC}/doc/THEORY/theory.pdf ${CS_HOME}/doc/THEORY/
|
||||
#${INSTALL_DATA} ${WRKSRC}/doc/TUTORIAL/tutorial.pdf ${CS_HOME}/doc/TUTORIAL/
|
||||
#${INSTALL_DATA} ${WRKSRC}/doc/USER/user.pdf ${CS_HOME}/doc/USER/
|
||||
#${LN} -sf ${CS_HOME}/doc/THEORY/theory.pdf ${CS_HOME}/doc/TUTORIAL/tutorial.pdf \
|
||||
# ${CS_HOME}/doc/USER/user.pdf ${DOCSDIR}/
|
||||
${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
|
||||
${LN} -sf ${LOCALBASE}/share/doc/ecs/ ${ECS_HOME}/doc
|
||||
#${LN} -sf ${LOCALBASE}/share/doc/ecs/ ${ECS_HOME}/doc
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (ncs-1.3.1.tar.gz) = 02ea72199aeebfe691b5c15b0637aa5f
|
||||
SHA256 (ncs-1.3.1.tar.gz) = 1257a151f0685ce487cccb8170ca6e8aaae47ffa2f873496c4ac4de0b59b714e
|
||||
SIZE (ncs-1.3.1.tar.gz) = 23019004
|
||||
MD5 (ncs-132.tgz) = 1749ea12356ab251af5caf9f7e23351e
|
||||
SHA256 (ncs-132.tgz) = ad17b578418daba2c2c56fc23bd30895391165d15b09e11e5eaa0c8b4f133505
|
||||
SIZE (ncs-132.tgz) = 12038099
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- bin/Makefile.orig 2007-11-23 18:35:59.000000000 +0100
|
||||
+++ bin/Makefile 2007-12-30 21:52:12.000000000 +0100
|
||||
--- bin/Makefile.orig 2008-02-18 19:51:37.000000000 +0100
|
||||
+++ bin/Makefile 2008-04-29 23:19:31.000000000 +0200
|
||||
@@ -174,7 +174,6 @@
|
||||
|
||||
link:
|
||||
@ -8,39 +8,3 @@
|
||||
@make privcompil
|
||||
@make privlink
|
||||
@make privfin
|
||||
@@ -846,7 +845,7 @@
|
||||
echo "$(BO)or in one of its sub-directories$(NO)" ;\
|
||||
echo ;\
|
||||
tput init ;\
|
||||
- exit -1 ;\
|
||||
+ exit 1 ;\
|
||||
fi ;\
|
||||
fi ;\
|
||||
dirprec=`dirname $${dirprec}` ;\
|
||||
@@ -858,7 +857,7 @@
|
||||
echo "$(BO) You must be in the general directory: $(DIR_CS)$(NO)" ;\
|
||||
echo ;\
|
||||
tput init ;\
|
||||
- exit -1 ;\
|
||||
+ exit 1 ;\
|
||||
fi ;\
|
||||
if [ ! "$${modtrav}" = "$${module}" ] ;\
|
||||
then echo ;\
|
||||
@@ -867,7 +866,7 @@
|
||||
echo "$(BO)You must be in directory: $${module}$(NO)" ;\
|
||||
echo ;\
|
||||
tput init ;\
|
||||
- exit -1 ;\
|
||||
+ exit 1 ;\
|
||||
fi ;\
|
||||
if [ ! "$${opttrav}" = "$(MYOPT)" ] ;\
|
||||
then echo ;\
|
||||
@@ -881,7 +880,7 @@
|
||||
fi ;\
|
||||
echo ;\
|
||||
tput init ;\
|
||||
- exit -1 ;\
|
||||
+ exit 1 ;\
|
||||
fi ;\
|
||||
if [ "$${modtrav}" = "BASE" ] ;\
|
||||
then INC_CS="toto" ;\
|
||||
|
@ -1,24 +0,0 @@
|
||||
--- ./bin/compiler_version.orig Thu Mar 1 12:23:39 2007
|
||||
+++ ./bin/compiler_version Sun May 6 22:49:29 2007
|
||||
@@ -132,8 +132,8 @@
|
||||
# sur hp, par exemple f90 +version n'en cree pas)
|
||||
|
||||
echo ' ' >> ${compillog}
|
||||
- if [ -f cs12.exe ] ; then
|
||||
- ./cs12.exe >> ${compillog} 2>&1
|
||||
+ if [ -f cs13.exe ] ; then
|
||||
+ ./cs13.exe >> ${compillog} 2>&1
|
||||
else
|
||||
echo ' Pas d executable test FORTRAN ' >> ${compillog}
|
||||
fi
|
||||
@@ -181,8 +181,8 @@
|
||||
# Execution
|
||||
|
||||
echo ' ' >> ${compillog}
|
||||
- if [ -f cs12.exe ] ; then
|
||||
- ./cs12.exe >> ${compillog} 2>&1
|
||||
+ if [ -f cs13.exe ] ; then
|
||||
+ ./cs13.exe >> ${compillog} 2>&1
|
||||
echo ' ' >> ${compillog}
|
||||
else
|
||||
echo ' Pas d executable test C ' >> ${compillog}
|
@ -1,37 +0,0 @@
|
||||
--- bin/cree_sat.orig Thu Mar 1 12:23:39 2007
|
||||
+++ bin/cree_sat Mon May 7 23:56:27 2007
|
||||
@@ -156,12 +156,12 @@
|
||||
thch=THCH
|
||||
mkdir ${CAS}/DATA/$thch
|
||||
for var in dp_C3P dp_C3PSJ dp_ELE dp_FCP ; do
|
||||
- cp $CS_HOME/data/thch/$var $CAS/DATA/$thch/.
|
||||
+ cp -f $CS_HOME/data/thch/$var $CAS/DATA/$thch/.
|
||||
done
|
||||
|
||||
gui=SaturneGUI
|
||||
if [ "$IHM" = "ihm" ] ; then
|
||||
- cp $SCRIPT_HOME/$gui ${CAS}/DATA/.
|
||||
+ cp -f $SCRIPT_HOME/$gui ${CAS}/DATA/.
|
||||
sed "s/NOMCSGUIHOME/$CSGUIHOMEBCKSLH/g" $CAS/DATA/$gui >cas.tmp
|
||||
mv -f cas.tmp $CAS/DATA/$gui
|
||||
chmod +x $CAS/DATA/$gui
|
||||
@@ -169,7 +169,7 @@
|
||||
|
||||
# recopie des src utilisateur et masquage des repertoires CVS
|
||||
users=USERS
|
||||
- cp -r $CS_HOME/users $CAS/FORT/$users
|
||||
+ cp -Rf $CS_HOME/users $CAS/FORT/$users
|
||||
listedircvs=`find $CAS/FORT/$users -name CVS -print`
|
||||
for dir in $listedircvs ; do
|
||||
mv $dir `dirname ${dir}`/.CVS
|
||||
@@ -178,8 +178,8 @@
|
||||
# sur cluster, le nom est limite a 15 caracteres
|
||||
NOMETCAS=`echo ${etude}${cas}|cut -c1-15`
|
||||
|
||||
- cp $SCRIPT_HOME/lance $CAS/SCRIPTS
|
||||
- cp $SCRIPT_HOME/lance.help $CAS/SCRIPTS
|
||||
+ cp -f $SCRIPT_HOME/lance $CAS/SCRIPTS
|
||||
+ cp -f $SCRIPT_HOME/lance.help $CAS/SCRIPTS
|
||||
FICREPBASECASBKSLH=$CAS/SCRIPTS/.repbasecasbkslh
|
||||
echo $REPBASECAS | sed -e "s/\//\\\\\//g" > $FICREPBASECASBKSLH
|
||||
REPBASECASBCKSLH=`cat $FICREPBASECASBKSLH`
|
@ -1,51 +1,34 @@
|
||||
--- bin/cs_profile.orig 2007-11-23 18:35:59.000000000 +0100
|
||||
+++ bin/cs_profile 2007-12-30 22:01:54.000000000 +0100
|
||||
@@ -58,18 +58,33 @@
|
||||
--- bin/cs_profile.orig 2008-04-23 11:32:09.000000000 +0200
|
||||
+++ bin/cs_profile 2008-04-29 23:35:23.000000000 +0200
|
||||
@@ -37,12 +37,17 @@
|
||||
|
||||
if [ "$NOM_ARCH" = "OSF1" -o "$NOM_ARCH" = "Linux_CCRT" -o "$NOM_ARCH" = "Linux_IA64" ] ; then
|
||||
PATHCS=/home/saturne/Saturne
|
||||
+ elif [ "$NOM_ARCH" = "FreeBSD" ] ; then
|
||||
+ PATHCS=%%LOCALBASE%%/Saturne
|
||||
elif [ "$NOM_ARCH" = "Blue_Gene_L" ] ; then
|
||||
PATHCS=/gpfs2/home/saturne
|
||||
else
|
||||
PATHCS=/home/saturne
|
||||
fi
|
||||
- CS_HOME=${PATHCS}/Noyau/ncs-1.3.1
|
||||
- ECS_HOME=${PATHCS}/Enveloppe/ecs-1.3.1
|
||||
- CSGUI_HOME=${PATHCS}/Interface/ics-1.3.1
|
||||
- SYRCS_HOME=${PATHCS}/opt/syr_cs-2.0.1
|
||||
+ if [ "$NOM_ARCH" = "FreeBSD" ] ; then
|
||||
+ CS_HOME=${PATHCS}/Noyau/ncs
|
||||
+ ECS_HOME=${PATHCS}/Enveloppe/ecs
|
||||
+ CSGUI_HOME=${PATHCS}/Interface/ics
|
||||
+ SYRCS_HOME=${PATHCS}/opt/syr_cs
|
||||
+# Variables specifiques a passer au Makefile FreeBSD par lance
|
||||
+ LOCALBASE=%%LOCALBASE%% ; export LOCALBASE
|
||||
+ FC=%%FC%% ; export FC
|
||||
+ PTHREAD_LIBS=%%PTHREAD_LIBS%% ; export PTHREAD_LIBS
|
||||
+ else
|
||||
+ CS_HOME=${PATHCS}/Noyau/ncs-1.3.1
|
||||
+ ECS_HOME=${PATHCS}/Enveloppe/ecs-1.3.1
|
||||
+ CSGUI_HOME=${PATHCS}/Interface/ics-1.3.l
|
||||
+ SYRCS_HOME=${PATHCS}/opt/syr_cs-2.0.1
|
||||
+ fi
|
||||
# Versions Code_saturne
|
||||
|
||||
- PATHCS=/home/saturne
|
||||
+ PATHCS=%%LOCALBASE%%/Saturne
|
||||
+
|
||||
+ CS_HOME=${PATHCS}/Noyau/ncs
|
||||
+ ECS_HOME=${PATHCS}/Enveloppe/ecs
|
||||
+ CSGUI_HOME=${PATHCS}/Interface/ics
|
||||
+ SYRCS_HOME=${PATHCS}/opt/syr_cs
|
||||
+# Variables specifiques a passer au Makefile FreeBSD par lance
|
||||
+ LOCALBASE=%%LOCALBASE%% ; export LOCALBASE
|
||||
+ FC=%%FC%% ; export FC
|
||||
+ PTHREAD_LIBS=%%PTHREAD_LIBS%% ; export PTHREAD_LIBS
|
||||
|
||||
- CS_HOME=${PATHCS}/Noyau/ncs-1.3.2
|
||||
- ECS_HOME=${PATHCS}/Enveloppe/ecs-1.3.2
|
||||
- CSGUI_HOME=${PATHCS}/Interface/ics-1.3.2
|
||||
- SYRCS_HOME=${PATHCS}/opt/syr_cs-2.0.2
|
||||
#
|
||||
if [ "$NOM_ARCH" = "Linux" -a -d /home/prevalcs/HOMARD ] ; then
|
||||
CSHOMARD_HOME=/home/prevalcs/HOMARD
|
||||
+ elif [ "$NOM_ARCH" = "FreeBSD" ] ; then
|
||||
+ CSHOMARD_HOME=%%LOCALBASE%%/apps/homard
|
||||
else
|
||||
CSHOMARD_HOME=
|
||||
fi
|
||||
@@ -93,6 +108,10 @@
|
||||
CS_MPI_PATH=/home/saturne/opt/openmpi-1.2.4/arch/Linux/bin
|
||||
elif [ "$NOM_ARCH" = "Linux_Ch" ] ; then
|
||||
CS_MPI_PATH=/usr/local/mpichgm-1.2.6.14b-64b/bin
|
||||
+ elif [ "$NOM_ARCH" = "FreeBSD" ] ; then
|
||||
+ MPI_HOME=%%MPI_HOME%% ; export MPI_HOME
|
||||
+ MPI_LIBS=%%MPI_LIBS%% ; export MPI_LIBS
|
||||
+ CS_MPI_PATH=${MPI_HOME}/bin
|
||||
else
|
||||
CS_MPI_PATH=
|
||||
fi
|
||||
# Path
|
||||
PATH=$CS_HOME/bin:$ECS_HOME/bin:$PATH
|
||||
@@ -52,5 +57,7 @@
|
||||
export PATH
|
||||
|
||||
# Chemins et librairies pour MPI
|
||||
- CS_MPI_PATH=/home/saturne/opt/openmpi-1.2.6/arch/Linux/bin
|
||||
+ MPI_HOME=%%MPI_HOME%% ; export MPI_HOME
|
||||
+ MPI_LIBS=%%MPI_LIBS%% ; export MPI_LIBS
|
||||
+ CS_MPI_PATH=${MPI_HOME}/bin
|
||||
export CS_MPI_PATH
|
||||
|
@ -1,8 +0,0 @@
|
||||
--- bin/grp.orig Thu Mar 1 12:23:39 2007
|
||||
+++ bin/grp Mon May 7 14:08:44 2007
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/ksh
|
||||
+#!/bin/sh
|
||||
#============================================================================
|
||||
#
|
||||
# Code_Saturne version 1.3
|
@ -1,5 +1,5 @@
|
||||
--- bin/macros_FreeBSD.mk.orig 2007-11-23 18:35:59.000000000 +0100
|
||||
+++ bin/macros_FreeBSD.mk 2007-12-30 22:19:04.000000000 +0100
|
||||
--- bin/macros_FreeBSD.mk.orig 2008-04-23 11:32:13.000000000 +0200
|
||||
+++ bin/macros_FreeBSD.mk 2008-04-29 23:49:19.000000000 +0200
|
||||
@@ -1,3 +1,4 @@
|
||||
+# $FreeBSD$
|
||||
#============================================================================
|
||||
@ -17,7 +17,7 @@
|
||||
# Macro pour BFT
|
||||
#---------------
|
||||
|
||||
-BFT_HOME =/home/saturne/opt/bft-1.0.5/arch/Linux
|
||||
-BFT_HOME =/home/saturne/opt/bft-1.0.6/arch/Linux
|
||||
+BFT_HOME =${LOCALBASE}
|
||||
|
||||
BFT_INC =-I$(BFT_HOME)/include
|
||||
@ -26,7 +26,7 @@
|
||||
# Macro pour FVM
|
||||
#---------------
|
||||
|
||||
-FVM_HOME =/home/saturne/opt/fvm-0.9.0/arch/Linux
|
||||
-FVM_HOME =/home/saturne/opt/fvm-0.10.0/arch/Linux
|
||||
+FVM_HOME =${LOCALBASE}
|
||||
|
||||
FVM_INC =-I$(FVM_HOME)/include
|
||||
@ -36,7 +36,7 @@
|
||||
MPE_COMM =0
|
||||
|
||||
-# Pour Open MPI sur saturne
|
||||
-MPI_HOME =/home/saturne/opt/openmpi-1.2.4/arch/Linux
|
||||
-MPI_HOME =/home/saturne/opt/openmpi-1.2.5/arch/Linux
|
||||
-MPI_INC =-isystem$(MPI_HOME)/include
|
||||
-MPI_LIB =-pthread -L$(MPI_HOME)/lib -lmpi -lopen-rte -lopen-pal -ldl -Wl,--export-dynamic -lnsl -lutil -lm -ldl
|
||||
+# Pour MPI sur saturne
|
||||
@ -45,18 +45,16 @@
|
||||
|
||||
# Macro pour Sockets
|
||||
#-------------------
|
||||
@@ -75,20 +75,19 @@
|
||||
@@ -75,7 +75,7 @@
|
||||
# Option XML
|
||||
XML =1
|
||||
|
||||
-XML_HOME = /home/saturne/opt/libxml2-2.6.19
|
||||
+XML_HOME =${LOCALBASE}
|
||||
-XML_HOME = /usr
|
||||
+XML_HOME = ${LOCALBASE}
|
||||
|
||||
XML_INC =-I$(XML_HOME)/include/libxml2
|
||||
-XML_LIB =-L$(XML_HOME)/arch/Linux/lib -lxml2
|
||||
+XML_LIB =-L$(XML_HOME)/lib -lxml2
|
||||
|
||||
# Macro pour BLAS
|
||||
XML_LIB =-L$(XML_HOME)/lib -lxml2
|
||||
@@ -84,11 +84,10 @@
|
||||
#----------------
|
||||
|
||||
# Option BLAS
|
||||
@ -75,7 +73,7 @@
|
||||
# Compilateur C
|
||||
#--------------
|
||||
|
||||
-CCOMP = /home/saturne/opt/gcc-4.2.2/arch/Linux/bin/gcc
|
||||
-CCOMP = /home/saturne/opt/gcc-4.2.3/arch/Linux/bin/gcc
|
||||
+CCOMP = $(CC)
|
||||
|
||||
CCOMPFLAGSDEF = -std=c99 -funsigned-char -pedantic -W -Wall -Wshadow \
|
||||
@ -106,14 +104,14 @@
|
||||
#--------------------
|
||||
# Profiling gprof : -pg -a
|
||||
|
||||
-FTNCOMP = /home/saturne/opt/gcc-4.2.2/arch/Linux/bin/gfortran
|
||||
-FTNCOMP = /home/saturne/opt/gcc-4.2.3/arch/Linux/bin/gfortran
|
||||
+FTNCOMP = $(FC)
|
||||
|
||||
FTNCOMPFLAGSDEF = -I.
|
||||
|
||||
-FTNCOMPFLAGS = $(FTNCOMPFLAGSDEF) -O1
|
||||
-FTNCOMPFLAGSOPTPART1 = $(FTNCOMPFLAGSDEF) -O2
|
||||
-FTNCOMPFLAGSOPTPART2 = $(FTNCOMPFLAGSDEF) -O6
|
||||
-FTNCOMPFLAGSOPTPART2 = $(FTNCOMPFLAGSDEF) -O3
|
||||
-FTNCOMPFLAGSOPTPART3 = $(FTNCOMPFLAGSDEF) -O0
|
||||
+FTNCOMPFLAGS = $(FTNCOMPFLAGSDEF) $(FFLAGS)
|
||||
+FTNCOMPFLAGSOPTPART1 = $(FTNCOMPFLAGSDEF) $(FFLAGS)
|
||||
@ -126,7 +124,7 @@
|
||||
|
||||
# Linker
|
||||
|
||||
-LDEDL = /home/saturne/opt/gcc-4.2.2/arch/Linux/bin/gfortran
|
||||
-LDEDL = /home/saturne/opt/gcc-4.2.3/arch/Linux/bin/gfortran
|
||||
-LDEDLFLAGS = -O
|
||||
-LDEDLFLAGSLO = -O0
|
||||
+LDEDL = $(FC)
|
||||
@ -135,7 +133,7 @@
|
||||
LDEDLFLAGSDBG = -g
|
||||
LDEDLFLAGSPROF = -pg
|
||||
LDEDLFLAGSVERS = -v
|
||||
-LDEDLRPATH = -rdynamic -Wl,-rpath -Wl,/home/saturne/opt/gcc-4.2.2/arch/Linux/lib:
|
||||
-LDEDLRPATH = -rdynamic -Wl,-rpath -Wl,/home/saturne/opt/gcc-4.2.3/arch/Linux/lib:
|
||||
+LDEDLRPATH = -rdynamic -Wl,-rpath -Wl,
|
||||
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
%%ECS_HOME%%/bin/ecs
|
||||
%%ECS_HOME%%/doc
|
||||
@comment %%ECS_HOME%%/doc
|
||||
%%CS_HOME%%/arch/FreeBSD/bin/cs13.exe
|
||||
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneBASE.a
|
||||
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneCFBL.a
|
||||
@ -63,9 +63,9 @@
|
||||
%%CS_HOME%%/data/thch/dp_FCP
|
||||
%%CS_HOME%%/data/thch/dp_FUE
|
||||
%%CS_HOME%%/data/thch/dp_transfo
|
||||
%%PORTDOCS%%%%CS_HOME%%/doc/THEORY/theory.pdf
|
||||
%%PORTDOCS%%%%CS_HOME%%/doc/TUTORIAL/tutorial.pdf
|
||||
%%PORTDOCS%%%%CS_HOME%%/doc/USER/user.pdf
|
||||
@comment %%PORTDOCS%%%%CS_HOME%%/doc/THEORY/theory.pdf
|
||||
@comment %%PORTDOCS%%%%CS_HOME%%/doc/TUTORIAL/tutorial.pdf
|
||||
@comment %%PORTDOCS%%%%CS_HOME%%/doc/USER/user.pdf
|
||||
%%CS_HOME%%/include/base/albase.h
|
||||
%%CS_HOME%%/include/base/alstru.h
|
||||
%%CS_HOME%%/include/base/cs_ale.h
|
||||
@ -650,9 +650,9 @@ lib/libsaturneRAYT.a
|
||||
%%PORTDOCS%%%%DOCSDIR%%/COMPATIBILITY
|
||||
%%PORTDOCS%%%%DOCSDIR%%/Changelog
|
||||
%%PORTDOCS%%%%DOCSDIR%%/TODO
|
||||
%%PORTDOCS%%%%DOCSDIR%%/theory.pdf
|
||||
%%PORTDOCS%%%%DOCSDIR%%/tutorial.pdf
|
||||
%%PORTDOCS%%%%DOCSDIR%%/user.pdf
|
||||
@comment %%PORTDOCS%%%%DOCSDIR%%/theory.pdf
|
||||
@comment %%PORTDOCS%%%%DOCSDIR%%/tutorial.pdf
|
||||
@comment %%PORTDOCS%%%%DOCSDIR%%/user.pdf
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%
|
||||
@dirrm %%CS_HOME%%/users/rayt
|
||||
@dirrm %%CS_HOME%%/users/pprt
|
||||
@ -686,10 +686,10 @@ lib/libsaturneRAYT.a
|
||||
@dirrm %%CS_HOME%%/include/cfbl
|
||||
@dirrm %%CS_HOME%%/include/base
|
||||
@dirrm %%CS_HOME%%/include
|
||||
%%PORTDOCS%%@dirrm %%CS_HOME%%/doc/USER
|
||||
%%PORTDOCS%%@dirrm %%CS_HOME%%/doc/TUTORIAL
|
||||
%%PORTDOCS%%@dirrm %%CS_HOME%%/doc/THEORY
|
||||
%%PORTDOCS%%@dirrm %%CS_HOME%%/doc
|
||||
@comment %%PORTDOCS%%@dirrm %%CS_HOME%%/doc/USER
|
||||
@comment %%PORTDOCS%%@dirrm %%CS_HOME%%/doc/TUTORIAL
|
||||
@comment %%PORTDOCS%%@dirrm %%CS_HOME%%/doc/THEORY
|
||||
@comment %%PORTDOCS%%@dirrm %%CS_HOME%%/doc
|
||||
@dirrm %%CS_HOME%%/data/thch
|
||||
@dirrm %%CS_HOME%%/data/mati
|
||||
@dirrm %%CS_HOME%%/data
|
||||
|
Loading…
Reference in New Issue
Block a user