CCAR: update examples

diff --git a/Examples/ast1/components.py b/Examples/ast1/components.py
index 2243a4b9c8f6574be98353166575136f9350a18d..fe95ac684f4e032b82287c06d770019aa2edbeac 100644 (file)
--- a/Examples/ast1/components.py
+++ b/Examples/ast1/components.py
@@ -21,10 +21,10 @@
  Example with one Code_Aster component and one fortran component
 """
 import os
-from module_generator import Generator,Module,ASTERComponent,Service,F77Component
 
 #import context from ..
 execfile("../context.py")
+from module_generator import Generator,Module,ASTERComponent,Service,F77Component
 
 aster_root=os.path.join(aster_home,aster_version)
 

diff --git a/Examples/ast2/components.py b/Examples/ast2/components.py
index 3a7570337a89986de739dc69eda5d122337d2f86..97148a6d4c340822bdc7234107cf6492d0de0c28 100644 (file)
--- a/Examples/ast2/components.py
+++ b/Examples/ast2/components.py
@@ -21,10 +21,10 @@
  Example with one Code_Aster component and one fortran component
 """
 import os
-from module_generator import Generator,Module,ASTERComponent,Service,F77Component
 
 #import context from ..
 execfile("../context.py")
+from module_generator import Generator,Module,ASTERComponent,Service,F77Component
 
 aster_root=os.path.join(aster_home,aster_version)
 

diff --git a/Examples/calcium1/code1.f b/Examples/calcium1/code1.f
index d6b7546af85cd18e8325ab1595faadf42fbf4e9e..bc3cc833add089fd8d4aadf227eb7e00ee50d8be 100644 (file)
--- a/Examples/calcium1/code1.f
+++ b/Examples/calcium1/code1.f
@@ -263,6 +263,8 @@ C  read
        write(6,*)'info=',info
        call flush(6)
 
+       CALL cpfin(compo,CP_ARRET,info)
+
        c=a+b
        return 
        end

diff --git a/Examples/calcium1/components.py b/Examples/calcium1/components.py
index 85e08c0e5d8ed0f48f6d9b6e8445054700858f9c..b2bab0469fc3b804c0753c7362b7325d52aab274 100644 (file)
--- a/Examples/calcium1/components.py
+++ b/Examples/calcium1/components.py
@@ -18,10 +18,9 @@
 #
 
 import os
-from module_generator import Generator,Module,Service,PYComponent,CPPComponent,F77Component
-
 #import context from ..
 execfile("../context.py")
+from module_generator import Generator,Module,Service,PYComponent,CPPComponent,F77Component
 
 # C++ component
 
@@ -46,6 +45,10 @@ rsval[0]=mystring1;
 rsval[1]=mystring2;
 rsval[2]=mystring3;
 
+char instance_name[72];
+info = cp_cd(component,instance_name);
+std::cerr << "instance_name: " << instance_name << std::endl;
+
 val[0]=3.2;
 val[1]=5.2;
 val[2]=9.8;
@@ -198,6 +201,8 @@ std::cerr << "info: " << info << std::endl;
 info=cp_effi(component,(char*)"aa",3);
 std::cerr << "info: " << info << std::endl;
 
+cp_fin(component,CP_ARRET);
+
 c=2*rval[0];
 std::cerr << "c: " << c << std::endl;
 """
@@ -239,6 +244,7 @@ body="""
 info,name= calcium.cp_cd(component)
 print "name=",name
 print "info=",info
+
 dep=calcium.CP_ITERATION
 
 #double

diff --git a/Examples/calcium2/components.py b/Examples/calcium2/components.py
index e5710474f3f2f54c1924c3b87141bd49ffa22bac..8f261609b0a4557300413d609e663b8cea55c06b 100644 (file)
--- a/Examples/calcium2/components.py
+++ b/Examples/calcium2/components.py
@@ -18,10 +18,10 @@
 #
 
 import os
-from module_generator import Generator,Module,Service,PYComponent,CPPComponent,F77Component
 
 #import context from ..
 execfile("../context.py")
+from module_generator import Generator,Module,Service,PYComponent,CPPComponent,F77Component
 
 # C++ component
 

diff --git a/Examples/context.py b/Examples/context.py
index 0d6ab8e92e3a8eb4a61ca1d803075f4c41b876ad..35f4d868abcb51aa0a16488815b555b51e07f826 100644 (file)
--- a/Examples/context.py
+++ b/Examples/context.py
@@ -18,15 +18,15 @@
 #
 
 import os,sys
-#sys.path.insert(0,"../..")
+sys.path.insert(0,"../..")
 
-KERNEL_ROOT_DIR=os.getenv("KERNEL_ROOT_DIR","/local/cchris/Salome/Install/KERNEL_V5")
-GUI_ROOT_DIR=os.getenv("GUI_ROOT_DIR","/local/cchris/Salome/Install/GUI_V5")
-YACS_ROOT_DIR=os.getenv("YACS_ROOT_DIR","/local/cchris/Salome/Install/YACS_V5")
+KERNEL_ROOT_DIR=os.getenv("KERNEL_ROOT_DIR","/local/cchris/Salome/Install/KERNEL_V6")
+GUI_ROOT_DIR=os.getenv("GUI_ROOT_DIR","/local/cchris/Salome/Install/GUI_V6")
+YACS_ROOT_DIR=os.getenv("YACS_ROOT_DIR","/local/cchris/Salome/Install/YACS_V6")
 
 context={'update':1,
          "makeflags":"",
-         "prerequisites":"/local/cchris/.packages.d/envSalome51main",
+         "prerequisites":"/local/cchris/.packages.d/envSalome6main",
          "kernel":KERNEL_ROOT_DIR,
          "gui":GUI_ROOT_DIR,
         }

