Merge V9_dev branch into master

[samples/dsccode.git] / src / PYCOMPO / PYCOMPO.py

diff --git a/src/PYCOMPO/PYCOMPO.py b/src/PYCOMPO/PYCOMPO.py
index 0597b4780c85b84075c87d1fa2047bbe8c2180cd..3f65a8c5f82cb9282f39533973d9addb6d2e0e3a 100644 (file)
--- a/src/PYCOMPO/PYCOMPO.py
+++ b/src/PYCOMPO/PYCOMPO.py
@@ -20,12 +20,12 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
      that implements DSC API.
   """
   def __init__ ( self, orb, poa, contID, containerName, instanceName, interfaceName ):
-    print "PYCOMPO.__init__: ", containerName, ';', instanceName,interfaceName
+    print("PYCOMPO.__init__: ", containerName, ';', instanceName,interfaceName)
     dsccalcium.PyDSCComponent.__init__(self, orb, poa,contID,containerName,instanceName,interfaceName)
     self.lcc= LifeCycleCORBA.LifeCycleCORBA(self._orb)
 
   def init_service(self,service):
-    print "init_service:",service
+    print("init_service:",service)
     calcium.create_calcium_port(self.proxy,"tabin","CALCIUM_double","IN","I");
     calcium.create_calcium_port(self.proxy,"tabout","CALCIUM_double","OUT","I");
     return True
@@ -36,7 +36,7 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
       ndim=10
 
       force=calcium.doubleArray(ndim)
-      for i in xrange(ndim):
+      for i in range(ndim):
         force[i]=i
       err=calcium.cp_edb(self.proxy,calcium.CP_ITERATION ,0.,1,"tabout",ndim,force)
 
@@ -45,13 +45,13 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
       else:
         val=calcium.doubleArray(ndim)
       err,t,i,nval=calcium.cp_ldb(self.proxy,calcium.CP_ITERATION,0.,0.,1,"tabin",ndim,val)
-      print err,t,i,nval
+      print(err,t,i,nval)
       if numpy:
-        print val
+        print(val)
       else:
-        for i in xrange(ndim):
-          print val[i],
-        print
+        for i in range(ndim):
+          print(val[i], end=' ')
+        print()
 
       self.endService("PYCOMPO.run")
       sys.stdout.flush()
@@ -63,7 +63,7 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
       raise SALOME.SALOME_Exception(SALOME.ExceptionStruct(SALOME.BAD_PARAM,"".join(l),"PYCOMPO.py",0))
 
   def gnuplot( self):
-    print "PYCOMPO.gnuplot"
+    print("PYCOMPO.gnuplot")
     try:
       import Gnuplot
       g = Gnuplot.Gnuplot(debug=1,persist=1)
@@ -81,7 +81,7 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
       ndim=24
 
       force=calcium.floatArray(ndim)
-      for i in xrange(ndim):
+      for i in range(ndim):
         force[i]=i
       err=calcium.cp_ere(self.proxy,calcium.CP_ITERATION ,0.,1,"tabout",ndim,force)
 
@@ -90,21 +90,21 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
         val=numpy.zeros((6,4),'f')
       else:
         val=calcium.floatArray(ndim)
-      for iter in xrange(20):
+      for iter in range(20):
         err,t,i,nval=calcium.cp_lre(self.proxy,calcium.CP_ITERATION,0.,0.,iter,"tabin",ndim,val)
-        print err,t,i,nval
+        print(err,t,i,nval)
         if numpy:
-          print val
+          print(val)
         else:
-          for i in xrange(ndim):
-            print val[i],
-          print
+          for i in range(ndim):
+            print(val[i], end=' ')
+          print()
         g.title('Surface plot (temperature) iter=%d' % iter)
         g.splot(Gnuplot.GridData(val,y,x, binary=0))
         #g('pause mouse')
         time.sleep(0.1)
 
-      print "End of PYCOMPO.gnuplot"
+      print("End of PYCOMPO.gnuplot")
       sys.stdout.flush()
     except:
       sys.stdout.flush()
@@ -113,7 +113,7 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
       raise SALOME.SALOME_Exception(SALOME.ExceptionStruct(SALOME.BAD_PARAM,"".join(l),"PYCOMPO.py",0))
 
   def visu( self):
-    print "PYCOMPO.visu"
+    print("PYCOMPO.visu")
     try:
       import libMedCorba_Swig
       import VISU
@@ -136,9 +136,9 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
       self.fields=[]
       self.corbafields=[]
 
-      for j in xrange(ny+1):
+      for j in range(ny+1):
         y=j*dy
-        for i in xrange(nx+1):
+        for i in range(nx+1):
           x=i*dx
           coordinates.append(x)
           coordinates.append(y)
@@ -155,8 +155,8 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
       myMeshing.setTypes([libMEDMEM_Swig.MED_QUAD4],libMEDMEM_Swig.MED_CELL)
       myMeshing.setNumberOfElements([ncells],libMEDMEM_Swig.MED_CELL)
       connectivityQuad = []
-      for j in xrange(ny):
-        for i in xrange(nx):
+      for j in range(ny):
+        for i in range(nx):
           n1=i+1+(j)*(nx+1)
           n2=i+2+(j)*(nx+1)
           n3=i+2+(j+1)*(nx+1)
@@ -180,7 +180,7 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
       self.corbasupport=corbasupport
 
       force=calcium.floatArray(ndim)
-      for i in xrange(ndim):
+      for i in range(ndim):
         force[i]=i
       err=calcium.cp_ere(self.proxy,calcium.CP_ITERATION ,0.,1,"tabout",ndim,force)
 
@@ -190,15 +190,15 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
         val=calcium.floatArray(ndim)
 
       #start loop
-      for iter in xrange(20):
+      for iter in range(20):
         err,t,i,nval=calcium.cp_lre(self.proxy,calcium.CP_ITERATION,0.,0.,iter,"tabin",ndim,val)
-        print err,t,i,nval
+        print(err,t,i,nval)
         if numpy:
-          print val
+          print(val)
         else:
-          for i in xrange(ndim):
-            print val[i],
-          print
+          for i in range(ndim):
+            print(val[i], end=' ')
+          print()
 
         fieldDoubleScalarOnCells = libMEDMEM_Swig.FIELDDOUBLE(supportOnCells,1)
         self.fields.append(fieldDoubleScalarOnCells)
@@ -212,10 +212,10 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
         fieldDoubleScalarOnCells.setMEDComponentUnit(1,"K")
 
         t=val.tolist()
-        print "temperature",t
+        print("temperature",t)
 
         fieldDoubleScalarOnCells.setValue(t)
-        print fieldDoubleScalarOnCells.getValue()
+        print(fieldDoubleScalarOnCells.getValue())
         idMed = fieldDoubleScalarOnCells.addDriver(libMEDMEM_Swig.MED_DRIVER,filename,fieldDoubleScalarOnCells.getName())
         fieldDoubleScalarOnCells.write(idMed)
 
@@ -229,7 +229,7 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
         myView.DisplayOnly(scmap)
         myView.FitAll()
 
-      print "End of PYCOMPO.visu"
+      print("End of PYCOMPO.visu")
       sys.stdout.flush()
     except:
       sys.stdout.flush()