Updated copyright comment

[samples/pycalculator.git] / src / PYCALCULATOR / PYCALCULATOR_TEST.py

diff --git a/src/PYCALCULATOR/PYCALCULATOR_TEST.py b/src/PYCALCULATOR/PYCALCULATOR_TEST.py
old mode 100755 (executable)
new mode 100644 (file)
index 51482a7..f07ccfd
--- a/src/PYCALCULATOR/PYCALCULATOR_TEST.py
+++ b/src/PYCALCULATOR/PYCALCULATOR_TEST.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -32,18 +32,19 @@ salome.salome_init()
 
 import PYCALCULATOR_ORB
 
+from medcoupling import *
 from MEDCouplingCorba import *
-from MEDCoupling import *
 from MEDLoader import *
+from MEDCouplingClient import *
 
 pc = salome.lcc.FindOrLoadComponent('FactoryServer','PYCALCULATOR')
 
-medFile   = os.path.join(os.getenv("MED_ROOT_DIR"), "share/salome/resources/med/pointe.med")
+medFile   = os.path.join(os.getenv("DATA_DIR"), "MedFiles", "pointe.med")
 meshName  = "maa1"
 fieldName = "fieldcelldoublevector"
-print medFile, meshName, fieldName
+print(medFile, meshName, fieldName)
 
-f = MEDLoader.ReadFieldCell(medFile, meshName, 0, fieldName, -1, -1)
+f = ReadFieldCell(medFile, meshName, 0, fieldName, -1, -1)
 forig = MEDCouplingFieldDoubleServant._this(f)
 
 fcopy = pc.Clone(forig)
@@ -51,3 +52,17 @@ f1    = pc.Add(forig, fcopy)
 f2    = pc.Mul(forig, fcopy)
 f3    = pc.AddConstant(forig, 3.5)
 f4    = pc.MulConstant(forig, 3.5)
+
+clt_forig = MEDCouplingFieldDoubleClient.New(forig)
+clt_fcopy = MEDCouplingFieldDoubleClient.New(fcopy)
+clt_f1 = MEDCouplingFieldDoubleClient.New(f1)
+clt_f2 = MEDCouplingFieldDoubleClient.New(f2)
+clt_f3 = MEDCouplingFieldDoubleClient.New(f3)
+clt_f4 = MEDCouplingFieldDoubleClient.New(f4)
+
+print("clt_forig:", clt_forig)
+print("clt_fcopy:", clt_fcopy)
+print("clt_f1:", clt_f1)
+print("clt_f2:", clt_f2)
+print("clt_f3:", clt_f3)
+print("clt_f4:", clt_f4)