diff --git a/Examples/cpp1/components.py b/Examples/cpp1/components.py
index 169c3768fa47c973cb18b0af4d9b6c913950e3a1..0b6a1fddff72748df5076eaaf932d2d8decd0670 100644 (file)
--- a/Examples/cpp1/components.py
+++ b/Examples/cpp1/components.py
@@ -18,10 +18,10 @@
 #
 
 import os
-from module_generator import Generator,Module,Service,CPPComponent
 
 #import context from ..
 execfile("../context.py")
+from module_generator import Generator,Module,Service,CPPComponent
 
 cwd=os.getcwd()
 

diff --git a/Examples/cpp2/components.py b/Examples/cpp2/components.py
index a2eab5070046944112d4abb046875342c499db39..9ebe8dbfc4e66492df08dd8d3c925537f25b27ae 100644 (file)
--- a/Examples/cpp2/components.py
+++ b/Examples/cpp2/components.py
@@ -18,10 +18,10 @@
 #
 
 import os
-from module_generator import Generator,Module,Service,CPPComponent
 
 #import context from ..
 execfile("../context.py")
+from module_generator import Generator,Module,Service,CPPComponent
 
 cwd=os.getcwd()
 

diff --git a/Examples/fort1/components.py b/Examples/fort1/components.py
index 5948ed302177996b9d734ba8338b4bb8d611ca40..9e0912fbf1e77f0036628659ec03210a38bccad5 100644 (file)
--- a/Examples/fort1/components.py
+++ b/Examples/fort1/components.py
@@ -18,10 +18,10 @@
 #
 
 import os
-from module_generator import Generator,Module,Service,F77Component
 
 #import context from ..
 execfile("../context.py")
+from module_generator import Generator,Module,Service,F77Component
 
 cwd=os.getcwd()
 

diff --git a/Examples/fort2/components.py b/Examples/fort2/components.py
index c33fa5db8a7ddd3f93d05ed8e6108821835b8e0a..ae24e072d7b3ec03a7ab9ef58c301727669aba17 100644 (file)
--- a/Examples/fort2/components.py
+++ b/Examples/fort2/components.py
@@ -18,10 +18,10 @@
 #
 
 import os
-from module_generator import Generator,Module,Service,F77Component
 
 #import context from ..
 execfile("../context.py")
+from module_generator import Generator,Module,Service,F77Component
 
 cwd=os.getcwd()
 

diff --git a/Examples/makefile.inc b/Examples/makefile.inc
index 7b69741b0f1b4738852c4e6aba4c4624bf6d8d83..e659cb24bad25a9d78d1e1ebb43941635b27cae1 100644 (file)
--- a/Examples/makefile.inc
+++ b/Examples/makefile.inc
@@ -17,7 +17,7 @@
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-KERNEL_ROOT_DIR=/local/cchris/Salome/Install/KERNEL_V5
+KERNEL_ROOT_DIR=/local/cchris/Salome/Install/KERNEL_V6
 
 ASTER_ROOT=/local/cchris/Aster/V10.1/aster
 ASTER_VERSION=STA10.1

diff --git a/Examples/paco1/components.py b/Examples/paco1/components.py
index 430dba3ce7bc3d22006bc0410e03cd06ef7618b1..fb0721d12a59047e4c4b67a7da2d516255a1f5a0 100644 (file)
--- a/Examples/paco1/components.py
+++ b/Examples/paco1/components.py
@@ -18,10 +18,10 @@
 #
 
 import os
-from module_generator import Generator,Module,Service,PACOComponent
 
 #import context from ..
 execfile("../pacocontext.py")
+from module_generator import Generator,Module,Service,PACOComponent
 
 cwd=os.getcwd()
 

diff --git a/Examples/paco2/components.py b/Examples/paco2/components.py
index f152d96259fb27a3e363c75e46e6f7628b383f50..e2a9ef3f06d0e7cdae9e5f494bfe6b664ea4dea6 100644 (file)
--- a/Examples/paco2/components.py
+++ b/Examples/paco2/components.py
@@ -18,10 +18,10 @@
 #
 
 import os
-from module_generator import Generator,Module,Service,PACOComponent
 
 #import context from ..
 execfile("../pacocontext.py")
+from module_generator import Generator,Module,Service,PACOComponent
 
 cwd=os.getcwd()
 

diff --git a/Examples/paco3/components.py b/Examples/paco3/components.py
index 5ec5ec15f355e99bdf1ce5c47bfcaadb7db3e328..8aea2d0626f4ded287b38def0c393ffe7c71914b 100644 (file)
--- a/Examples/paco3/components.py
+++ b/Examples/paco3/components.py
@@ -19,10 +19,10 @@
 #
 
 import os
-from module_generator import Generator,Module,Service,PACOComponent
 
 #import context from ..
 execfile("../pacocontext.py")
+from module_generator import Generator,Module,Service,PACOComponent
 
 cwd=os.getcwd()
 

diff --git a/Examples/pyth2/components.py b/Examples/pyth2/components.py
index bc8ef0326eb13c3a780f0c253bab366842ec67de..250b30b2de71d86bcdb624181b29edd212860827 100644 (file)
--- a/Examples/pyth2/components.py
+++ b/Examples/pyth2/components.py
@@ -18,10 +18,10 @@
 #
 
 import os
-from module_generator import Generator,Module,Service,PYComponent
 
 #import context from ..
 execfile("../context.py")
+from module_generator import Generator,Module,Service,PYComponent
 
 cwd=os.getcwd()