aboutsummaryrefslogtreecommitdiff
path: root/science/ncs
diff options
context:
space:
mode:
authorThierry Thomas <thierry@FreeBSD.org>2008-01-01 16:45:44 +0000
committerThierry Thomas <thierry@FreeBSD.org>2008-01-01 16:45:44 +0000
commit591cba48f599004b5a52df1467aeddfada5df0de (patch)
treeb0446708f6f789b5bf0ae74f202ccfd799cbf4f7 /science/ncs
parenta18f5f516fad6ed43e3c2a7b56f51d0e497278af (diff)
downloadports-591cba48f599004b5a52df1467aeddfada5df0de.tar.gz
ports-591cba48f599004b5a52df1467aeddfada5df0de.zip
Notes
Diffstat (limited to 'science/ncs')
-rw-r--r--science/ncs/Makefile33
-rw-r--r--science/ncs/distinfo6
-rw-r--r--science/ncs/files/patch-bin_Makefile48
-rw-r--r--science/ncs/files/patch-bin_cs_profile36
-rw-r--r--science/ncs/files/patch-bin_gracehst13
-rw-r--r--science/ncs/files/patch-bin_macros_FreeBSD.mk72
-rw-r--r--science/ncs/files/patch-src_base_1_gradco.F11
-rw-r--r--science/ncs/pkg-plist518
8 files changed, 381 insertions, 356 deletions
diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index 77c6cc9a9063..992ae9c88edd 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ncs
-DISTVERSION= 1.3.f
+PORTVERSION= 1.3.1
CATEGORIES= science parallel
MASTER_SITES= http://www.edf.fr/html/RetD/livraison_saturne_${REL_DATE}/
@@ -17,7 +17,7 @@ LIB_DEPENDS= fvm.0:${PORTSDIR}/science/fvm
RUN_DEPENDS= xmgrace:${PORTSDIR}/math/grace \
ecs:${PORTSDIR}/science/ecs
-REL_DATE= 070305
+REL_DATE= 20071218
USE_GNOME= libxml2
USE_PYTHON= yes
@@ -50,8 +50,8 @@ SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
SUB_DIRS= data include src users
-BIN_SCRIPTS= autovalid compiler_version cree_sat gracehst grp info_cs \
- lance_install rang_mpi.sh verifmail
+BIN_SCRIPTS= autovalid check_mesh compiler_version cree_sat cs.exe gracehst \
+ grp info_cs lance_install rang_mpi.sh
BIN_DATAS= Makefile SaturneGUI autovalid.xml cs_profile lance lance.help \
macros_FreeBSD.mk
@@ -116,7 +116,6 @@ pre-patch:
${CP} -p ${WRKSRC}/bin/macros_Linux.mk ${WRKSRC}/bin/macros_FreeBSD.mk
do-configure:
- ${RM} ${WRKSRC}/src/base_1/gradco.F.orig
${REINPLACE_CMD} -e 's|%%PATHCS%%|${PATHCS}|' \
-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-e 's|%%FC%%|${FC}|' \
@@ -127,10 +126,13 @@ do-configure:
${REINPLACE_CMD} \
-e 's|/home/saturne/opt/python/arch/$${NOM_ARCH}/bin/python|${PYTHON_CMD}|' \
${BUILD_WRKSRC}/SaturneGUI
-.if !defined(WITHOUT_BLAS) && !defined(WITHOUT_ATLAS)
+.if defined(WITH_ATLAS)
${REINPLACE_CMD} -e 's|BLAS =0|BLAS =1|' \
+ ${BUILD_WRKSRC}/macros_FreeBSD.mk
+.endif
+.if !defined(WITHOUT_BLAS) && !defined(WITHOUT_ATLAS)
+ ${REINPLACE_CMD} -e 's|BLAS_LDFLAGS =|BLAS_LDFLAGS =${BLAS_LIB}|' \
-e 's|BLAS_INC =|BLAS_INC =-I${LOCALBASE}/include|' \
- -e 's|BLAS_LDFLAGS =|BLAS_LDFLAGS =${BLAS_LIB}|' \
${BUILD_WRKSRC}/macros_FreeBSD.mk
.endif
@@ -151,7 +153,8 @@ do-build:
do-install:
${FIND} ${WRKSRC}/arch/${OPSYS}/lib -name "libsaturne*" -exec \
${INSTALL_DATA} {} ${PREFIX}/lib \;
- ${MKDIR} ${CS_HOME}/bin ${CS_HOME}/arch/${OPSYS}/lib ${ECS_HOME}/bin
+ ${MKDIR} ${CS_HOME}/bin ${CS_HOME}/arch/${OPSYS}/bin \
+ ${CS_HOME}/arch/${OPSYS}/lib ${ECS_HOME}/bin
${LN} -sf ${PREFIX}/lib/libsaturne*.a ${CS_HOME}/arch/${OPSYS}/lib/
.for sd in ${SUB_DIRS}
(cd ${WRKSRC}/ && ${COPYTREE_SHARE} ${sd} ${CS_HOME})
@@ -164,12 +167,16 @@ do-install:
${LN} -sf ${LOCALBASE}/bin/ecs ${ECS_HOME}/bin/
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${CS_HOME}/bin/Autovalidation
@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${CS_HOME}/bin/Autovalidation
+ ${INSTALL_PROGRAM} ${WRKSRC}/arch/${OPSYS}/bin/cs13.exe \
+ ${CS_HOME}/arch/${OPSYS}/bin
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR} ${CS_HOME}/doc/NOYAU/ ${CS_HOME}/doc/UTILISATION/
- ${INSTALL_DATA} ${WRKSRC}/doc/NOYAU/noyau.pdf ${CS_HOME}/doc/NOYAU/
- ${INSTALL_DATA} ${WRKSRC}/doc/UTILISATION/saturne.pdf ${CS_HOME}/doc/UTILISATION/
- ${LN} -sf ${CS_HOME}/doc/NOYAU/noyau.pdf ${CS_HOME}/doc/UTILISATION/saturne.pdf \
- ${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} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
${LN} -sf ${LOCALBASE}/share/doc/ecs/ ${ECS_HOME}/doc
.endif
diff --git a/science/ncs/distinfo b/science/ncs/distinfo
index 5b5c59e2468f..6fc0202614f9 100644
--- a/science/ncs/distinfo
+++ b/science/ncs/distinfo
@@ -1,3 +1,3 @@
-MD5 (ncs-1.3.f.tar.gz) = 19d052524c8df37090e1a0553683a152
-SHA256 (ncs-1.3.f.tar.gz) = d7e63c8768bf0b5d35d0c52f0ea084e6f3541f762d2583b6c3d6ca0031886186
-SIZE (ncs-1.3.f.tar.gz) = 5175928
+MD5 (ncs-1.3.1.tar.gz) = 02ea72199aeebfe691b5c15b0637aa5f
+SHA256 (ncs-1.3.1.tar.gz) = 1257a151f0685ce487cccb8170ca6e8aaae47ffa2f873496c4ac4de0b59b714e
+SIZE (ncs-1.3.1.tar.gz) = 23019004
diff --git a/science/ncs/files/patch-bin_Makefile b/science/ncs/files/patch-bin_Makefile
index 9ad60fd75ca6..7b2134b7182c 100644
--- a/science/ncs/files/patch-bin_Makefile
+++ b/science/ncs/files/patch-bin_Makefile
@@ -1,6 +1,6 @@
---- bin/Makefile.orig Thu Mar 1 12:23:39 2007
-+++ bin/Makefile Sun Jun 17 10:48:01 2007
-@@ -186,7 +186,6 @@
+--- bin/Makefile.orig 2007-11-23 18:35:59.000000000 +0100
++++ bin/Makefile 2007-12-30 21:52:12.000000000 +0100
+@@ -174,7 +174,6 @@
link:
@make privtitre
@@ -8,35 +8,17 @@
@make privcompil
@make privlink
@make privfin
-@@ -287,7 +286,7 @@
- if [ ${BLAS} -eq 1 ] ;\
- then dir_inc_cs="$${dir_inc_cs} $(BLAS_INC)" ;\
- cflags="$${cflags} -D_CS_HAVE_BLAS " ;\
-- fflags="$${fflags} -WF,-D_CS_HAVE_BLAS " ;\
-+ fflags="$${fflags} -D_CS_HAVE_BLAS " ;\
- fi ; \
- if [ ${XML} -eq 1 ] ;\
- then dir_inc_cs="$${dir_inc_cs} $(XML_INC)" ;\
-@@ -881,7 +880,7 @@
- echo "$(BO)$(BLD_CS)/$(NOM_ARCH)/$${module}$(NO)" ;\
- echo ;\
- tput init ;\
-- exit -1 ;\
-+ exit 1 ;\
- fi ;\
- fi ;\
- else module="$(MYMODULE)" ;\
-@@ -901,7 +900,7 @@
- echo "$(BO)$(BLD_CS)/$(NOM_ARCH)/$${module}$(NO)" ;\
- echo ;\
- tput init ;\
-- exit -1 ;\
-+ exit 1 ;\
- fi ;\
+@@ -846,7 +845,7 @@
+ echo "$(BO)or in one of its sub-directories$(NO)" ;\
+ echo ;\
+ tput init ;\
+- exit -1 ;\
++ exit 1 ;\
fi ;\
fi ;\
-@@ -914,7 +913,7 @@
- echo "$(BO) Il faut être dans le repertoire général $(DIR_CS)$(NO)" ;\
+ dirprec=`dirname $${dirprec}` ;\
+@@ -858,7 +857,7 @@
+ echo "$(BO) You must be in the general directory: $(DIR_CS)$(NO)" ;\
echo ;\
tput init ;\
- exit -1 ;\
@@ -44,8 +26,8 @@
fi ;\
if [ ! "$${modtrav}" = "$${module}" ] ;\
then echo ;\
-@@ -926,7 +925,7 @@
- fi ;\
+@@ -867,7 +866,7 @@
+ echo "$(BO)You must be in directory: $${module}$(NO)" ;\
echo ;\
tput init ;\
- exit -1 ;\
@@ -53,7 +35,7 @@
fi ;\
if [ ! "$${opttrav}" = "$(MYOPT)" ] ;\
then echo ;\
-@@ -940,7 +939,7 @@
+@@ -881,7 +880,7 @@
fi ;\
echo ;\
tput init ;\
diff --git a/science/ncs/files/patch-bin_cs_profile b/science/ncs/files/patch-bin_cs_profile
index aae5092eeda6..d7980373f4ac 100644
--- a/science/ncs/files/patch-bin_cs_profile
+++ b/science/ncs/files/patch-bin_cs_profile
@@ -1,20 +1,19 @@
---- bin/cs_profile.orig Thu Mar 1 12:23:39 2007
-+++ bin/cs_profile Tue May 8 15:34:20 2007
-@@ -48,18 +48,33 @@
+--- 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 @@
- if [ "$NOM_ARCH" = "OSF1" -o "$NOM_ARCH" = "Linux_CCRT" ] ; then
+ if [ "$NOM_ARCH" = "OSF1" -o "$NOM_ARCH" = "Linux_CCRT" -o "$NOM_ARCH" = "Linux_IA64" ] ; then
PATHCS=/home/saturne/Saturne
-- elif [ "$NOM_ARCH" = "Blue_Gene_L" ] ; then
+ elif [ "$NOM_ARCH" = "FreeBSD" ] ; then
+ PATHCS=%%LOCALBASE%%/Saturne
-+ elif [ "$NOM_ARCH" = "Blue_Gene_L" ] ; then
+ elif [ "$NOM_ARCH" = "Blue_Gene_L" ] ; then
PATHCS=/gpfs2/home/saturne
else
PATHCS=/home/saturne
fi
-- CS_HOME=${PATHCS}/Noyau/ncs-1.3.f
-- ECS_HOME=${PATHCS}/Enveloppe/ecs-1.3.c
-- CSGUI_HOME=${PATHCS}/Interface/ics-1.1.l
+- 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
@@ -26,9 +25,9 @@
+ FC=%%FC%% ; export FC
+ PTHREAD_LIBS=%%PTHREAD_LIBS%% ; export PTHREAD_LIBS
+ else
-+ CS_HOME=${PATHCS}/Noyau/ncs-1.3.f
-+ ECS_HOME=${PATHCS}/Enveloppe/ecs-1.3.c
-+ CSGUI_HOME=${PATHCS}/Interface/ics-1.1.l
++ 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
#
@@ -39,17 +38,8 @@
else
CSHOMARD_HOME=
fi
-@@ -70,7 +85,7 @@
- # Librairies pour l'interface
- if [ "$NOM_ARCH" = "OSF1" -o "$NOM_ARCH" = "Linux_CCRT" ] ; then
- LD_LIBRARY_PATH=.:/home/saturne/Saturne/opt/tcl8.3/arch/$NOM_ARCH/lib:/home/saturne/Saturne/opt/libxml2-2.6.19/arch/$NOM_ARCH/lib:$LD_LIBRARY_PATH
-- else
-+ elif [ "$NOM_ARCH" != "FreeBSD" ] ; then
- LD_LIBRARY_PATH=.:/home/saturne/opt/tcl8.3/arch/$NOM_ARCH/lib:/home/saturne/opt/libxml2-2.6.19/arch/$NOM_ARCH/lib:$LD_LIBRARY_PATH
- fi
-
-@@ -83,6 +98,10 @@
- CS_MPI_PATH=/home/saturne/opt/openmpi-1.1.1/arch/Linux/bin
+@@ -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
diff --git a/science/ncs/files/patch-bin_gracehst b/science/ncs/files/patch-bin_gracehst
index 40d165d4d611..8f2e164ee331 100644
--- a/science/ncs/files/patch-bin_gracehst
+++ b/science/ncs/files/patch-bin_gracehst
@@ -1,17 +1,8 @@
---- bin/gracehst.orig Thu Mar 1 12:23:39 2007
-+++ bin/gracehst Mon May 7 14:16:22 2007
+--- bin/gracehst.orig 2007-11-23 18:35:59.000000000 +0100
++++ bin/gracehst 2007-12-30 22:02:36.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#! /bin/sh
#============================================================================
#
# Code_Saturne version 1.3
-@@ -30,7 +30,7 @@
- #
- #============================================================================
- #
--if [ "$1" = "-h" -o "$1" = "-h" -o "$1" = "-h" ] ; then
-+if [ "$1" = "-h" -o "$1" = "-help" -o "$#" = "0" ] ; then
- echo ' '
- echo ' gracehst: appel de grace -nxy sur un fichier historique '
- echo ' de Code_Saturne en eliminant la premiere colonne. '
diff --git a/science/ncs/files/patch-bin_macros_FreeBSD.mk b/science/ncs/files/patch-bin_macros_FreeBSD.mk
index e193b979e480..4d68b702989c 100644
--- a/science/ncs/files/patch-bin_macros_FreeBSD.mk
+++ b/science/ncs/files/patch-bin_macros_FreeBSD.mk
@@ -1,5 +1,5 @@
---- bin/macros_FreeBSD.mk.orig Thu Mar 1 12:23:39 2007
-+++ bin/macros_FreeBSD.mk Tue May 8 15:06:34 2007
+--- 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
@@ -1,3 +1,4 @@
+# $FreeBSD$
#============================================================================
@@ -17,7 +17,7 @@
# Macro pour BFT
#---------------
--BFT_HOME =/home/saturne/opt/bft-1.0.3/arch/Linux
+-BFT_HOME =/home/saturne/opt/bft-1.0.5/arch/Linux
+BFT_HOME =${LOCALBASE}
BFT_INC =-I$(BFT_HOME)/include
@@ -26,24 +26,26 @@
# Macro pour FVM
#---------------
--FVM_HOME =/home/saturne/opt/fvm-0.6.3/arch/Linux
+-FVM_HOME =/home/saturne/opt/fvm-0.9.0/arch/Linux
+FVM_HOME =${LOCALBASE}
FVM_INC =-I$(FVM_HOME)/include
FVM_LDFLAGS =-L$(FVM_HOME)/lib -lfvm
-@@ -57,9 +58,8 @@
- MPE_COMM =1
+@@ -56,10 +57,9 @@
+ MPE =0
+ MPE_COMM =0
- # Pour Open MPI sur saturne
--MPI_HOME =/home/saturne/opt/openmpi-1.1.1/arch/Linux
+-# Pour Open MPI sur saturne
+-MPI_HOME =/home/saturne/opt/openmpi-1.2.4/arch/Linux
-MPI_INC =-isystem$(MPI_HOME)/include
--MPI_LIB =-pthread -L$(MPI_HOME)/lib -lmpi -lorte -lopal -ldl -Wl,--export-dynamic -lnsl -lutil -lm -ldl
+-MPI_LIB =-pthread -L$(MPI_HOME)/lib -lmpi -lopen-rte -lopen-pal -ldl -Wl,--export-dynamic -lnsl -lutil -lm -ldl
++# Pour MPI sur saturne
+MPI_INC =-I$(MPI_HOME)/include
+MPI_LIB =-L$(MPI_HOME)/lib ${MPI_LIBS} $(PTHREAD_LIBS)
-
# Macro pour Sockets
-@@ -76,10 +76,10 @@
+ #-------------------
+@@ -75,20 +75,19 @@
# Option XML
XML =1
@@ -54,13 +56,26 @@
-XML_LIB =-L$(XML_HOME)/arch/Linux/lib -lxml2
+XML_LIB =-L$(XML_HOME)/lib -lxml2
-
# Macro pour BLAS
-@@ -100,36 +100,36 @@
- # Compilateur C natif
- #--------------------
+ #----------------
+
+ # Option BLAS
+-BLAS =1
+-BLAS_HOME =/home/saturne/opt/atlas-3.8.0/arch/Linux_P4E
+-BLAS_INC =-I$(BLAS_HOME)/include
++BLAS =0
++BLAS_INC =
+ BLAS_CFLAGS =-D_CS_HAVE_CBLAS
+-BLAS_LDFLAGS =-L$(BLAS_HOME)/lib -lcblas -latlas
++BLAS_LDFLAGS =
+
+
+ # Preprocesseur
+@@ -101,35 +100,35 @@
+ # Compilateur C
+ #--------------
--CCOMP = /home/saturne/opt/gcc-4.1.1/arch/Linux/bin/gcc
+-CCOMP = /home/saturne/opt/gcc-4.2.2/arch/Linux/bin/gcc
+CCOMP = $(CC)
CCOMPFLAGSDEF = -std=c99 -funsigned-char -pedantic -W -Wall -Wshadow \
@@ -70,9 +85,9 @@
+ -Wmissing-declarations -Wnested-externs -Wno-uninitialized
-CCOMPFLAGS = $(CCOMPFLAGSDEF) -O -Wno-unused
--CCOMPFLAGSOPTPART1 = $(CCOMPFLAGSDEF) -O
--CCOMPFLAGSOPTPART2 = $(CCOMPFLAGSDEF) -O
--CCOMPFLAGSOPTPART3 = $(CCOMPFLAGSDEF) -O
+-CCOMPFLAGSOPTPART1 = $(CCOMPFLAGSDEF) -O2
+-CCOMPFLAGSOPTPART2 = $(CCOMPFLAGSDEF) -O2
+-CCOMPFLAGSOPTPART3 = $(CCOMPFLAGSDEF) -O0
-CCOMPFLAGSLO = $(CCOMPFLAGSDEF) -O0
-CCOMPFLAGSDBG = $(CCOMPFLAGSDEF) -g3
+CCOMPFLAGS = $(CCOMPFLAGSDEF) $(CFLAGS) -Wno-unused
@@ -86,11 +101,12 @@
+CCOMPFLAGSVERS = -v
- # Compilateur FORTRAN
+-# Compilateur FORTRAN
++# Compilateur FORTRAN
#--------------------
# Profiling gprof : -pg -a
--FTNCOMP = /home/saturne/opt/gcc-4.1.1/arch/Linux/bin/gfortran
+-FTNCOMP = /home/saturne/opt/gcc-4.2.2/arch/Linux/bin/gfortran
+FTNCOMP = $(FC)
FTNCOMPFLAGSDEF = -I.
@@ -99,20 +115,18 @@
-FTNCOMPFLAGSOPTPART1 = $(FTNCOMPFLAGSDEF) -O2
-FTNCOMPFLAGSOPTPART2 = $(FTNCOMPFLAGSDEF) -O6
-FTNCOMPFLAGSOPTPART3 = $(FTNCOMPFLAGSDEF) -O0
--FTNCOMPFLAGSLO = $(FTNCOMPFLAGSDEF) -O0
+FTNCOMPFLAGS = $(FTNCOMPFLAGSDEF) $(FFLAGS)
+FTNCOMPFLAGSOPTPART1 = $(FTNCOMPFLAGSDEF) $(FFLAGS)
+FTNCOMPFLAGSOPTPART2 = $(FTNCOMPFLAGSDEF) $(FFLAGS)
+FTNCOMPFLAGSOPTPART3 = $(FTNCOMPFLAGSDEF) $(FFLAGS)
-+FTNCOMPFLAGSLO = $(FTNCOMPFLAGSDEF) $(FFLAGS)
+ FTNCOMPFLAGSLO = $(FTNCOMPFLAGSDEF) -O0
FTNCOMPFLAGSDBG = $(FTNCOMPFLAGSDEF) -g
FTNCOMPFLAGSPROF = -pg
- FTNCOMPFLAGSVERS = -v
-@@ -140,13 +140,13 @@
+@@ -142,13 +141,13 @@
# Linker
--LDEDL = /home/saturne/opt/gcc-4.1.1/arch/Linux/bin/gfortran
+-LDEDL = /home/saturne/opt/gcc-4.2.2/arch/Linux/bin/gfortran
-LDEDLFLAGS = -O
-LDEDLFLAGSLO = -O0
+LDEDL = $(FC)
@@ -121,12 +135,12 @@
LDEDLFLAGSDBG = -g
LDEDLFLAGSPROF = -pg
LDEDLFLAGSVERS = -v
--LDEDLRPATH = -rdynamic -Wl,-rpath -Wl,/home/saturne/opt/gcc-4.1.1/arch/Linux/lib:
+-LDEDLRPATH = -rdynamic -Wl,-rpath -Wl,/home/saturne/opt/gcc-4.2.2/arch/Linux/lib:
+LDEDLRPATH = -rdynamic -Wl,-rpath -Wl,
# Positionnement des variables pour le pre-processeur
-@@ -162,7 +162,7 @@
+@@ -164,7 +163,7 @@
# Librairies de base toujours prises en compte
@@ -135,7 +149,7 @@
# Librairies en mode sans option
-@@ -178,7 +178,7 @@
+@@ -180,7 +179,7 @@
# Librairie en mode ElectricFence (malloc debugger)
diff --git a/science/ncs/files/patch-src_base_1_gradco.F b/science/ncs/files/patch-src_base_1_gradco.F
deleted file mode 100644
index 046e3e9aa875..000000000000
--- a/science/ncs/files/patch-src_base_1_gradco.F
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/base_1/gradco.F.orig Thu Mar 1 12:23:42 2007
-+++ src/base_1/gradco.F Sun Jun 17 15:01:40 2007
-@@ -319,7 +319,7 @@
- RKGKM1 = RKGK
- C
- #if defined(_CS_HAVE_BLAS)
-- CALL DZAXPY(NCEL,RGSRG,DK,UN,GK,UN,DK,UN)
-+ CALL CAXPY(NCEL,RGSRG,DK,UN,GK,UN,DK,UN)
- #else
- DO IEL=1,NCEL
- DK(IEL) = GK(IEL) +RGSRG*DK(IEL)
diff --git a/science/ncs/pkg-plist b/science/ncs/pkg-plist
index 1eaaefce4db3..915c0d4ee2d0 100644
--- a/science/ncs/pkg-plist
+++ b/science/ncs/pkg-plist
@@ -1,10 +1,12 @@
%%ECS_HOME%%/bin/ecs
%%ECS_HOME%%/doc
+%%CS_HOME%%/arch/FreeBSD/bin/cs13.exe
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneBASE.a
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneCFBL.a
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneCOGZ.a
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneCPLV.a
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneELEC.a
+%%CS_HOME%%/arch/FreeBSD/lib/libsaturneFUEL.a
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneLAGR.a
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneMATI.a
%%CS_HOME%%/arch/FreeBSD/lib/libsaturneRAYT.a
@@ -36,8 +38,10 @@
%%CS_HOME%%/bin/SaturneGUI
%%CS_HOME%%/bin/autovalid
%%CS_HOME%%/bin/autovalid.xml
+%%CS_HOME%%/bin/check_mesh
%%CS_HOME%%/bin/compiler_version
%%CS_HOME%%/bin/cree_sat
+%%CS_HOME%%/bin/cs.exe
%%CS_HOME%%/bin/cs_profile
%%CS_HOME%%/bin/gracehst
%%CS_HOME%%/bin/grp
@@ -47,7 +51,6 @@
%%CS_HOME%%/bin/lance_install
%%CS_HOME%%/bin/macros_FreeBSD.mk
%%CS_HOME%%/bin/rang_mpi.sh
-%%CS_HOME%%/bin/verifmail
%%CS_HOME%%/data/mati/emm.dat
%%CS_HOME%%/data/mati/emm.geom
%%CS_HOME%%/data/mati/vault.dat
@@ -58,37 +61,50 @@
%%CS_HOME%%/data/thch/dp_C4P
%%CS_HOME%%/data/thch/dp_ELE
%%CS_HOME%%/data/thch/dp_FCP
+%%CS_HOME%%/data/thch/dp_FUE
%%CS_HOME%%/data/thch/dp_transfo
-%%PORTDOCS%%%%CS_HOME%%/doc/NOYAU/noyau.pdf
-%%PORTDOCS%%%%CS_HOME%%/doc/UTILISATION/saturne.pdf
+%%PORTDOCS%%%%CS_HOME%%/doc/THEORY/theory.pdf
+%%PORTDOCS%%%%CS_HOME%%/doc/TUTORIAL/tutorial.pdf
+%%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
%%CS_HOME%%/include/base/cs_base.h
+%%CS_HOME%%/include/base/cs_benchmark.h
+%%CS_HOME%%/include/base/cs_blas.h
%%CS_HOME%%/include/base/cs_comm.h
%%CS_HOME%%/include/base/cs_couplage.h
+%%CS_HOME%%/include/base/cs_ecs_messages.h
+%%CS_HOME%%/include/base/cs_ext_neighborhood.h
+%%CS_HOME%%/include/base/cs_gradient.h
%%CS_HOME%%/include/base/cs_gui.h
%%CS_HOME%%/include/base/cs_gui_matisse.h
%%CS_HOME%%/include/base/cs_gui_radiative_transfer.h
%%CS_HOME%%/include/base/cs_gui_util.h
-%%CS_HOME%%/include/base/cs_maillage.h
-%%CS_HOME%%/include/base/cs_maillage_connect.h
-%%CS_HOME%%/include/base/cs_maillage_grd.h
-%%CS_HOME%%/include/base/cs_maillage_select.h
-%%CS_HOME%%/include/base/cs_maillage_solcom.h
+%%CS_HOME%%/include/base/cs_halo.h
+%%CS_HOME%%/include/base/cs_matrix.h
+%%CS_HOME%%/include/base/cs_mesh.h
+%%CS_HOME%%/include/base/cs_mesh_coherency.h
+%%CS_HOME%%/include/base/cs_mesh_connect.h
%%CS_HOME%%/include/base/cs_mesh_quality.h
-%%CS_HOME%%/include/base/cs_messages_ecs.h
-%%CS_HOME%%/include/base/cs_msg.h
+%%CS_HOME%%/include/base/cs_mesh_quantities.h
+%%CS_HOME%%/include/base/cs_mesh_select.h
+%%CS_HOME%%/include/base/cs_mesh_solcom.h
+%%CS_HOME%%/include/base/cs_mesh_warping.h
%%CS_HOME%%/include/base/cs_opts.h
-%%CS_HOME%%/include/base/cs_parallel.h
+%%CS_HOME%%/include/base/cs_parall.h
%%CS_HOME%%/include/base/cs_perio.h
%%CS_HOME%%/include/base/cs_post.h
+%%CS_HOME%%/include/base/cs_pp_io.h
+%%CS_HOME%%/include/base/cs_prototypes.h
+%%CS_HOME%%/include/base/cs_renumber.h
+%%CS_HOME%%/include/base/cs_selector.h
+%%CS_HOME%%/include/base/cs_sles.h
%%CS_HOME%%/include/base/cs_suite.h
%%CS_HOME%%/include/base/cs_syr_coupling.h
%%CS_HOME%%/include/base/cs_syr_messages.h
%%CS_HOME%%/include/base/cs_tpar1d.h
%%CS_HOME%%/include/base/cs_ventil.h
-%%CS_HOME%%/include/base/cs_voiset.h
%%CS_HOME%%/include/base/cstnum.h
%%CS_HOME%%/include/base/cstphy.h
%%CS_HOME%%/include/base/dimens.h
@@ -106,234 +122,239 @@
%%CS_HOME%%/include/base/tcpumx.h
%%CS_HOME%%/include/base/tremai.h
%%CS_HOME%%/include/base/vector.h
-%%CS_HOME%%/include/base/vide.h
%%CS_HOME%%/include/base/vortex.h
%%CS_HOME%%/include/cfbl/cfpoin.h
%%CS_HOME%%/include/cogz/coincl.h
-%%CS_HOME%%/include/cogz/vide.h
%%CS_HOME%%/include/cplv/cpincl.h
-%%CS_HOME%%/include/cplv/vide.h
%%CS_HOME%%/include/elec/elincl.h
+%%CS_HOME%%/include/fuel/fuincl.h
%%CS_HOME%%/include/lagr/cs_lagr_perio.h
%%CS_HOME%%/include/lagr/cs_lagrang.h
%%CS_HOME%%/include/lagr/lagdim.h
%%CS_HOME%%/include/lagr/lagpar.h
%%CS_HOME%%/include/lagr/lagran.h
-%%CS_HOME%%/include/lagr/vide.h
%%CS_HOME%%/include/mati/matiss.h
-%%CS_HOME%%/include/mati/vide.h
%%CS_HOME%%/include/pprt/ppincl.h
%%CS_HOME%%/include/pprt/ppppar.h
%%CS_HOME%%/include/pprt/ppthch.h
-%%CS_HOME%%/include/pprt/vide.h
%%CS_HOME%%/include/rayt/radiat.h
-%%CS_HOME%%/include/rayt/vide.h
-%%CS_HOME%%/src/base_1/alelap.F
-%%CS_HOME%%/src/base_1/alemaj.F
-%%CS_HOME%%/src/base_1/altycl.F
-%%CS_HOME%%/src/base_1/armtps.F
-%%CS_HOME%%/src/base_1/calgeo.F
-%%CS_HOME%%/src/base_1/calmom.F
-%%CS_HOME%%/src/base_1/caltri.F
-%%CS_HOME%%/src/base_1/catsma.F
-%%CS_HOME%%/src/base_1/causta.F
-%%CS_HOME%%/src/base_1/clca66.F
-%%CS_HOME%%/src/base_1/cldijp.F
-%%CS_HOME%%/src/base_1/cldipo.F
-%%CS_HOME%%/src/base_1/clpsca.F
-%%CS_HOME%%/src/base_1/clsurn.F
-%%CS_HOME%%/src/base_1/clsyvt.F
-%%CS_HOME%%/src/base_1/clvolc.F
-%%CS_HOME%%/src/base_1/codits.F
-%%CS_HOME%%/src/base_1/condli.F
-%%CS_HOME%%/src/base_1/cou1di.F
-%%CS_HOME%%/src/base_1/cou1do.F
-%%CS_HOME%%/src/base_1/coupbi.F
-%%CS_HOME%%/src/base_1/coupbo.F
-%%CS_HOME%%/src/base_1/covofi.F
-%%CS_HOME%%/src/base_1/cregeo.F
-%%CS_HOME%%/src/base_1/cs_ale.c
-%%CS_HOME%%/src/base_1/cs_base.c
-%%CS_HOME%%/src/base_1/cs_comm.c
-%%CS_HOME%%/src/base_1/cs_couplage.c
-%%CS_HOME%%/src/base_1/cs_gui.c
-%%CS_HOME%%/src/base_1/cs_gui_matisse.c
-%%CS_HOME%%/src/base_1/cs_gui_radiative_transfer.c
-%%CS_HOME%%/src/base_1/cs_gui_util.c
-%%CS_HOME%%/src/base_1/cs_maillage.c
-%%CS_HOME%%/src/base_1/cs_maillage_connect.c
-%%CS_HOME%%/src/base_1/cs_maillage_grd.c
-%%CS_HOME%%/src/base_1/cs_maillage_select.c
-%%CS_HOME%%/src/base_1/cs_maillage_solcom.c
-%%CS_HOME%%/src/base_1/cs_main.c
-%%CS_HOME%%/src/base_1/cs_mesh_quality.c
-%%CS_HOME%%/src/base_1/cs_messages_ecs.c
-%%CS_HOME%%/src/base_1/cs_msg.c
-%%CS_HOME%%/src/base_1/cs_opts.c
-%%CS_HOME%%/src/base_1/cs_parallel.c
-%%CS_HOME%%/src/base_1/cs_perio.c
-%%CS_HOME%%/src/base_1/cs_post.c
-%%CS_HOME%%/src/base_1/cs_post_util.F
-%%CS_HOME%%/src/base_1/cs_suite.c
-%%CS_HOME%%/src/base_1/cs_syr_coupling.c
-%%CS_HOME%%/src/base_1/cs_syr_messages.c
-%%CS_HOME%%/src/base_1/cs_tpar1d.c
-%%CS_HOME%%/src/base_1/cs_ventil.c
-%%CS_HOME%%/src/base_1/cs_voiset.c
-%%CS_HOME%%/src/base_1/csclli.F
-%%CS_HOME%%/src/base_1/csflsh.F
-%%CS_HOME%%/src/base_1/csinit.F
-%%CS_HOME%%/src/base_1/csprnt.F
-%%CS_HOME%%/src/base_1/distpr.F
-%%CS_HOME%%/src/base_1/distyp.F
-%%CS_HOME%%/src/base_1/divmas.F
-%%CS_HOME%%/src/base_1/divrij.F
-%%CS_HOME%%/src/base_1/dttvar.F
-%%CS_HOME%%/src/base_1/dvvpst.F
-%%CS_HOME%%/src/base_1/ecrava.F
-%%CS_HOME%%/src/base_1/ecrhis.F
-%%CS_HOME%%/src/base_1/ecrlis.F
-%%CS_HOME%%/src/base_1/findpt.F
-%%CS_HOME%%/src/base_1/gradco.F
-%%CS_HOME%%/src/base_1/grdcel.F
-%%CS_HOME%%/src/base_1/hturbp.F
-%%CS_HOME%%/src/base_1/iasize.F
-%%CS_HOME%%/src/base_1/idrbla.F
-%%CS_HOME%%/src/base_1/impini.F
-%%CS_HOME%%/src/base_1/iniini.F
-%%CS_HOME%%/src/base_1/inimas.F
-%%CS_HOME%%/src/base_1/inipst.F
-%%CS_HOME%%/src/base_1/initi1.F
-%%CS_HOME%%/src/base_1/initi2.F
-%%CS_HOME%%/src/base_1/iniusi.F
-%%CS_HOME%%/src/base_1/iniva0.F
-%%CS_HOME%%/src/base_1/inivar.F
-%%CS_HOME%%/src/base_1/invers.F
-%%CS_HOME%%/src/base_1/iprbla.F
-%%CS_HOME%%/src/base_1/itrgrp.F
-%%CS_HOME%%/src/base_1/itrmas.F
-%%CS_HOME%%/src/base_1/jacobi.F
-%%CS_HOME%%/src/base_1/lecamo.F
-%%CS_HOME%%/src/base_1/lecamp.F
-%%CS_HOME%%/src/base_1/lecamx.F
-%%CS_HOME%%/src/base_1/ledgeo.F
-%%CS_HOME%%/src/base_1/letgeo.F
-%%CS_HOME%%/src/base_1/matrdt.F
-%%CS_HOME%%/src/base_1/matrix.F
-%%CS_HOME%%/src/base_1/memale.F
-%%CS_HOME%%/src/base_1/memcbr.F
-%%CS_HOME%%/src/base_1/memclg.F
-%%CS_HOME%%/src/base_1/memcli.F
-%%CS_HOME%%/src/base_1/memdis.F
-%%CS_HOME%%/src/base_1/memdtv.F
-%%CS_HOME%%/src/base_1/memdyp.F
-%%CS_HOME%%/src/base_1/memini.F
-%%CS_HOME%%/src/base_1/memkep.F
-%%CS_HOME%%/src/base_1/memkom.F
-%%CS_HOME%%/src/base_1/memnav.F
-%%CS_HOME%%/src/base_1/memnvc.F
-%%CS_HOME%%/src/base_1/mempdc.F
-%%CS_HOME%%/src/base_1/memphy.F
-%%CS_HOME%%/src/base_1/memrij.F
-%%CS_HOME%%/src/base_1/memsca.F
-%%CS_HOME%%/src/base_1/memt1d.F
-%%CS_HOME%%/src/base_1/memtri.F
-%%CS_HOME%%/src/base_1/memtsm.F
-%%CS_HOME%%/src/base_1/memv2f.F
-%%CS_HOME%%/src/base_1/memvor.F
-%%CS_HOME%%/src/base_1/modini.F
-%%CS_HOME%%/src/base_1/modpar.F
-%%CS_HOME%%/src/base_1/navsto.F
-%%CS_HOME%%/src/base_1/newmrk.F
-%%CS_HOME%%/src/base_1/numvec.F
-%%CS_HOME%%/src/base_1/ordita.F
-%%CS_HOME%%/src/base_1/parge1.F
-%%CS_HOME%%/src/base_1/pergra.F
-%%CS_HOME%%/src/base_1/perinr.F
-%%CS_HOME%%/src/base_1/perinu.F
-%%CS_HOME%%/src/base_1/phyvar.F
-%%CS_HOME%%/src/base_1/postlc.F
-%%CS_HOME%%/src/base_1/prcpol.F
-%%CS_HOME%%/src/base_1/precli.F
-%%CS_HOME%%/src/base_1/prmoy0.F
-%%CS_HOME%%/src/base_1/prods2.F
-%%CS_HOME%%/src/base_1/prods3.F
-%%CS_HOME%%/src/base_1/prodsc.F
-%%CS_HOME%%/src/base_1/projts.F
-%%CS_HOME%%/src/base_1/promav.F
-%%CS_HOME%%/src/base_1/proxav.F
-%%CS_HOME%%/src/base_1/rasize.F
-%%CS_HOME%%/src/base_1/reseps.F
-%%CS_HOME%%/src/base_1/resrij.F
-%%CS_HOME%%/src/base_1/resssg.F
-%%CS_HOME%%/src/base_1/resv2f.F
-%%CS_HOME%%/src/base_1/rijech.F
-%%CS_HOME%%/src/base_1/rijthe.F
-%%CS_HOME%%/src/base_1/scalai.F
-%%CS_HOME%%/src/base_1/schtmp.F
-%%CS_HOME%%/src/base_1/semantic.cache
-%%CS_HOME%%/src/base_1/strdep.F
-%%CS_HOME%%/src/base_1/strini.F
-%%CS_HOME%%/src/base_1/strpre.F
-%%CS_HOME%%/src/base_1/tcpumx.c
-%%CS_HOME%%/src/base_1/tdesi1.F
-%%CS_HOME%%/src/base_1/testel.F
-%%CS_HOME%%/src/base_1/tremai.c
-%%CS_HOME%%/src/base_1/tridim.F
-%%CS_HOME%%/src/base_1/tsepdc.F
-%%CS_HOME%%/src/base_1/turent.F
-%%CS_HOME%%/src/base_1/turrij.F
-%%CS_HOME%%/src/base_1/typecl.F
-%%CS_HOME%%/src/base_1/undscr.F
-%%CS_HOME%%/src/base_1/vandri.F
-%%CS_HOME%%/src/base_1/varpos.F
-%%CS_HOME%%/src/base_1/vectds.F
-%%CS_HOME%%/src/base_1/vericl.F
-%%CS_HOME%%/src/base_1/verini.F
-%%CS_HOME%%/src/base_1/verlon.F
-%%CS_HOME%%/src/base_1/vert1d.F
-%%CS_HOME%%/src/base_1/visdyn.F
-%%CS_HOME%%/src/base_1/vislmg.F
-%%CS_HOME%%/src/base_1/vissec.F
-%%CS_HOME%%/src/base_1/vissma.F
-%%CS_HOME%%/src/base_1/vissst.F
-%%CS_HOME%%/src/base_1/vor2cl.F
-%%CS_HOME%%/src/base_1/vordep.F
-%%CS_HOME%%/src/base_1/vorimp.F
-%%CS_HOME%%/src/base_1/vorin0.F
-%%CS_HOME%%/src/base_1/vorini.F
-%%CS_HOME%%/src/base_1/vorlgv.F
-%%CS_HOME%%/src/base_1/vorpre.F
-%%CS_HOME%%/src/base_1/vortex.F
-%%CS_HOME%%/src/base_1/vorver.F
-%%CS_HOME%%/src/base_1/vorvit.F
-%%CS_HOME%%/src/base_1/zufall.F
-%%CS_HOME%%/src/base_2/bilsc2.F
-%%CS_HOME%%/src/base_2/calgrg.F
-%%CS_HOME%%/src/base_2/calhyd.F
-%%CS_HOME%%/src/base_2/cgstab.F
-%%CS_HOME%%/src/base_2/clipke.F
-%%CS_HOME%%/src/base_2/clmlga.F
-%%CS_HOME%%/src/base_2/clprij.F
-%%CS_HOME%%/src/base_2/clptur.F
-%%CS_HOME%%/src/base_2/clpv2f.F
-%%CS_HOME%%/src/base_2/cycmgr.F
-%%CS_HOME%%/src/base_2/filtre.F
-%%CS_HOME%%/src/base_2/gradmc.F
-%%CS_HOME%%/src/base_2/gradrc.F
-%%CS_HOME%%/src/base_2/limgrd.F
-%%CS_HOME%%/src/base_2/memgrg.F
-%%CS_HOME%%/src/base_2/mempgr.F
-%%CS_HOME%%/src/base_2/preduv.F
-%%CS_HOME%%/src/base_2/premgr.F
-%%CS_HOME%%/src/base_2/prolon.F
-%%CS_HOME%%/src/base_2/recvmc.F
-%%CS_HOME%%/src/base_2/resmgr.F
-%%CS_HOME%%/src/base_2/resolp.F
-%%CS_HOME%%/src/base_2/turbke.F
-%%CS_HOME%%/src/base_2/turbkw.F
-%%CS_HOME%%/src/base_2/viscfa.F
-%%CS_HOME%%/src/base_2/visort.F
+%%CS_HOME%%/src/base/alelap.F
+%%CS_HOME%%/src/base/alemaj.F
+%%CS_HOME%%/src/base/altycl.F
+%%CS_HOME%%/src/base/armtps.F
+%%CS_HOME%%/src/base/bilsc2.F
+%%CS_HOME%%/src/base/calgeo.F
+%%CS_HOME%%/src/base/calgrg.F
+%%CS_HOME%%/src/base/calhyd.F
+%%CS_HOME%%/src/base/calmom.F
+%%CS_HOME%%/src/base/caltri.F
+%%CS_HOME%%/src/base/catsma.F
+%%CS_HOME%%/src/base/causta.F
+%%CS_HOME%%/src/base/cgstab.F
+%%CS_HOME%%/src/base/clca66.F
+%%CS_HOME%%/src/base/cldijp.F
+%%CS_HOME%%/src/base/cldipo.F
+%%CS_HOME%%/src/base/clipke.F
+%%CS_HOME%%/src/base/clmlga.F
+%%CS_HOME%%/src/base/clprij.F
+%%CS_HOME%%/src/base/clpsca.F
+%%CS_HOME%%/src/base/clptrg.F
+%%CS_HOME%%/src/base/clptur.F
+%%CS_HOME%%/src/base/clpv2f.F
+%%CS_HOME%%/src/base/clsurn.F
+%%CS_HOME%%/src/base/clsyvt.F
+%%CS_HOME%%/src/base/clvolc.F
+%%CS_HOME%%/src/base/codits.F
+%%CS_HOME%%/src/base/condli.F
+%%CS_HOME%%/src/base/cou1di.F
+%%CS_HOME%%/src/base/cou1do.F
+%%CS_HOME%%/src/base/coupbi.F
+%%CS_HOME%%/src/base/coupbo.F
+%%CS_HOME%%/src/base/covofi.F
+%%CS_HOME%%/src/base/cregeo.F
+%%CS_HOME%%/src/base/cs_ale.c
+%%CS_HOME%%/src/base/cs_base.c
+%%CS_HOME%%/src/base/cs_benchmark.c
+%%CS_HOME%%/src/base/cs_blas.c
+%%CS_HOME%%/src/base/cs_comm.c
+%%CS_HOME%%/src/base/cs_couplage.c
+%%CS_HOME%%/src/base/cs_ecs_messages.c
+%%CS_HOME%%/src/base/cs_ext_neighborhood.c
+%%CS_HOME%%/src/base/cs_gradient.c
+%%CS_HOME%%/src/base/cs_gui.c
+%%CS_HOME%%/src/base/cs_gui_matisse.c
+%%CS_HOME%%/src/base/cs_gui_radiative_transfer.c
+%%CS_HOME%%/src/base/cs_gui_util.c
+%%CS_HOME%%/src/base/cs_halo.c
+%%CS_HOME%%/src/base/cs_interpr_util.F
+%%CS_HOME%%/src/base/cs_main.c
+%%CS_HOME%%/src/base/cs_matrix.c
+%%CS_HOME%%/src/base/cs_mesh.c
+%%CS_HOME%%/src/base/cs_mesh_coherency.c
+%%CS_HOME%%/src/base/cs_mesh_connect.c
+%%CS_HOME%%/src/base/cs_mesh_quality.c
+%%CS_HOME%%/src/base/cs_mesh_quantities.c
+%%CS_HOME%%/src/base/cs_mesh_select.c
+%%CS_HOME%%/src/base/cs_mesh_solcom.c
+%%CS_HOME%%/src/base/cs_mesh_warping.c
+%%CS_HOME%%/src/base/cs_opts.c
+%%CS_HOME%%/src/base/cs_parall.c
+%%CS_HOME%%/src/base/cs_perio.c
+%%CS_HOME%%/src/base/cs_post.c
+%%CS_HOME%%/src/base/cs_post_util.F
+%%CS_HOME%%/src/base/cs_pp_io.c
+%%CS_HOME%%/src/base/cs_renumber.c
+%%CS_HOME%%/src/base/cs_selector.c
+%%CS_HOME%%/src/base/cs_sles.c
+%%CS_HOME%%/src/base/cs_suite.c
+%%CS_HOME%%/src/base/cs_syr_coupling.c
+%%CS_HOME%%/src/base/cs_syr_messages.c
+%%CS_HOME%%/src/base/cs_tpar1d.c
+%%CS_HOME%%/src/base/cs_ventil.c
+%%CS_HOME%%/src/base/csclli.F
+%%CS_HOME%%/src/base/csflsh.F
+%%CS_HOME%%/src/base/csinit.F
+%%CS_HOME%%/src/base/csprnt.F
+%%CS_HOME%%/src/base/cycmgr.F
+%%CS_HOME%%/src/base/distpr.F
+%%CS_HOME%%/src/base/distyp.F
+%%CS_HOME%%/src/base/divmas.F
+%%CS_HOME%%/src/base/divrij.F
+%%CS_HOME%%/src/base/dttvar.F
+%%CS_HOME%%/src/base/dvvpst.F
+%%CS_HOME%%/src/base/ecrava.F
+%%CS_HOME%%/src/base/ecrhis.F
+%%CS_HOME%%/src/base/ecrlis.F
+%%CS_HOME%%/src/base/findpt.F
+%%CS_HOME%%/src/base/gradco.F
+%%CS_HOME%%/src/base/gradmc.F
+%%CS_HOME%%/src/base/gradrc.F
+%%CS_HOME%%/src/base/grdcel.F
+%%CS_HOME%%/src/base/haltyp.F
+%%CS_HOME%%/src/base/hturbp.F
+%%CS_HOME%%/src/base/iasize.F
+%%CS_HOME%%/src/base/idrbla.F
+%%CS_HOME%%/src/base/impini.F
+%%CS_HOME%%/src/base/iniini.F
+%%CS_HOME%%/src/base/inimas.F
+%%CS_HOME%%/src/base/inipst.F
+%%CS_HOME%%/src/base/initi1.F
+%%CS_HOME%%/src/base/initi2.F
+%%CS_HOME%%/src/base/iniusi.F
+%%CS_HOME%%/src/base/iniva0.F
+%%CS_HOME%%/src/base/inivar.F
+%%CS_HOME%%/src/base/invers.F
+%%CS_HOME%%/src/base/iprbla.F
+%%CS_HOME%%/src/base/itrgrp.F
+%%CS_HOME%%/src/base/itrmas.F
+%%CS_HOME%%/src/base/jacobi.F
+%%CS_HOME%%/src/base/lecamo.F
+%%CS_HOME%%/src/base/lecamp.F
+%%CS_HOME%%/src/base/lecamx.F
+%%CS_HOME%%/src/base/ledgeo.F
+%%CS_HOME%%/src/base/letgeo.F
+%%CS_HOME%%/src/base/majgeo.F
+%%CS_HOME%%/src/base/matrdt.F
+%%CS_HOME%%/src/base/matrix.F
+%%CS_HOME%%/src/base/memale.F
+%%CS_HOME%%/src/base/memcbr.F
+%%CS_HOME%%/src/base/memclg.F
+%%CS_HOME%%/src/base/memcli.F
+%%CS_HOME%%/src/base/memdis.F
+%%CS_HOME%%/src/base/memdtv.F
+%%CS_HOME%%/src/base/memdyp.F
+%%CS_HOME%%/src/base/memgrg.F
+%%CS_HOME%%/src/base/memini.F
+%%CS_HOME%%/src/base/memkep.F
+%%CS_HOME%%/src/base/memkom.F
+%%CS_HOME%%/src/base/memnav.F
+%%CS_HOME%%/src/base/mempdc.F
+%%CS_HOME%%/src/base/mempgr.F
+%%CS_HOME%%/src/base/memphy.F
+%%CS_HOME%%/src/base/memrij.F
+%%CS_HOME%%/src/base/memsca.F
+%%CS_HOME%%/src/base/memt1d.F
+%%CS_HOME%%/src/base/memtri.F
+%%CS_HOME%%/src/base/memtsm.F
+%%CS_HOME%%/src/base/memv2f.F
+%%CS_HOME%%/src/base/memvor.F
+%%CS_HOME%%/src/base/modini.F
+%%CS_HOME%%/src/base/modpar.F
+%%CS_HOME%%/src/base/navsto.F
+%%CS_HOME%%/src/base/newmrk.F
+%%CS_HOME%%/src/base/numvec.F
+%%CS_HOME%%/src/base/ordita.F
+%%CS_HOME%%/src/base/parge1.F
+%%CS_HOME%%/src/base/pergra.F
+%%CS_HOME%%/src/base/perinr.F
+%%CS_HOME%%/src/base/perinu.F
+%%CS_HOME%%/src/base/phyvar.F
+%%CS_HOME%%/src/base/prcpol.F
+%%CS_HOME%%/src/base/precli.F
+%%CS_HOME%%/src/base/preduv.F
+%%CS_HOME%%/src/base/premgr.F
+%%CS_HOME%%/src/base/prmoy0.F
+%%CS_HOME%%/src/base/prods2.F
+%%CS_HOME%%/src/base/prods3.F
+%%CS_HOME%%/src/base/prodsc.F
+%%CS_HOME%%/src/base/projts.F
+%%CS_HOME%%/src/base/prolon.F
+%%CS_HOME%%/src/base/promav.F
+%%CS_HOME%%/src/base/proxav.F
+%%CS_HOME%%/src/base/rasize.F
+%%CS_HOME%%/src/base/recvmc.F
+%%CS_HOME%%/src/base/reseps.F
+%%CS_HOME%%/src/base/resmgr.F
+%%CS_HOME%%/src/base/resolp.F
+%%CS_HOME%%/src/base/resrij.F
+%%CS_HOME%%/src/base/resssg.F
+%%CS_HOME%%/src/base/resv2f.F
+%%CS_HOME%%/src/base/rijech.F
+%%CS_HOME%%/src/base/rijthe.F
+%%CS_HOME%%/src/base/scalai.F
+%%CS_HOME%%/src/base/schtmp.F
+%%CS_HOME%%/src/base/stdtcl.F
+%%CS_HOME%%/src/base/strdep.F
+%%CS_HOME%%/src/base/strhis.F
+%%CS_HOME%%/src/base/strini.F
+%%CS_HOME%%/src/base/strpre.F
+%%CS_HOME%%/src/base/tcpumx.c
+%%CS_HOME%%/src/base/tdesi1.F
+%%CS_HOME%%/src/base/testel.F
+%%CS_HOME%%/src/base/tremai.c
+%%CS_HOME%%/src/base/tridim.F
+%%CS_HOME%%/src/base/tsepdc.F
+%%CS_HOME%%/src/base/turbke.F
+%%CS_HOME%%/src/base/turbkw.F
+%%CS_HOME%%/src/base/turent.F
+%%CS_HOME%%/src/base/turrij.F
+%%CS_HOME%%/src/base/typecl.F
+%%CS_HOME%%/src/base/undscr.F
+%%CS_HOME%%/src/base/vandri.F
+%%CS_HOME%%/src/base/varpos.F
+%%CS_HOME%%/src/base/vectds.F
+%%CS_HOME%%/src/base/vericl.F
+%%CS_HOME%%/src/base/verini.F
+%%CS_HOME%%/src/base/verlon.F
+%%CS_HOME%%/src/base/vert1d.F
+%%CS_HOME%%/src/base/viscfa.F
+%%CS_HOME%%/src/base/visdyn.F
+%%CS_HOME%%/src/base/vislmg.F
+%%CS_HOME%%/src/base/visort.F
+%%CS_HOME%%/src/base/vissec.F
+%%CS_HOME%%/src/base/vissma.F
+%%CS_HOME%%/src/base/vissst.F
+%%CS_HOME%%/src/base/vor2cl.F
+%%CS_HOME%%/src/base/vordep.F
+%%CS_HOME%%/src/base/vorimp.F
+%%CS_HOME%%/src/base/vorin0.F
+%%CS_HOME%%/src/base/vorini.F
+%%CS_HOME%%/src/base/vorlgv.F
+%%CS_HOME%%/src/base/vorpre.F
+%%CS_HOME%%/src/base/vortex.F
+%%CS_HOME%%/src/base/vorver.F
+%%CS_HOME%%/src/base/vorvit.F
+%%CS_HOME%%/src/base/zufall.F
%%CS_HOME%%/src/cfbl/cfbsc2.F
%%CS_HOME%%/src/cfbl/cfbsc3.F
%%CS_HOME%%/src/cfbl/cfcdts.F
@@ -358,7 +379,6 @@
%%CS_HOME%%/src/cfbl/memcfv.F
%%CS_HOME%%/src/cogz/coini1.F
%%CS_HOME%%/src/cogz/colecd.F
-%%CS_HOME%%/src/cogz/copdfr.F
%%CS_HOME%%/src/cogz/coprop.F
%%CS_HOME%%/src/cogz/cothht.F
%%CS_HOME%%/src/cogz/covarp.F
@@ -384,6 +404,7 @@
%%CS_HOME%%/src/cogz/pdfpp3.F
%%CS_HOME%%/src/cogz/pdfpp4.F
%%CS_HOME%%/src/cplv/cpcym1.F
+%%CS_HOME%%/src/cplv/cpcym2.F
%%CS_HOME%%/src/cplv/cpflux.F
%%CS_HOME%%/src/cplv/cpini1.F
%%CS_HOME%%/src/cplv/cpiniv.F
@@ -429,6 +450,27 @@
%%CS_HOME%%/src/elec/eltssc.F
%%CS_HOME%%/src/elec/elvarp.F
%%CS_HOME%%/src/elec/elveri.F
+%%CS_HOME%%/src/fuel/fucym1.F
+%%CS_HOME%%/src/fuel/fuflux.F
+%%CS_HOME%%/src/fuel/fuini1.F
+%%CS_HOME%%/src/fuel/fuiniv.F
+%%CS_HOME%%/src/fuel/fulecd.F
+%%CS_HOME%%/src/fuel/fupdfr.F
+%%CS_HOME%%/src/fuel/fuphy1.F
+%%CS_HOME%%/src/fuel/fuphy2.F
+%%CS_HOME%%/src/fuel/fuphyv.F
+%%CS_HOME%%/src/fuel/fuprop.F
+%%CS_HOME%%/src/fuel/fuptcl.F
+%%CS_HOME%%/src/fuel/futeh1.F
+%%CS_HOME%%/src/fuel/futeh2.F
+%%CS_HOME%%/src/fuel/futhp1.F
+%%CS_HOME%%/src/fuel/futhp2.F
+%%CS_HOME%%/src/fuel/futssc.F
+%%CS_HOME%%/src/fuel/futsvc.F
+%%CS_HOME%%/src/fuel/futsvi.F
+%%CS_HOME%%/src/fuel/fuvarp.F
+%%CS_HOME%%/src/fuel/fuveri.F
+%%CS_HOME%%/src/fuel/memfu1.F
%%CS_HOME%%/src/lagr/cs_lagr_perio.c
%%CS_HOME%%/src/lagr/cs_lagrang.c
%%CS_HOME%%/src/lagr/diverv.F
@@ -490,6 +532,7 @@
%%CS_HOME%%/src/pprt/ppinii.F
%%CS_HOME%%/src/pprt/ppiniv.F
%%CS_HOME%%/src/pprt/pplecd.F
+%%CS_HOME%%/src/pprt/pppdfr.F
%%CS_HOME%%/src/pprt/ppphyv.F
%%CS_HOME%%/src/pprt/ppprcl.F
%%CS_HOME%%/src/pprt/ppprop.F
@@ -529,10 +572,10 @@
%%CS_HOME%%/users/base/usphyv.F
%%CS_HOME%%/users/base/usproj.F
%%CS_HOME%%/users/base/uspt1d.F
-%%CS_HOME%%/users/base/usrubm.F
%%CS_HOME%%/users/base/usruet.F
%%CS_HOME%%/users/base/ussmag.F
%%CS_HOME%%/users/base/usstru.F
+%%CS_HOME%%/users/base/ustbus.F
%%CS_HOME%%/users/base/usthht.F
%%CS_HOME%%/users/base/ustske.F
%%CS_HOME%%/users/base/ustskw.F
@@ -572,6 +615,9 @@
%%CS_HOME%%/users/elec/uselph.F
%%CS_HOME%%/users/elec/uselrc.F
%%CS_HOME%%/users/elec/usetcl.F
+%%CS_HOME%%/users/fuel/usfucl.F
+%%CS_HOME%%/users/fuel/usfui1.F
+%%CS_HOME%%/users/fuel/usfuiv.F
%%CS_HOME%%/users/lagr/uslabo.F
%%CS_HOME%%/users/lagr/usladp.F
%%CS_HOME%%/users/lagr/uslaed.F
@@ -596,6 +642,7 @@ lib/libsaturneCFBL.a
lib/libsaturneCOGZ.a
lib/libsaturneCPLV.a
lib/libsaturneELEC.a
+lib/libsaturneFUEL.a
lib/libsaturneLAGR.a
lib/libsaturneMATI.a
lib/libsaturneRAYT.a
@@ -603,12 +650,14 @@ lib/libsaturneRAYT.a
%%PORTDOCS%%%%DOCSDIR%%/COMPATIBILITY
%%PORTDOCS%%%%DOCSDIR%%/Changelog
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/noyau.pdf
-%%PORTDOCS%%%%DOCSDIR%%/saturne.pdf
+%%PORTDOCS%%%%DOCSDIR%%/theory.pdf
+%%PORTDOCS%%%%DOCSDIR%%/tutorial.pdf
+%%PORTDOCS%%%%DOCSDIR%%/user.pdf
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%CS_HOME%%/users/rayt
@dirrm %%CS_HOME%%/users/pprt
@dirrm %%CS_HOME%%/users/lagr
+@dirrm %%CS_HOME%%/users/fuel
@dirrm %%CS_HOME%%/users/elec
@dirrm %%CS_HOME%%/users/cplv
@dirrm %%CS_HOME%%/users/cogz
@@ -619,25 +668,27 @@ lib/libsaturneRAYT.a
@dirrm %%CS_HOME%%/src/pprt
@dirrm %%CS_HOME%%/src/mati
@dirrm %%CS_HOME%%/src/lagr
+@dirrm %%CS_HOME%%/src/fuel
@dirrm %%CS_HOME%%/src/elec
@dirrm %%CS_HOME%%/src/cplv
@dirrm %%CS_HOME%%/src/cogz
@dirrm %%CS_HOME%%/src/cfbl
-@dirrm %%CS_HOME%%/src/base_2
-@dirrm %%CS_HOME%%/src/base_1
+@dirrm %%CS_HOME%%/src/base
@dirrm %%CS_HOME%%/src
@dirrm %%CS_HOME%%/include/rayt
@dirrm %%CS_HOME%%/include/pprt
@dirrm %%CS_HOME%%/include/mati
@dirrm %%CS_HOME%%/include/lagr
+@dirrm %%CS_HOME%%/include/fuel
@dirrm %%CS_HOME%%/include/elec
@dirrm %%CS_HOME%%/include/cplv
@dirrm %%CS_HOME%%/include/cogz
@dirrm %%CS_HOME%%/include/cfbl
@dirrm %%CS_HOME%%/include/base
@dirrm %%CS_HOME%%/include
-%%PORTDOCS%%@dirrm %%CS_HOME%%/doc/UTILISATION
-%%PORTDOCS%%@dirrm %%CS_HOME%%/doc/NOYAU
+%%PORTDOCS%%@dirrm %%CS_HOME%%/doc/USER
+%%PORTDOCS%%@dirrm %%CS_HOME%%/doc/TUTORIAL
+%%PORTDOCS%%@dirrm %%CS_HOME%%/doc/THEORY
%%PORTDOCS%%@dirrm %%CS_HOME%%/doc
@dirrm %%CS_HOME%%/data/thch
@dirrm %%CS_HOME%%/data/mati
@@ -645,6 +696,7 @@ lib/libsaturneRAYT.a
@dirrm %%CS_HOME%%/bin/Autovalidation
@dirrm %%CS_HOME%%/bin
@dirrm %%CS_HOME%%/arch/FreeBSD/lib
+@dirrm %%CS_HOME%%/arch/FreeBSD/bin
@dirrm %%CS_HOME%%/arch/FreeBSD
@dirrm %%CS_HOME%%/arch
@dirrm %%CS_HOME%%