From a828fea93946c3f95f611331003705fead17f944 Mon Sep 17 00:00:00 2001
From: caremoli <caremoli>
Date: Wed, 21 Nov 2007 10:39:36 +0000
Subject: [PATCH 1/1] CCAR: add SALOME exception in run

---
 src/PYCOMPO/PYCOMPO.py | 51 ++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/PYCOMPO/PYCOMPO.py b/src/PYCOMPO/PYCOMPO.py
index 3a11ad1..5d384fe 100644
--- a/src/PYCOMPO/PYCOMPO.py
+++ b/src/PYCOMPO/PYCOMPO.py
@@ -2,6 +2,8 @@ import sys,traceback,os
 import DSCCODE__POA
 import calcium
 import dsccalcium
+import SALOME
+
 try:
   import numpy
 except:
@@ -26,27 +28,32 @@ class PYCOMPO(DSCCODE__POA.PYCOMPO,dsccalcium.PyDSCComponent):
 
   def run( self):
     print "PYCOMPO.run"
-    ndim=10
-
-    force=calcium.doubleArray(ndim)
-    for i in xrange(ndim):
-      force[i]=i
-    err=calcium.cp_edb(self.proxy,calcium.CP_ITERATION ,0.,1,"tabout",ndim,force)
-
-    if numpy:
-      val=numpy.zeros(ndim,'d')
-    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
-    if numpy:
-      print val
-    else:
-      for i in xrange(ndim):
-        print val[i],
-      print
-
-    print "End of PYCOMPO.run"
-    sys.stdout.flush()
+    try:
+      ndim=10
 
+      force=calcium.doubleArray(ndim)
+      for i in xrange(ndim):
+        force[i]=i
+      err=calcium.cp_edb(self.proxy,calcium.CP_ITERATION ,0.,1,"tabout",ndim,force)
+
+      if numpy:
+        val=numpy.zeros(ndim,'d')
+      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
+      if numpy:
+        print val
+      else:
+        for i in xrange(ndim):
+          print val[i],
+        print
+
+      print "End of PYCOMPO.run"
+      sys.stdout.flush()
+    except:
+      sys.stdout.flush()
+      typ,exc_val,exc_fr=sys.exc_info()
+      l=traceback.format_exception(exc_typ,exc_val,exc_fr)
+      raise SALOME.SALOME_Exception(SALOME.ExceptionStruct(SALOME.BAD_PARAM,"".join(l),"PYCOMPO.py",0))
 
-- 
2.30.2