From 4c9720cafec617aec04edebacc4de04a08bc1b6c Mon Sep 17 00:00:00 2001 From: caremoli Date: Mon, 7 Mar 2011 09:30:09 +0000 Subject: [PATCH] CCAR upgrade to Aster V10.3 --- Examples/ast1/myaster/Makefile | 16 +++++++---- Examples/ast2/exeaster | 14 ++++++---- Examples/ast2/myaster/config.txt | 46 ++++++++++++++++---------------- Examples/ast2/myaster/make_exec | 2 +- Examples/context.py | 4 +-- Examples/cppgui1/Makefile | 21 +++++++++++++++ Examples/hxx1/Makefile | 21 +++++++++++++++ Examples/hxx1/test_compohxx.py | 2 +- Examples/makefile.inc | 4 +-- Examples/pygui1/Makefile | 21 +++++++++++++++ 10 files changed, 112 insertions(+), 39 deletions(-) create mode 100644 Examples/cppgui1/Makefile create mode 100644 Examples/hxx1/Makefile create mode 100644 Examples/pygui1/Makefile diff --git a/Examples/ast1/myaster/Makefile b/Examples/ast1/myaster/Makefile index 13292fc..35b3a17 100644 --- a/Examples/ast1/myaster/Makefile +++ b/Examples/ast1/myaster/Makefile @@ -19,13 +19,19 @@ include ../../makefile.inc +MED2HOME=/local/cchris/pkg/med235/install + ASTER_INSTALL=$(ASTER_ROOT)/$(ASTER_VERSION) ASTER_PUB=$(ASTER_ROOT)/public ASTER_OUTILS=$(ASTER_ROOT)/outils +MUMPS=-L$(ASTER_PUB)/mumps-4.9.2/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord -lmpiseq +METIS=-L$(ASTER_PUB)/metis-4.0/lib -lmetis + + ASTER_LIBS = -L$(ASTER_INSTALL)/lib -laster \ - -L$(ASTER_PUB)/scotch_4.0/bin -lscotch -lscotcherr \ - -L/local/chris/pkg/med23/install/lib -lmed \ + $(MUMPS) $(METIS) \ + -L$(MED2HOME)/lib -lmed \ -lferm -llapack -lhdf5 KERNEL_INCLUDES=-I$(KERNEL_ROOT_DIR)/include/salome @@ -34,7 +40,7 @@ KERNEL_LIBS= -L$(KERNEL_ROOT_DIR)/lib/salome -lCalciumC -lSalomeDSCSuperv -lSalo FC=gfortran LD=gfortran -FFLAGS= +FFLAGS=-fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 CC=gcc SOURCES= src/op0078.f src/op0189.f src/op0181.f OBJETS=op0078.o op0189.o op0181.o @@ -50,7 +56,7 @@ cata: commande/cata.py cp -rf commande/cata.py* bibpyt/Cata commande/cata.py:$(CATAPY) - ./make_cata $(ASTER_ROOT)/ASTK/ASTK_SERV/bin/as_run $(ASTER_VERSION) + ./make_cata $(ASTER_ROOT)/bin/as_run $(ASTER_VERSION) astermodule:astermodule.so pyth cp -rf astermodule.so bibpyt @@ -62,6 +68,6 @@ op0189.o:src/op0189.f op0181.o:src/op0181.f $(FC) -c -fpic $(FFLAGS) $(KERNEL_INCLUDES) src/op0181.f astermodule.so: $(OBJETS) - $(LD) -shared -o $@ $(OBJETS) $(KERNEL_LIBS) $(ASTER_LIBS) + $(LD) -shared $(FFLAGS) -o $@ $(OBJETS) $(KERNEL_LIBS) $(ASTER_LIBS) clean: rm -rf *.o *.so bibpyt commande/cata.py* make-cmd commande diff --git a/Examples/ast2/exeaster b/Examples/ast2/exeaster index ed02ec7..c9842c6 100755 --- a/Examples/ast2/exeaster +++ b/Examples/ast2/exeaster @@ -18,12 +18,14 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +ROOT=/local/cchris/Salome/YACSGEN/V6/YACSGEN/Examples/ast2 + cat > temp.comm << END END cat > temp.export << END P actions make_etude -P version STA10.1 +P version STA10.3 P nomjob salome P ncpus 1 A memjeveux 4.000000 @@ -38,14 +40,16 @@ P mode batch P soumbtc oui P consbtc oui -F conf /local/cchris/Salome/YACSGEN/V5/YACSGEN/Examples/ast2/install/share/salome/resources/astmod/caster_config.txt D 0 +F conf $ROOT/install/share/salome/resources/astmod/caster_config.txt D 0 F comm $PWD/temp.comm D 1 -F exec /local/cchris/Salome/YACSGEN/V5/YACSGEN/Examples/ast2/myaster/aster.exe D 0 -R cmde /local/cchris/Salome/YACSGEN/V5/YACSGEN/Examples/ast2/myaster/commande D 0 +F exec $ROOT/myaster/aster.exe D 0 +R cmde $ROOT/myaster/commande D 0 F mess $PWD/messages R 6 F resu $PWD/resu R 8 F erre $PWD/erre R 9 END -/local/cchris/Aster/V10.1/aster/ASTK/ASTK_SERV/bin/as_run temp.export +/local/cchris/Aster/V10.3/aster/bin/as_run temp.export +sleep 5 +echo "Fin du script" diff --git a/Examples/ast2/myaster/config.txt b/Examples/ast2/myaster/config.txt index 27aac3a..7711057 100644 --- a/Examples/ast2/myaster/config.txt +++ b/Examples/ast2/myaster/config.txt @@ -55,45 +55,45 @@ # ID_PERF | id | - | claui2c6 # -ENV_SH | env | - | /local/cchris/Aster/V10.1/aster/STA10.1/profile.sh +ENV_SH | env | - | /local/cchris/Aster/V10.3/aster/STA10.3/profile.sh # LIB | ar | ? | /usr/bin/ar -rv # -BIBL | python | 2.4 | -L/usr/lib -L/usr/lib/python2.5/config -lpython2.5 -BIBL | med | 2.3.5 | -L/local/cchris/Aster/V10.1/aster/public/med-2.3.6/lib -lmed -BIBL | hdf5 | 1.6.5 | -L/usr/lib -lhdf5 +BIBL | python | 2.4 | -L/local/cchris/pkg/python2.7/install/lib -L/local/cchris/pkg/python2.7/install/lib/python2.7/config -lpython2.7 +BIBL | med | 2.3.5 | -L/local/cchris/Aster/V10.3/aster/public/med-2.3.6/lib -lmed +BIBL | hdf5 | 1.6.5 | -L/local/cchris/Aster/V10.3/aster/public/hdf5-1.6.9/lib -lhdf5 BIBL | zmat | 8.4 | -BIBL | mumps | ? | /local/cchris/Aster/V10.1/aster/public/mumps-4.8.4/lib/libdmumps.a /local/cchris/Aster/V10.1/aster/public/mumps-4.8.4/lib/libzmumps.a /local/cchris/Aster/V10.1/aster/public/mumps-4.8.4/lib/libsmumps.a /local/cchris/Aster/V10.1/aster/public/mumps-4.8.4/lib/libcmumps.a /local/cchris/Aster/V10.1/aster/public/mumps-4.8.4/lib/libmumps_common.a /local/cchris/Aster/V10.1/aster/public/mumps-4.8.4/lib/libpord.a /local/cchris/Aster/V10.1/aster/public/mumps-4.8.4/lib/libmpiseq.a -L/local/cchris/Aster/V10.1/aster/public/metis-4.0/lib -lmetis +BIBL | mumps | ? | /local/cchris/Aster/V10.3/aster/public/mumps-4.9.2/lib/libdmumps.a /local/cchris/Aster/V10.3/aster/public/mumps-4.9.2/lib/libzmumps.a /local/cchris/Aster/V10.3/aster/public/mumps-4.9.2/lib/libsmumps.a /local/cchris/Aster/V10.3/aster/public/mumps-4.9.2/lib/libcmumps.a /local/cchris/Aster/V10.3/aster/public/mumps-4.9.2/lib/libmumps_common.a /local/cchris/Aster/V10.3/aster/public/mumps-4.9.2/lib/libpord.a /local/cchris/Aster/V10.3/aster/public/mumps-4.9.2/lib/libmpiseq.a -L/local/cchris/Aster/V10.3/aster/public/metis-4.0/lib -lmetis BIBL | scotch | 4.0 | BIBL | math | ? | -L/usr/lib -llapack -L/usr/lib -lblas -L/usr/lib/gcc/x86_64-linux-gnu/4.3 -lgfortran BIBL | mpi | 2 | BIBL | c++ | ? | -L/usr/lib/gcc/x86_64-linux-gnu/4.3 -lstdc++ -lsupc++ -BIBL | sys | ? | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lpthread -lutil -lm -lz -BIBL | salome | ? | -L/local/cchris/Salome/Install/KERNEL_V5/lib/salome -lCalciumC -lSalomeDSCSuperv -lSalomeDSCContainer -lSalomeDatastream -lSalomeDSCSupervBasic -Wl,--rpath -Wl,/local/cchris/Salome/Install/KERNEL_V5/lib/salome +BIBL | sys | ? | -Wl,--allow-multiple-definition -Wl,--export-dynamic -ldl -lutil -lm -lpthread -lz +BIBL | salome | ? | -L/local/cchris/Salome/Install/KERNEL_V6/lib/salome -lCalciumC -lSalomeDSCSuperv -lSalomeDSCContainer -lSalomeDatastream -lSalomeDSCSupervBasic -Wl,--rpath -Wl,/local/cchris/Salome/Install/KERNEL_V6/lib/salome # -DEFS | defined | ? | LINUX64 _HAVE_MUMPS +DEFS | defined | ? | LINUX64 _HAVE_MUMPS _DISABLE_SCOTCH # -NOBUILD | option | ? | bibfor/from_c bibc/scotch +NOBUILD | option | ? | # -PYTHON | python | 2.4 | /usr/bin/python +PYTHON | python | 2.4 | /local/cchris/Salome/envSalome6/spython/bin/python # LINK | link | ? | /usr/bin/gfortran -OPTL | link | ? | -fopenmp +OPTL | link | ? | -fopenmp # CC | cc | ? | /usr/bin/gcc -OPTC_D | cc | ? | -c -g -fno-stack-protector -fPIC -OPTC_O | cc | ? | -c -O2 -fno-stack-protector -fPIC -INCL | include | ? | -I/local/cchris/Aster/V10.1/aster/STA10.1/bibc/include -I/usr/include/python2.5 +OPTC_D | cc | ? | -c -g -fno-stack-protector -fPIC -fopenmp +OPTC_O | cc | ? | -c -O2 -fno-stack-protector -fPIC -fopenmp +INCL | include | ? | -I/local/cchris/Aster/V10.3/aster/STA10.3/bibc/include -I/local/cchris/pkg/python2.7/install/include/python2.7 -I/local/cchris/Salome/envSalome6/spython/lib/python2.7/site-packages/numpy/core/include -I/local/cchris/Aster/V10.3/aster/public/hdf5-1.6.9/include # F77 | f77 | ? | /usr/bin/gfortran -OPTF_D | f77 | ? | -c -g -fopenmp -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -OPTF_O | f77 | ? | -c -O2 -fopenmp -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -INCLF | include | ? | -I/local/cchris/Salome/Install/KERNEL_V5/include/salome +OPTF_D | f77 | ? | -c -g -fPIC -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 +OPTF_O | f77 | ? | -c -O2 -fPIC -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 +INCLF | include | ? | -I/local/cchris/Salome/Install/KERNEL_V6/include/salome # F90 | f90 | ? | /usr/bin/gfortran -OPTF90_D | f90 | ? | -c -g -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -OPTF90_O | f90 | ? | -c -O2 -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -INCLF90 | include | ? | -I/local/cchris/Aster/V10.1/aster/STA10.1/bibf90/include_mumps-4.8.4 +OPTF90_D | f90 | ? | -c -g -ffixed-line-length-0 -x f77-cpp-input -fPIC -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 +OPTF90_O | f90 | ? | -c -O2 -ffixed-line-length-0 -x f77-cpp-input -fPIC -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 +INCLF90 | include | ? | -I/local/cchris/Aster/V10.3/aster/STA10.3/bibf90/include_mumps-4.9.2 # G77_AGLA | g77 | ? | unused # @@ -130,9 +130,9 @@ ARGEXE | exec | 03-02 | -eficas_path ./Python MAKE_SURCH_OFFI | build | 11-04 | Lecture_Cata_Ele/make_surch_offi.py MAKE_CAPY_OFFI | build | 11-04 | Lecture_Cata_Ele/make_capy_offi.py # -REPOUT | exec | 11-04 | /local/cchris/Aster/V10.1/aster/outils -REPMAT | exec | 02-05 | /local/cchris/Aster/V10.1/aster/STA10.1/materiau -REPDEX | exec | 02-05 | /local/cchris/Aster/V10.1/aster/STA10.1/datg +REPOUT | exec | 11-04 | /local/cchris/Aster/V10.3/aster/outils +REPMAT | exec | 02-05 | /local/cchris/Aster/V10.3/aster/STA10.3/materiau +REPDEX | exec | 02-05 | /local/cchris/Aster/V10.3/aster/STA10.3/datg # SUPERV | exec | 03-02 | Accas SUPERV | exec | 03-02 | Build diff --git a/Examples/ast2/myaster/make_exec b/Examples/ast2/myaster/make_exec index 45117e9..e6793d7 100755 --- a/Examples/ast2/myaster/make_exec +++ b/Examples/ast2/myaster/make_exec @@ -42,4 +42,4 @@ R capy ${PWD}/catalo D 0 R cmde ${PWD}/commande DR 0 END -$1/ASTK/ASTK_SERV/bin/as_run make-exe +$1/bin/as_run make-exe diff --git a/Examples/context.py b/Examples/context.py index 3b85cbd..996e8c3 100644 --- a/Examples/context.py +++ b/Examples/context.py @@ -37,5 +37,5 @@ context={'update':1, } -aster_home=os.path.expanduser("~/Aster/V10.1/aster") -aster_version="STA10.1" +aster_home=os.path.expanduser("~/Aster/V10.3/aster") +aster_version="STA10.3" diff --git a/Examples/cppgui1/Makefile b/Examples/cppgui1/Makefile new file mode 100644 index 0000000..747f989 --- /dev/null +++ b/Examples/cppgui1/Makefile @@ -0,0 +1,21 @@ +# Copyright (C) 2009-2010 EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +clean: + rm -rf *.o *.so cppcompos_SRC cppcompos_SRC.bak appli appli.bak install install.bak traceExec_proc diff --git a/Examples/hxx1/Makefile b/Examples/hxx1/Makefile new file mode 100644 index 0000000..2867127 --- /dev/null +++ b/Examples/hxx1/Makefile @@ -0,0 +1,21 @@ +# Copyright (C) 2009-2010 EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +clean: + rm -rf *.o *.so hxxcompos_SRC hxxcompos_SRC.bak appli appli.bak install install.bak traceExec_proc COMPONENTCPP_INSTALL COMPONENTCPP_SRC COMPONENTCPP_BUILD parse_result parse_type_result diff --git a/Examples/hxx1/test_compohxx.py b/Examples/hxx1/test_compohxx.py index bd8fbe9..c5f932f 100644 --- a/Examples/hxx1/test_compohxx.py +++ b/Examples/hxx1/test_compohxx.py @@ -11,7 +11,7 @@ import SALOME import salome salome.salome_init() -print "Test du composant CALCUL généré généré par hxx2salome" +print "Test du composant CALCUL genere par hxx2salome" import hxxcompos_ORB myCalc = salome.lcc.FindOrLoadComponent("FactoryServer", "CALCUL") print "10+15 = ",myCalc.add(10,15) diff --git a/Examples/makefile.inc b/Examples/makefile.inc index d3e354b..e3e0edc 100644 --- a/Examples/makefile.inc +++ b/Examples/makefile.inc @@ -19,7 +19,7 @@ KERNEL_ROOT_DIR=$(HOME)/Salome/Install/KERNEL_V6 -ASTER_ROOT=$(HOME)/Aster/V10.1/aster -ASTER_VERSION=STA10.1 +ASTER_ROOT=$(HOME)/Aster/V10.3/aster +ASTER_VERSION=STA10.3 FC=gfortran diff --git a/Examples/pygui1/Makefile b/Examples/pygui1/Makefile new file mode 100644 index 0000000..fddce0a --- /dev/null +++ b/Examples/pygui1/Makefile @@ -0,0 +1,21 @@ +# Copyright (C) 2009-2010 EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +clean: + rm -rf *.pyc pycompos_SRC pycompos_SRC.bak appli appli.bak install install.bak traceExec_proc -- 2.39.2