aboutsummaryrefslogtreecommitdiff
path: root/science/ncs/files
diff options
context:
space:
mode:
Diffstat (limited to 'science/ncs/files')
-rw-r--r--science/ncs/files/patch-bin_Makefile64
-rw-r--r--science/ncs/files/patch-bin_compiler_version24
-rw-r--r--science/ncs/files/patch-bin_cree_sat37
-rw-r--r--science/ncs/files/patch-bin_cs_profile61
-rw-r--r--science/ncs/files/patch-bin_gracehst17
-rw-r--r--science/ncs/files/patch-bin_grp8
-rw-r--r--science/ncs/files/patch-bin_macros_FreeBSD.mk146
-rw-r--r--science/ncs/files/patch-src_base_1_gradco.F11
-rw-r--r--science/ncs/files/pkg-message.in15
9 files changed, 383 insertions, 0 deletions
diff --git a/science/ncs/files/patch-bin_Makefile b/science/ncs/files/patch-bin_Makefile
new file mode 100644
index 000000000000..9ad60fd75ca6
--- /dev/null
+++ b/science/ncs/files/patch-bin_Makefile
@@ -0,0 +1,64 @@
+--- bin/Makefile.orig Thu Mar 1 12:23:39 2007
++++ bin/Makefile Sun Jun 17 10:48:01 2007
+@@ -186,7 +186,6 @@
+
+ link:
+ @make privtitre
+- @make privconfig
+ @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 ;\
+ fi ;\
+ fi ;\
+@@ -914,7 +913,7 @@
+ echo "$(BO) Il faut être dans le repertoire général $(DIR_CS)$(NO)" ;\
+ echo ;\
+ tput init ;\
+- exit -1 ;\
++ exit 1 ;\
+ fi ;\
+ if [ ! "$${modtrav}" = "$${module}" ] ;\
+ then echo ;\
+@@ -926,7 +925,7 @@
+ fi ;\
+ echo ;\
+ tput init ;\
+- exit -1 ;\
++ exit 1 ;\
+ fi ;\
+ if [ ! "$${opttrav}" = "$(MYOPT)" ] ;\
+ then echo ;\
+@@ -940,7 +939,7 @@
+ fi ;\
+ echo ;\
+ tput init ;\
+- exit -1 ;\
++ exit 1 ;\
+ fi ;\
+ if [ "$${modtrav}" = "BASE" ] ;\
+ then INC_CS="toto" ;\
diff --git a/science/ncs/files/patch-bin_compiler_version b/science/ncs/files/patch-bin_compiler_version
new file mode 100644
index 000000000000..101492b8fa40
--- /dev/null
+++ b/science/ncs/files/patch-bin_compiler_version
@@ -0,0 +1,24 @@
+--- ./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}
diff --git a/science/ncs/files/patch-bin_cree_sat b/science/ncs/files/patch-bin_cree_sat
new file mode 100644
index 000000000000..80c11a68fc8d
--- /dev/null
+++ b/science/ncs/files/patch-bin_cree_sat
@@ -0,0 +1,37 @@
+--- 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`
diff --git a/science/ncs/files/patch-bin_cs_profile b/science/ncs/files/patch-bin_cs_profile
new file mode 100644
index 000000000000..aae5092eeda6
--- /dev/null
+++ b/science/ncs/files/patch-bin_cs_profile
@@ -0,0 +1,61 @@
+--- 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 @@
+
+ if [ "$NOM_ARCH" = "OSF1" -o "$NOM_ARCH" = "Linux_CCRT" ] ; 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
+ 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
+- 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.f
++ ECS_HOME=${PATHCS}/Enveloppe/ecs-1.3.c
++ CSGUI_HOME=${PATHCS}/Interface/ics-1.1.l
++ SYRCS_HOME=${PATHCS}/opt/syr_cs-2.0.1
++ fi
+ #
+ 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
+@@ -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
+ 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
diff --git a/science/ncs/files/patch-bin_gracehst b/science/ncs/files/patch-bin_gracehst
new file mode 100644
index 000000000000..40d165d4d611
--- /dev/null
+++ b/science/ncs/files/patch-bin_gracehst
@@ -0,0 +1,17 @@
+--- bin/gracehst.orig Thu Mar 1 12:23:39 2007
++++ bin/gracehst Mon May 7 14:16:22 2007
+@@ -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_grp b/science/ncs/files/patch-bin_grp
new file mode 100644
index 000000000000..85371f4f3dc0
--- /dev/null
+++ b/science/ncs/files/patch-bin_grp
@@ -0,0 +1,8 @@
+--- 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
diff --git a/science/ncs/files/patch-bin_macros_FreeBSD.mk b/science/ncs/files/patch-bin_macros_FreeBSD.mk
new file mode 100644
index 000000000000..e193b979e480
--- /dev/null
+++ b/science/ncs/files/patch-bin_macros_FreeBSD.mk
@@ -0,0 +1,146 @@
+--- bin/macros_FreeBSD.mk.orig Thu Mar 1 12:23:39 2007
++++ bin/macros_FreeBSD.mk Tue May 8 15:06:34 2007
+@@ -1,3 +1,4 @@
++# $FreeBSD$
+ #============================================================================
+ #
+ # Code_Saturne version 1.3
+@@ -29,13 +30,13 @@
+ #
+ #============================================================================
+ #
+-# Macros du Makefile Code_Saturne pour Linux
+-############################################
++# Macros du Makefile Code_Saturne pour FreeBSD
++##############################################
+ #
+ # Macro pour BFT
+ #---------------
+
+-BFT_HOME =/home/saturne/opt/bft-1.0.3/arch/Linux
++BFT_HOME =${LOCALBASE}
+
+ BFT_INC =-I$(BFT_HOME)/include
+ BFT_LDFLAGS =-L$(BFT_HOME)/lib -lbft
+@@ -43,7 +44,7 @@
+ # Macro pour FVM
+ #---------------
+
+-FVM_HOME =/home/saturne/opt/fvm-0.6.3/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
+
+ # Pour Open MPI sur saturne
+-MPI_HOME =/home/saturne/opt/openmpi-1.1.1/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_INC =-I$(MPI_HOME)/include
++MPI_LIB =-L$(MPI_HOME)/lib ${MPI_LIBS} $(PTHREAD_LIBS)
+
+
+ # Macro pour Sockets
+@@ -76,10 +76,10 @@
+ # Option XML
+ XML =1
+
+-XML_HOME = /home/saturne/opt/libxml2-2.6.19
++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
+@@ -100,36 +100,36 @@
+ # Compilateur C natif
+ #--------------------
+
+-CCOMP = /home/saturne/opt/gcc-4.1.1/arch/Linux/bin/gcc
++CCOMP = $(CC)
+
+ CCOMPFLAGSDEF = -std=c99 -funsigned-char -pedantic -W -Wall -Wshadow \
+ -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings \
+ -Wstrict-prototypes -Wmissing-prototypes \
+- -Wmissing-declarations -Wnested-externs -Wno-uninitialized
++ -Wmissing-declarations -Wnested-externs -Wno-uninitialized
+
+-CCOMPFLAGS = $(CCOMPFLAGSDEF) -O -Wno-unused
+-CCOMPFLAGSOPTPART1 = $(CCOMPFLAGSDEF) -O
+-CCOMPFLAGSOPTPART2 = $(CCOMPFLAGSDEF) -O
+-CCOMPFLAGSOPTPART3 = $(CCOMPFLAGSDEF) -O
+-CCOMPFLAGSLO = $(CCOMPFLAGSDEF) -O0
+-CCOMPFLAGSDBG = $(CCOMPFLAGSDEF) -g3
++CCOMPFLAGS = $(CCOMPFLAGSDEF) $(CFLAGS) -Wno-unused
++CCOMPFLAGSOPTPART1 = $(CCOMPFLAGSDEF) $(CFLAGS)
++CCOMPFLAGSOPTPART2 = $(CCOMPFLAGSDEF) $(CFLAGS)
++CCOMPFLAGSOPTPART3 = $(CCOMPFLAGSDEF) $(CFLAGS)
++CCOMPFLAGSLO = $(CCOMPFLAGSDEF) -O0
++CCOMPFLAGSDBG = $(CCOMPFLAGSDEF) -g
+ CCOMPFLAGSPROF = -pg
+-CCOMPFLAGSVERS = -v
++CCOMPFLAGSVERS = -v
+
+
+ # Compilateur FORTRAN
+ #--------------------
+ # Profiling gprof : -pg -a
+
+-FTNCOMP = /home/saturne/opt/gcc-4.1.1/arch/Linux/bin/gfortran
++FTNCOMP = $(FC)
+
+ FTNCOMPFLAGSDEF = -I.
+
+-FTNCOMPFLAGS = $(FTNCOMPFLAGSDEF) -O1
+-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)
+ FTNCOMPFLAGSDBG = $(FTNCOMPFLAGSDEF) -g
+ FTNCOMPFLAGSPROF = -pg
+ FTNCOMPFLAGSVERS = -v
+@@ -140,13 +140,13 @@
+
+ # Linker
+
+-LDEDL = /home/saturne/opt/gcc-4.1.1/arch/Linux/bin/gfortran
+-LDEDLFLAGS = -O
+-LDEDLFLAGSLO = -O0
++LDEDL = $(FC)
++LDEDLFLAGS = $(LDFLAGS)
++LDEDLFLAGSLO = $(LDFLAGS)
+ 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,
+
+
+ # Positionnement des variables pour le pre-processeur
+@@ -162,7 +162,7 @@
+
+ # Librairies de base toujours prises en compte
+
+-LIBBASIC = $(BFT_LDFLAGS) $(FVM_LDFLAGS) -lm -lpthread
++LIBBASIC = $(BFT_LDFLAGS) $(FVM_LDFLAGS) -lm $(PTHREAD_LIBS)
+
+ # Librairies en mode sans option
+
+@@ -178,7 +178,7 @@
+
+ # Librairie en mode ElectricFence (malloc debugger)
+
+-LIBEF =-L/home/saturne/opt/efence-2.1.14/arch/Linux/lib -lefence
++LIBEF =-L${LOCALBASE}/lib -lefence
+
+ # Liste eventuelle des fichiers a compiler avec des options particulieres
+ #------------------------------------------------------------------------
diff --git a/science/ncs/files/patch-src_base_1_gradco.F b/science/ncs/files/patch-src_base_1_gradco.F
new file mode 100644
index 000000000000..046e3e9aa875
--- /dev/null
+++ b/science/ncs/files/patch-src_base_1_gradco.F
@@ -0,0 +1,11 @@
+--- 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/files/pkg-message.in b/science/ncs/files/pkg-message.in
new file mode 100644
index 000000000000..5de7a18d8b27
--- /dev/null
+++ b/science/ncs/files/pkg-message.in
@@ -0,0 +1,15 @@
+===============================================================================
+The current version of Code_Saturne is located in the directory
+%%PREFIX%%/Saturne/Noyau/ncs
+
+In order to use Code Saturne, every user must add the following line in their
+file ".profile":
+
+. %%PREFIX%%/Saturne/Noyau/ncs/bin/cs_profile
+
+For more information refer to the Code_Saturne documentation, available through
+the "info_cs" command.
+
+The Graphical User Interface must be installed separately; it is available as
+a FreeBSD port: science/ics.
+===============================================================================
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-01 08:51:51 +0000