]> SALOME platform Git repositories - tools/eficas.git/commitdiff
Salome HOME
fin du merge, chgt de catalogue et rm sur des fichiers de merge
authorpascale.noyret <pascale.noyret@edf.fr>
Wed, 16 Jun 2021 16:32:53 +0000 (18:32 +0200)
committerpascale.noyret <pascale.noyret@edf.fr>
Wed, 16 Jun 2021 16:32:53 +0000 (18:32 +0200)
42 files changed:
Accas/A_BLOC.py.orig [deleted file]
Accas/A_ETAPE.py.orig [deleted file]
Accas/A_FACT.py.orig [deleted file]
Accas/A_JDC.py.orig [deleted file]
Accas/A_JDC_CATA.py.orig [deleted file]
Accas/A_MACRO_ETAPE.py.orig [deleted file]
Accas/A_MCBLOC.py.orig [deleted file]
Accas/A_MCFACT.py.orig [deleted file]
Accas/A_MCLIST.py.orig [deleted file]
Accas/A_MCSIMP.py.orig [deleted file]
Accas/A_OPER.py.orig [deleted file]
Accas/A_PROC.py.orig [deleted file]
Accas/A_PROC_ETAPE.py.orig [deleted file]
Accas/A_SIMP.py.orig [deleted file]
InterfaceQT4/eficas_goWeb.py [deleted file]
InterfaceQT4/monChoixCommande.py
InterfaceQT4/monWidgetPlusieursBase.py
Poc/cataPocRN.py [deleted file]
Poc/cataPocRNWithAssemblyName.py [deleted file]
Poc/cdm_helpers.py [deleted file]
Poc/edg32.comm [deleted file]
Poc/edg32.comm.ref [deleted file]
Poc/edg32WithAssemblyName.comm [deleted file]
Poc/essaiGetattr.py [deleted file]
Poc/generateXML.py [deleted file]
Poc/generateXSD.py [deleted file]
Poc/metier.py [deleted file]
Poc/pocEssaiExecution.py [deleted file]
Poc/prefs.py [deleted file]
Poc/prefs_Essai.py [deleted file]
Poc/qtEficasEssai.py [deleted file]
Poc/raw/__init__.py [deleted file]
Poc/readExemple.py [deleted file]
Poc/readExempleWithAssemblyName.py [deleted file]
ReacteurNumerique/cataPocRN.py [deleted file]
ReacteurNumerique/cataPocRNWithAssemblyName.py [deleted file]
ReacteurNumerique/cata_MatriceColoree.py [new file with mode: 0644]
ReacteurNumerique/cata_ReacteurNumerique.py [changed from file to symlink]
ReacteurNumerique/cata_ReacteurNumerique.py_matriceAncienneVersion [new file with mode: 0644]
ReacteurNumerique/qtEficasEssai.py [deleted file]
docCataWriter/.oper_and_proc.rst.swp [deleted file]
docCataWriter/.structure_rules.rst.swp [deleted file]

diff --git a/Accas/A_BLOC.py.orig b/Accas/A_BLOC.py.orig
deleted file mode 100644 (file)
index 862e9c4..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-<<<<<<< HEAD
-from Noyau import N_BLOC
-from Ihm import I_ENTITE
-from Accas import A_MCBLOC
-#from Efi2Xsd.AccasXsd  import X_BLOC
-
-
-#class BLOC(N_BLOC.BLOC,X_BLOC,I_ENTITE.ENTITE):
-class BLOC(N_BLOC.BLOC,I_ENTITE.ENTITE):
-   class_instance=A_MCBLOC.MCBLOC
-   def __init__(self,*tup,**args):
-      I_ENTITE.ENTITE.__init__(self)
-      N_BLOC.BLOC.__init__(self,*tup,**args)
-=======
-from Noyau  import N_BLOC
-from Ihm    import I_ENTITE
-from Accas  import A_MCBLOC
-from Efi2Xsd.AccasXsd  import X_BLOC
-
->>>>>>> origin/V9_dev
-
-class BLOC(N_BLOC.BLOC,X_BLOC,I_ENTITE.ENTITE):
-    class_instance=A_MCBLOC.MCBLOC
-    def __init__(self,*tup,**args):
-        I_ENTITE.ENTITE.__init__(self)
-        N_BLOC.BLOC.__init__(self,*tup,**args)
-
-#class BLOC_EXCLUS_ABC(BLOC): pass
-#class BLOC_FICHIER(BLOC):pass
diff --git a/Accas/A_ETAPE.py.orig b/Accas/A_ETAPE.py.orig
deleted file mode 100644 (file)
index 0eb5e9a..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from Noyau      import N_ETAPE
-from Validation import V_ETAPE
-<<<<<<< HEAD
-from Ihm import I_ETAPE
-#from Efi2Xsd.MCAccasXsd  import X_MCCOMPO
-
-#class ETAPE(I_ETAPE.ETAPE,V_ETAPE.ETAPE,X_MCCOMPO,N_ETAPE.ETAPE):
-class ETAPE(I_ETAPE.ETAPE,V_ETAPE.ETAPE,N_ETAPE.ETAPE):
-   def __init__(self,oper=None,reuse=None,args={}):
-      print ('------------- ETAPE accas', oper.nom, args)
-      N_ETAPE.ETAPE.__init__(self,oper,reuse,args)
-      V_ETAPE.ETAPE.__init__(self)
-=======
-from Ihm        import I_ETAPE
-from Efi2Xsd.MCAccasXML  import X_ETAPE
-
-class ETAPE(I_ETAPE.ETAPE,V_ETAPE.ETAPE,X_ETAPE,N_ETAPE.ETAPE):
-    def __init__(self,oper=None,reuse=None,args={}):
-        N_ETAPE.ETAPE.__init__(self,oper,reuse,args)
-        V_ETAPE.ETAPE.__init__(self)
->>>>>>> origin/V9_dev
diff --git a/Accas/A_FACT.py.orig b/Accas/A_FACT.py.orig
deleted file mode 100644 (file)
index 49ab308..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from Noyau import N_FACT
-<<<<<<< HEAD
-from Ihm import I_ENTITE
-from Accas import A_MCFACT
-from Accas import A_MCLIST
-#from Efi2Xsd.AccasXsd  import X_FACT
-
-
-#class FACT(N_FACT.FACT,X_FACT,I_ENTITE.ENTITE):
-class FACT(N_FACT.FACT,I_ENTITE.ENTITE):
-   class_instance=A_MCFACT.MCFACT
-   list_instance=A_MCLIST.MCList
-   def __init__(self,*tup,**args):
-      I_ENTITE.ENTITE.__init__(self)
-      N_FACT.FACT.__init__(self,*tup,**args)
-=======
-from Ihm   import I_ENTITE
-from Accas import A_MCFACT
-from Accas import A_MCLIST
-from Efi2Xsd.AccasXsd  import X_FACT
-
-
-class FACT(N_FACT.FACT,X_FACT,I_ENTITE.ENTITE):
-    class_instance = A_MCFACT.MCFACT
-    list_instance  = A_MCLIST.MCList
-    def __init__(self,*tup,**args):
-        I_ENTITE.ENTITE.__init__(self)
-        N_FACT.FACT.__init__(self,*tup,**args)
->>>>>>> origin/V9_dev
-
-from Noyau import N_OBJECT
-from Ihm   import I_OBJECT
-
-class ErrorObj(I_OBJECT.ErrorObj,N_OBJECT.ErrorObj):pass
-N_OBJECT.ErrorObj=ErrorObj
diff --git a/Accas/A_JDC.py.orig b/Accas/A_JDC.py.orig
deleted file mode 100644 (file)
index f55fc6d..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from Noyau      import N_JDC
-from Validation import V_JDC
-from Extensions import jdc
-<<<<<<< HEAD
-from Ihm import I_JDC
-#from Efi2Xsd.MCAccasXsd  import X_JDC
-
-#class JDC(jdc.JDC,I_JDC.JDC,X_JDC,V_JDC.JDC,N_JDC.JDC):
-class JDC(jdc.JDC,I_JDC.JDC,V_JDC.JDC,N_JDC.JDC):
-   from .A_ASSD import CO,assd
-
-   def __init__(self,*pos,**args):
-      N_JDC.JDC.__init__(self,*pos,**args)
-      #X_JDC.__init__(self)
-      V_JDC.JDC.__init__(self)
-      I_JDC.JDC.__init__(self)
-      jdc.JDC.__init__(self)
-      self.icmd=0
-=======
-from Ihm        import I_JDC
-from Efi2Xsd.MCAccasXML  import X_JDC
-
-class JDC(jdc.JDC,I_JDC.JDC,X_JDC,V_JDC.JDC,N_JDC.JDC):
-    from .A_ASSD import CO,assd
-
-    def __init__(self,*pos,**args):
-        N_JDC.JDC.__init__(self,*pos,**args)
-        X_JDC.__init__(self)
-        V_JDC.JDC.__init__(self)
-        I_JDC.JDC.__init__(self)
-        jdc.JDC.__init__(self)
-        self.icmd=0
->>>>>>> origin/V9_dev
diff --git a/Accas/A_JDC_CATA.py.orig b/Accas/A_JDC_CATA.py.orig
deleted file mode 100644 (file)
index 1814302..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from .     import A_JDC
-from Noyau import N_JDC_CATA
-<<<<<<< HEAD
-from Ihm import I_JDC_CATA
-#from Efi2Xsd.AccasXsd  import X_JDC_CATA
-
-#class JDC_CATA(I_JDC_CATA.JDC_CATA,N_JDC_CATA.JDC_CATA,X_JDC_CATA):
-class JDC_CATA(I_JDC_CATA.JDC_CATA,N_JDC_CATA.JDC_CATA):
-   class_instance=A_JDC.JDC
-   def __init__(self,*pos,**kw):
-      #print pos
-      #print kw
-      N_JDC_CATA.JDC_CATA.__init__(self,*pos,**kw)
-      I_JDC_CATA.JDC_CATA.__init__(self)
-=======
-from Ihm   import I_JDC_CATA
-from Efi2Xsd.AccasXsd  import X_JDC_CATA
-
-class JDC_CATA(I_JDC_CATA.JDC_CATA,N_JDC_CATA.JDC_CATA,X_JDC_CATA):
-    class_instance=A_JDC.JDC
-    def __init__(self,*pos,**kw):
-        N_JDC_CATA.JDC_CATA.__init__(self,*pos,**kw)
-        I_JDC_CATA.JDC_CATA.__init__(self)
->>>>>>> origin/V9_dev
diff --git a/Accas/A_MACRO_ETAPE.py.orig b/Accas/A_MACRO_ETAPE.py.orig
deleted file mode 100644 (file)
index 10ec4a9..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from Noyau      import N_MACRO_ETAPE
-from Validation import V_MACRO_ETAPE
-<<<<<<< HEAD
-from Ihm import I_MACRO_ETAPE
-from .A_ASSD import CO
-#from Efi2Xsd.MCAccasXsd  import X_MCCOMPO
-
-class MACRO_ETAPE(I_MACRO_ETAPE.MACRO_ETAPE,
-#                  X_MCCOMPO,
-=======
-from Ihm        import I_MACRO_ETAPE
-from .A_ASSD    import CO
-from Efi2Xsd.MCAccasXML  import X_MCCOMPO
-
-class MACRO_ETAPE(I_MACRO_ETAPE.MACRO_ETAPE,
-                  X_MCCOMPO,
->>>>>>> origin/V9_dev
-                  V_MACRO_ETAPE.MACRO_ETAPE,
-                  N_MACRO_ETAPE.MACRO_ETAPE):
-    typeCO=CO
-    def __init__(self,oper=None,reuse=None,args={}):
-        N_MACRO_ETAPE.MACRO_ETAPE.__init__(self,oper,reuse,args)
-        V_MACRO_ETAPE.MACRO_ETAPE.__init__(self)
-        I_MACRO_ETAPE.MACRO_ETAPE.__init__(self)
diff --git a/Accas/A_MCBLOC.py.orig b/Accas/A_MCBLOC.py.orig
deleted file mode 100644 (file)
index e7661c7..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from Noyau import N_MCBLOC
-from Validation import V_MCBLOC
-from Ihm import I_MCBLOC
-<<<<<<< HEAD
-#from Efi2Xsd.MCAccasXsd  import X_MCBLOC
-
-
-#class MCBLOC(I_MCBLOC.MCBLOC,N_MCBLOC.MCBLOC,X_MCBLOC,V_MCBLOC.MCBLOC):
-class MCBLOC(I_MCBLOC.MCBLOC,N_MCBLOC.MCBLOC,V_MCBLOC.MCBLOC):
-   def __init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=None):
-      N_MCBLOC.MCBLOC.__init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=dicoPyxbDeConstruction)
-      V_MCBLOC.MCBLOC.__init__(self)
-=======
-from Efi2Xsd.MCAccasXML  import X_MCBLOC
-
-
-class MCBLOC(I_MCBLOC.MCBLOC,N_MCBLOC.MCBLOC,X_MCBLOC,V_MCBLOC.MCBLOC):
-    def __init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=None):
-        N_MCBLOC.MCBLOC.__init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=dicoPyxbDeConstruction)
-        V_MCBLOC.MCBLOC.__init__(self)
->>>>>>> origin/V9_dev
diff --git a/Accas/A_MCFACT.py.orig b/Accas/A_MCFACT.py.orig
deleted file mode 100644 (file)
index 1cd864a..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from Noyau      import N_MCFACT
-from Validation import V_MCFACT
-<<<<<<< HEAD
-from Ihm import I_MCFACT
-#from Efi2Xsd.MCAccasXsd  import X_MCFACT
-
-#class MCFACT(I_MCFACT.MCFACT,N_MCFACT.MCFACT,X_MCFACT,V_MCFACT.MCFACT):
-class MCFACT(I_MCFACT.MCFACT,N_MCFACT.MCFACT,V_MCFACT.MCFACT):
-   def __init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=None):
-      N_MCFACT.MCFACT.__init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=dicoPyxbDeConstruction)
-      V_MCFACT.MCFACT.__init__(self)
-=======
-from Ihm        import I_MCFACT
-from Efi2Xsd.MCAccasXML  import X_MCFACT
-
-class MCFACT(I_MCFACT.MCFACT,N_MCFACT.MCFACT,X_MCFACT,V_MCFACT.MCFACT):
-    def __init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=None):
-        N_MCFACT.MCFACT.__init__(self,val,definition,nom,parent,dicoPyxbDeConstruction=dicoPyxbDeConstruction)
-        V_MCFACT.MCFACT.__init__(self)
->>>>>>> origin/V9_dev
diff --git a/Accas/A_MCLIST.py.orig b/Accas/A_MCLIST.py.orig
deleted file mode 100644 (file)
index 2f7a0c3..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-# ======================================================================
-from __future__ import absolute_import
-from Noyau      import N_MCLIST
-from Validation import V_MCLIST
-<<<<<<< HEAD
-from Ihm import I_MCLIST
-#from Efi2Xsd.MCAccasXsd  import X_MCLIST
-
-#class MCList(I_MCLIST.MCList,N_MCLIST.MCList,X_MCLIST,V_MCLIST.MCList):
-class MCList(I_MCLIST.MCList,N_MCLIST.MCList,V_MCLIST.MCList):
-   def __init__(self):
-      N_MCLIST.MCList.__init__(self)
-=======
-from Ihm        import I_MCLIST
-from Efi2Xsd.MCAccasXML  import X_MCLIST
-
-
-class MCList(I_MCLIST.MCList,N_MCLIST.MCList,X_MCLIST,V_MCLIST.MCList):
-    def __init__(self):
-        N_MCLIST.MCList.__init__(self)
->>>>>>> origin/V9_dev
diff --git a/Accas/A_MCSIMP.py.orig b/Accas/A_MCSIMP.py.orig
deleted file mode 100644 (file)
index eb9cec6..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from Noyau import N_MCSIMP
-from Validation import V_MCSIMP
-from Ihm import I_MCSIMP
-<<<<<<< HEAD
-#from Efi2Xsd.MCAccasXsd  import X_MCSIMP
-
-#class MCSIMP(I_MCSIMP.MCSIMP,N_MCSIMP.MCSIMP,X_MCSIMP,V_MCSIMP.MCSIMP):
-class MCSIMP(I_MCSIMP.MCSIMP,N_MCSIMP.MCSIMP,V_MCSIMP.MCSIMP):
-   def __init__(self,val,definition,nom,parent,objPyxbDeConstruction=None):
-      N_MCSIMP.MCSIMP.__init__(self,val,definition,nom,parent,objPyxbDeConstruction)
-      V_MCSIMP.MCSIMP.__init__(self)
-=======
-from Efi2Xsd.MCAccasXML  import X_MCSIMP
-
-class MCSIMP(I_MCSIMP.MCSIMP,N_MCSIMP.MCSIMP,X_MCSIMP,V_MCSIMP.MCSIMP):
-    def __init__(self,val,definition,nom,parent,objPyxbDeConstruction=None):
-    #le defaut de objPyxbDeConstruction permet de lire les comm avec des modeles sans equivalent XSD
-        N_MCSIMP.MCSIMP.__init__(self,val,definition,nom,parent,objPyxbDeConstruction)
-        V_MCSIMP.MCSIMP.__init__(self)
->>>>>>> origin/V9_dev
diff --git a/Accas/A_OPER.py.orig b/Accas/A_OPER.py.orig
deleted file mode 100644 (file)
index 1760dc8..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from Noyau import N_OPER
-<<<<<<< HEAD
-from Ihm import I_ENTITE
-from Accas import A_ETAPE 
-#from Efi2Xsd.AccasXsd  import X_OPER
-
-
-#class OPER(N_OPER.OPER,X_OPER,I_ENTITE.ENTITE):
-class OPER(N_OPER.OPER,I_ENTITE.ENTITE):
-   class_instance=A_ETAPE.ETAPE
-   def __init__(self,*tup,**args):
-      I_ENTITE.ENTITE.__init__(self)
-      N_OPER.OPER.__init__(self,*tup,**args)
-=======
-from Ihm   import I_ENTITE
-from Accas import A_ETAPE
-from Efi2Xsd.AccasXsd import X_OPER
-
-
-class OPER(N_OPER.OPER,X_OPER,I_ENTITE.ENTITE):
-    class_instance=A_ETAPE.ETAPE
-    def __init__(self,*tup,**args):
-        I_ENTITE.ENTITE.__init__(self)
-        N_OPER.OPER.__init__(self,*tup,**args)
->>>>>>> origin/V9_dev
diff --git a/Accas/A_PROC.py.orig b/Accas/A_PROC.py.orig
deleted file mode 100644 (file)
index 362650a..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from Noyau import N_PROC
-<<<<<<< HEAD
-from Ihm import I_ENTITE
-from Accas import A_PROC_ETAPE 
-#from Efi2Xsd.AccasXsd import X_PROC
-
-#class PROC(N_PROC.PROC,X_PROC,I_ENTITE.ENTITE):
-class PROC(N_PROC.PROC,I_ENTITE.ENTITE):
-   class_instance=A_PROC_ETAPE.PROC_ETAPE
-   def __init__(self,*tup,**args):
-=======
-from Ihm   import I_ENTITE
-from Accas import A_PROC_ETAPE
-from Efi2Xsd.AccasXsd import X_PROC
-
-class PROC(N_PROC.PROC,X_PROC,I_ENTITE.ENTITE):
-   class_instance=A_PROC_ETAPE.PROC_ETAPE
-   def __init__(self,*tup,**args):
-      #print (tup)
-      #print (args)
->>>>>>> origin/V9_dev
-      I_ENTITE.ENTITE.__init__(self)
-      N_PROC.PROC.__init__(self,*tup,**args)
-
diff --git a/Accas/A_PROC_ETAPE.py.orig b/Accas/A_PROC_ETAPE.py.orig
deleted file mode 100644 (file)
index 74d0652..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from Noyau      import N_PROC_ETAPE
-from Validation import V_PROC_ETAPE
-<<<<<<< HEAD
-from Ihm import I_PROC_ETAPE
-#from Efi2Xsd.MCAccasXsd  import X_MCCOMPO
-
-class PROC_ETAPE(I_PROC_ETAPE.PROC_ETAPE,
-                 V_PROC_ETAPE.PROC_ETAPE,
-#                 X_MCCOMPO,
-=======
-from Ihm        import I_PROC_ETAPE
-from Efi2Xsd.MCAccasXML  import X_MCCOMPO
-
-class PROC_ETAPE(I_PROC_ETAPE.PROC_ETAPE,
-                 V_PROC_ETAPE.PROC_ETAPE,
-                 X_MCCOMPO,
->>>>>>> origin/V9_dev
-                 N_PROC_ETAPE.PROC_ETAPE):
-    def __init__(self,oper=None,args={}):
-        N_PROC_ETAPE.PROC_ETAPE.__init__(self,oper=oper,args=args)
-        V_PROC_ETAPE.PROC_ETAPE.__init__(self)
diff --git a/Accas/A_SIMP.py.orig b/Accas/A_SIMP.py.orig
deleted file mode 100644 (file)
index c23cf7f..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-from __future__ import absolute_import
-from Noyau import N_SIMP
-<<<<<<< HEAD
-from Ihm import I_ENTITE
-from Accas import A_MCSIMP
-#from Efi2Xsd.AccasXsd import X_SIMP
-
-#class SIMP(N_SIMP.SIMP,X_SIMP,I_ENTITE.ENTITE):
-class SIMP(N_SIMP.SIMP,I_ENTITE.ENTITE):
-=======
-from Ihm   import I_ENTITE
-from Accas import A_MCSIMP
-from Efi2Xsd.AccasXsd import X_SIMP
-
-class SIMP(N_SIMP.SIMP,X_SIMP,I_ENTITE.ENTITE):
->>>>>>> origin/V9_dev
-   class_instance=A_MCSIMP.MCSIMP
-   def __init__(self,*tup,**args):
-      #print tup
-      #print args
-      I_ENTITE.ENTITE.__init__(self)
-      N_SIMP.SIMP.__init__(self,*tup,**args)
-
diff --git a/InterfaceQT4/eficas_goWeb.py b/InterfaceQT4/eficas_goWeb.py
deleted file mode 100755 (executable)
index 8ac4f27..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-
-# Modules Python
-from __future__ import absolute_import
-from __future__ import print_function
-try :
-    from builtins import str
-except : pass
-
-
-import sys,os
-repIni     = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)),".."))
-ihmQTDir   = os.path.join(repIni,"UiQT5")
-editeurDir = os.path.join(repIni,"Editeur")
-ihmDir     = os.path.join(repIni,"InterfaceQT4")
-
-if ihmDir     not in sys.path : sys.path.append(ihmDir)
-if ihmQTDir   not in sys.path : sys.path.append(ihmQTDir)
-if editeurDir not in sys.path : sys.path.append(editeurDir)
-
-
-def lanceEficas(code=None, multi=False, langue='en', labelCode=None):
-#-------------------------------------------------------------------
-    """
-        Lance l'appli EFICAS avec Ihm
-    """
-    try :
-        from PyQt5.QtWidgets import QApplication
-    except :
-        print('Please, set qt environment')
-        return
-
-    from Editeur  import session
-    options = session.parse(sys.argv)
-    if options.code          != None : code=options.code
-
-    from InterfaceQT4.qtEficas import Appli
-    app = QApplication(sys.argv)
-
-    Eficas=Appli(code=code,salome=0,multi=multi,langue=langue,labelCode=labelCode)
-    Eficas.show()
-
-    res=app.exec_()
-    sys.exit(res)
index d5cfa2f0e1443b77f066162a8825c99429f8436c..6c811852cbb8b5c6678b68029683d7fdbce73320 100644 (file)
@@ -168,11 +168,11 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
                 listeEtapesDejaPresentes.append(e.nom)
             for c in aExclure :
                 if c not in listeEtapesDejaPresentes : aExclure.remove(c)
-        for e in self.jdc.etapes:
-            print (e.nom)
-            print (e.definition.repetable)
-            if e.definition.repetable == 'n' : aExclure.append(e.nom)
-        print (aExclure)
+        #for e in self.jdc.etapes:
+        #    print (e.nom)
+        #    print (e.definition.repetable)
+        #    if e.definition.repetable == 'n' : aExclure.append(e.nom)
+        #print (aExclure)
         for l in self.jdc.getListeCmd():
             print (l)
             if l not in aExclure :
index 882ea44097ef882f893fd9582dd7396e79609b69..ce462480004649115fc43b4261cd1d5a00bacaa5 100644 (file)
@@ -136,7 +136,7 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie)
 
 
     def ajoutLineEdit(self,valeur=None,):
-        print ('ajoutLineEdit plusieursBase')
+        #print ('ajoutLineEdit plusieursBase')
         #print ('self.indexDernierLabel', self.indexDernierLabel)
         self.indexDernierLabel=self.indexDernierLabel+1
         nomLineEdit="lineEditVal"+str(self.indexDernierLabel)
diff --git a/Poc/cataPocRN.py b/Poc/cataPocRN.py
deleted file mode 100644 (file)
index b1e7131..0000000
+++ /dev/null
@@ -1,321 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2008-2018 EDF R&D
-#
-# This file is part of SALOME ADAO module
-#
-# 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
-import os
-from Accas import OPER, BLOC, FACT, SIMP, ASSD, JDC_CATA, VerifTypeTuple, Matrice
-from Extensions.i18n import tr
-import types
-monFichier = os.path.abspath(__file__)
-
-JdC = JDC_CATA(
-    code='Essai'
-)
-VERSION_CATALOGUE = 'V_0'
-
-
-NMIN_ASSEMBLY = 1
-NMAX_ASSEMBLY = 18
-
-
-class Tuple:
-    def __init__(self, ntuple):
-        self.ntuple = ntuple
-
-    def __convert__(self, valeur):
-        if len(valeur) != self.ntuple:
-            return None
-        return valeur
-
-    def info(self):
-        return "Tuple de %s elements" % self.ntuple
-
-
-# class Matrice:
-#     def __init__(self, nbLigs=None, nbCols=None,
-#                  methodeCalculTaille=None, formatSortie="ligne",
-#                  valSup=None, valMin=None, structure=None, typElt='R',
-#                  typEltInto=None, listeHeaders=None):
-#         self.nbLigs = nbLigs
-#         self.nbCols = nbCols
-#         self.methodeCalculTaille = methodeCalculTaille
-#         self.formatSortie = formatSortie
-#         self.valSup = valSup
-#         self.valMin = valMin
-#         self.structure = structure
-#         self.typElt = typElt
-#         self.listeHeaders = listeHeaders
-#         self.typEltInto = typEltInto
-
-#     def __convert__(self, valeur):
-#         # Attention ne verifie pas grand chose
-#         if not isinstance(valeur, types.ListType):
-#             return None
-#         return valeur
-
-#     def info(self):
-#         return "Matrice %s x %s" % (self.nbLigs, self.nbCols)
-
-#     __repr__ = info
-#     __str__ = info
-
-
-class VerifPostTreatment(VerifTypeTuple):
-
-    def __init__(self):
-        super(VerifPostTreatment, self).__init__(('TXM', 'TXM'))
-        self.cata_info = ""
-        self.physValeurs = ('Neutronics', 'Thermalhydraulics')
-        self.typeValeurs = ('MED', 'SUM', 'MIN', 'MAX', 'MEAN')
-
-    def info(self):
-        return tr(": verifie les \ntypes dans un tuple")
-
-    def infoErreurListe(self):
-        return tr("Les types entres ne sont pas permis")
-
-    def default(self, valeur):
-        return valeur
-
-    def isList(self):
-        return 1
-
-    def convertItem(self, valeur):
-        if len(valeur) != len(self.typeDesTuples):
-            raise ValueError(
-                tr("%s devrait etre de type  %s ") % (valeur, self.typeDesTuples))
-        ok = self.verifType(valeur)
-        if ok == 0:
-            raise ValueError(
-                tr("%s devrait etre de type  %s (%d)") % (valeur, self.typeDesTuples, ok))
-        if ok < 0:
-            raise ValueError(
-                tr("%s devrait etre dans %s ") % (valeur[1], self.typeValeurs))
-        return valeur
-
-    def verifItem(self, valeur):
-        try:
-            if len(valeur) != len(self.typeDesTuples):
-                return 0
-            ok = self.verifType(valeur)
-            if ok != 1:
-                return 0
-        except:
-            return 0
-        return 1
-
-    def verifType(self, valeur):
-        ok = 0
-        for v in valeur:
-            if type(v) == bytes or type(v) == str:
-                ok += 1
-        if ok == len(self.typeDesTuples):
-            if valeur[1] in self.typeValeurs:  # and valeur[1] in self.physValeurs:
-                return 1
-            return -1
-        return 0
-
-    def verif(self, valeur):
-        if type(valeur) in (list, tuple):
-            liste = list(valeur)
-            for val in liste:
-                if self.verifItem(val) != 1:
-                    return 0
-            return 1
-        return 0
-
-
-class myAssembly(ASSD):
-    pass
-
-
-class myTechnoData(ASSD):
-    pass
-
-
-class myRodBank(ASSD):
-    pass
-
-
-class myModelData(ASSD):
-    pass
-
-
-class myScenarioData(ASSD):
-    pass
-
-
-Assembly = OPER(nom='Assembly', sd_prod=myAssembly,
-                assembly_name=SIMP(statut='o', typ='TXM'),
-                assembly_type=SIMP(statut='o', typ='TXM', into=("UOX", "MOX", "REF")),
-                description=BLOC(condition='assembly_type != "REF"',
-                                 assembly_width=SIMP(statut='o', typ='R'),
-                                 radial_description=FACT(statut='o',
-                                                         clad_outer_radius=SIMP(statut='o', typ='R'),
-                                                         guide_tube_outer_radius=SIMP(statut='o', typ='R'),
-                                                         fuel_rod_pitch=SIMP(statut='o', typ='R'),
-                                                         nfuel_rods=SIMP(statut='o', typ='I')),
-                                 axial_description=FACT(statut='o',
-                                                        active_length_start=SIMP(statut='o', typ='R'),
-                                                        active_length_end=SIMP(statut='o', typ='R')),
-                                 grids=FACT(statut='o',
-                                            mixing=FACT(statut='o',
-                                                        positions=SIMP(
-                                                            statut='f', typ='R', max="**"),
-                                                        size=SIMP(statut='o', typ='R')),
-                                            non_mixing=FACT(statut='o',
-                                                            positions=SIMP(
-                                                                statut='f', typ='R', max='**'),
-                                                            size=SIMP(statut='o', typ='R')),
-                                            )
-                                 )
-                )
-
-
-RodBank = OPER(nom="RodBank", sd_prod=myRodBank,
-               rodbank_name=SIMP(statut='o', typ='TXM'),
-               step_height=SIMP(statut='o', typ='R'),
-               nsteps=SIMP(statut='o', typ='I'))
-
-
-def add_lr_refl(ass_list):
-    return ["RW"] + ass_list + ["RE"]
-
-
-def add_tb_refl(ass_list):
-    return ["RS"] + ass_list + ["RN"]
-
-
-def generate_ass_map(nass_list):
-    xsym_list = [a for a in 'ABCDEFGHJKLNPRSTUVWXYZ']
-    xsym_list.reverse()
-    ysym_list = ["%02d" % i for i in range(NMIN_ASSEMBLY, NMAX_ASSEMBLY+1)]
-    ysym_list.reverse()
-    def_xaxis = {}
-    def_yaxis = {}
-    for n in range(NMIN_ASSEMBLY, NMAX_ASSEMBLY+1):
-        def_xaxis[n] = add_lr_refl(xsym_list[-n:])
-        def_yaxis[n] = add_tb_refl(ysym_list[-n:])
-
-    dico = {}
-#    for n in nass_list:
-    for n in (6,):
-        dico['assembly_map_%d' % n] = BLOC(condition="nb_assembly==%d" % n,
-                                           xaxis=SIMP(statut='o',
-                                                      typ='TXM',
-                                                      min=n+2, max=n+2,
-                                                      defaut=def_xaxis[n]),
-                                           yaxis=SIMP(statut='o',
-                                                      typ='TXM',
-                                                      min=n+2, max=n+2,
-                                                      defaut=def_yaxis[n]),
-                                           assembly_map=SIMP(statut="o",
-                                                             typ=Matrice(nbLigs=n+2,
-                                                                         nbCols=n+2,
-                                                                         # valSup=1,
-                                                                         # valMin=-1,
-                                                                         typElt='TXM',  # ici c'est le nom de l'assemblage
-                                                                         listeHeaders=None),
-                                                             defaut=(n+2)*[(n+2)*['.']]),
-                                           rod_map=SIMP(statut="o",
-                                                        typ=Matrice(nbLigs=n+2,
-                                                                    nbCols=n+2,
-                                                                    valSup=1,
-                                                                    valMin=-1,
-                                                                    typElt='TXM',  # ici c'est le nom de l'assemblage
-                                                                    listeHeaders=None),
-                                                        defaut=(n+2)*[(n+2)*['.']]))
-
-    return dico
-
-
-Techno_data = OPER(nom='Techno_data', sd_prod=myTechnoData,
-                   assembly_list=SIMP(statut='o', typ=myAssembly, min=1, max="**"),  # à resorber quand on mettra dans la Matrice
-                   rodbank_list=SIMP(statut='o', typ=myRodBank, min=0, max="**"),  # idem
-                   radial_description=FACT(statut='o',
-                                           nb_assembly=SIMP(statut='o', typ='I', into=list(range(NMIN_ASSEMBLY, NMAX_ASSEMBLY))),
-                                           **(generate_ass_map(range(NMIN_ASSEMBLY, NMAX_ASSEMBLY)))
-                                           ),  # Radial_Description
-                   axial_description=FACT(statut='o',
-                                          lower_refl_size=SIMP(statut='o', typ='R'),
-                                          upper_refl_size=SIMP(statut='o', typ='R'),
-                                          ),
-                   nominal_power=SIMP(statut='o', typ='R'),
-                   fuel_power_fraction=SIMP(statut='o', typ='R'),
-                   )  # Techno data
-
-Model_data = OPER(nom='Model_data', sd_prod=myModelData,
-                  physics=SIMP(statut='o', typ='TXM', into=(
-                      'Neutronics', 'Thermalhydraulics')),
-                  scale=SIMP(statut='o', typ='TXM', into=(
-                      'system', 'component', 'local')),
-                  b_neutro_compo=BLOC(condition='physics=="Neutronics" and scale=="component"',
-                                      codeNeutro=SIMP(statut='o', typ='TXM', into=('COCAGNE', 'APOLLO3')),
-                                      radial_meshingNeutro=FACT(statut='o',
-                                                          flux_solver=SIMP(statut='o', typ='TXM', into=('subdivision', 'pin-by-pin')),
-                                                          b_flux_subdivision=BLOC(condition='flux_solver=="subdivision"',
-                                                                                  flux_subdivision=SIMP(statut='o', typ='I')),
-                                                          feedback_solver=SIMP(statut='o', typ='TXM', into=('subdivision', 'pin-by-pin')),
-                                                          b_feedback_subdivision=BLOC(condition='feedback_solver=="subdivision"',
-                                                                                      feedback_subdivision=SIMP(statut='o', typ='I')))),
-                  b_thermo_compo=BLOC(condition='physics=="Thermalhydraulics" and scale=="component"',
-                                      code=SIMP(statut='o', typ='TXM', into=('THYC', 'CATHARE3', 'FLICA4')),
-                                      radial_meshing=FACT(statut='o',
-                                                          fluid=SIMP(statut='o', typ='TXM', into=('subdivision', 'subchannel')),
-                                                          b_fluid_subdivision=BLOC(condition='fluid=="subdivision"',
-                                                                                   fluid_subdivision=SIMP(statut='o', typ='I')),
-                                                          pellet=SIMP(statut='o', typ='I'),
-                                                          clad=SIMP(statut='o', typ='I'))),
-                  b_scale_compo=BLOC(condition='scale=="component"',
-                                     axial_meshing=FACT(statut='o',
-                                                        lower_refl=SIMP(statut='o', typ='I'),
-                                                        fuel=SIMP(statut='o', typ='I'),
-                                                        upper_refl=SIMP(statut='o', typ='I'))),
-                  b_scale_local=BLOC(condition='scale=="local"',
-                                     mesh_file=SIMP(statut='o', typ='Fichier')),
-                  )
-
-
-Scenario_data = OPER(nom='Scenario_data', sd_prod=myScenarioData,
-                     initial_power=SIMP(statut='o', typ='R', val_min=0.,
-                                        defaut=100.),
-                     initial_power_unit=SIMP(statut='o', typ='TXM',
-                                             into=('% Nominal power', 'W'),
-                                             defaut='% Nominal power'),
-                     initial_rod_positions=SIMP(statut='o',
-                                                typ=Tuple(2),
-                                                validators=VerifTypeTuple(['TXM', 'I']),
-                                                ang="Type@label, position (e.g. RodBank@RB, 0)",
-                                                max='**'),
-                     scenario_type=SIMP(statut='o',
-                                        typ='TXM',
-                                        into=['RIA']),
-                     b_ria=BLOC(condition='scenario_type=="RIA"',
-                                ejected_rod=SIMP(statut='o',
-                                                 typ='TXM'),
-                                rod_position_program=SIMP(statut='o',
-                                                          typ=Tuple(2),
-                                                          validators=VerifTypeTuple(['R', 'I']),
-                                                          max='**'),
-                                ),
-                     post_processing=SIMP(statut='f',
-                                          typ=Tuple(2),
-                                          validators=VerifPostTreatment(),
-                                          max='**'),
-                     )
diff --git a/Poc/cataPocRNWithAssemblyName.py b/Poc/cataPocRNWithAssemblyName.py
deleted file mode 100644 (file)
index 4fdb2de..0000000
+++ /dev/null
@@ -1,295 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2008-2018 EDF R&D
-#
-# This file is part of SALOME ADAO module
-#
-# 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
-import os
-from Accas import OPER, BLOC, FACT, SIMP, ASSD, JDC_CATA, VerifTypeTuple, Matrice
-from Extensions.i18n import tr
-import types
-monFichier = os.path.abspath(__file__)
-
-JdC = JDC_CATA(
-    code='Essai'
-)
-VERSION_CATALOGUE = 'V_0'
-
-
-NMIN_ASSEMBLY = 1
-NMAX_ASSEMBLY = 18
-
-
-class Tuple:
-    def __init__(self, ntuple):
-        self.ntuple = ntuple
-
-    def __convert__(self, valeur):
-        if len(valeur) != self.ntuple:
-            return None
-        return valeur
-
-    def info(self):
-        return "Tuple de %s elements" % self.ntuple
-
-
-
-class VerifPostTreatment(VerifTypeTuple):
-
-    def __init__(self):
-        super(VerifPostTreatment, self).__init__(('TXM', 'TXM'))
-        self.cata_info = ""
-        self.physValeurs = ('Neutronics', 'Thermalhydraulics')
-        self.typeValeurs = ('MED', 'SUM', 'MIN', 'MAX', 'MEAN')
-
-    def info(self):
-        return tr(": verifie les \ntypes dans un tuple")
-
-    def infoErreurListe(self):
-        return tr("Les types entres ne sont pas permis")
-
-    def default(self, valeur):
-        return valeur
-
-    def isList(self):
-        return 1
-
-    def convertItem(self, valeur):
-        if len(valeur) != len(self.typeDesTuples):
-            raise ValueError(
-                tr("%s devrait etre de type  %s ") % (valeur, self.typeDesTuples))
-        ok = self.verifType(valeur)
-        if ok == 0:
-            raise ValueError(
-                tr("%s devrait etre de type  %s (%d)") % (valeur, self.typeDesTuples, ok))
-        if ok < 0:
-            raise ValueError(
-                tr("%s devrait etre dans %s ") % (valeur[1], self.typeValeurs))
-        return valeur
-
-    def verifItem(self, valeur):
-        try:
-            if len(valeur) != len(self.typeDesTuples):
-                return 0
-            ok = self.verifType(valeur)
-            if ok != 1:
-                return 0
-        except:
-            return 0
-        return 1
-
-    def verifType(self, valeur):
-        ok = 0
-        for v in valeur:
-            if type(v) == bytes or type(v) == str:
-                ok += 1
-        if ok == len(self.typeDesTuples):
-            if valeur[1] in self.typeValeurs:  # and valeur[1] in self.physValeurs:
-                return 1
-            return -1
-        return 0
-
-    def verif(self, valeur):
-        if type(valeur) in (list, tuple):
-            liste = list(valeur)
-            for val in liste:
-                if self.verifItem(val) != 1:
-                    return 0
-            return 1
-        return 0
-
-
-class myAssembly(ASSD):
-    pass
-
-
-class myTechnoData(ASSD):
-    pass
-
-
-class myRodBank(ASSD):
-    pass
-
-
-class myModelData(ASSD):
-    pass
-
-
-class myScenarioData(ASSD):
-    pass
-
-
-Assembly = OPER(nom='Assembly', sd_prod=myAssembly,
-                assembly_name=SIMP(statut='o', typ='TXM'),
-                assembly_type=SIMP(statut='o', typ='TXM', into=("UOX", "MOX", "REF")),
-                description=BLOC(condition='assembly_type != "REF"',
-                                 assembly_width=SIMP(statut='o', typ='R'),
-                                 radial_description=FACT(statut='o',
-                                                         clad_outer_radius=SIMP(statut='o', typ='R'),
-                                                         guide_tube_outer_radius=SIMP(statut='o', typ='R'),
-                                                         fuel_rod_pitch=SIMP(statut='o', typ='R'),
-                                                         nfuel_rods=SIMP(statut='o', typ='I')),
-                                 axial_description=FACT(statut='o',
-                                                        active_length_start=SIMP(statut='o', typ='R'),
-                                                        active_length_end=SIMP(statut='o', typ='R')),
-                                 grids=FACT(statut='o',
-                                            mixing=FACT(statut='o',
-                                                        positions=SIMP(
-                                                            statut='f', typ='R', max="**"),
-                                                        size=SIMP(statut='o', typ='R')),
-                                            non_mixing=FACT(statut='o',
-                                                            positions=SIMP(
-                                                                statut='f', typ='R', max='**'),
-                                                            size=SIMP(statut='o', typ='R')),
-                                            )
-                                 )
-                )
-
-
-RodBank = OPER(nom="RodBank", sd_prod=myRodBank,
-               rodbank_name=SIMP(statut='o', typ='TXM'),
-               step_height=SIMP(statut='o', typ='R'),
-               nsteps=SIMP(statut='o', typ='I'))
-
-
-def add_lr_refl(ass_list):
-    return ["RW"] + ass_list + ["RE"]
-
-
-def add_tb_refl(ass_list):
-    return ["RS"] + ass_list + ["RN"]
-
-
-def generate_ass_map(nass_list):
-    xsym_list = [a for a in 'ABCDEFGHJKLNPRSTUVWXYZ']
-    xsym_list.reverse()
-    ysym_list = ["%02d" % i for i in range(NMIN_ASSEMBLY, NMAX_ASSEMBLY+1)]
-    ysym_list.reverse()
-    def_xaxis = {}
-    def_yaxis = {}
-    for n in range(NMIN_ASSEMBLY, NMAX_ASSEMBLY+1):
-        def_xaxis[n] = add_lr_refl(xsym_list[-n:])
-        def_yaxis[n] = add_tb_refl(ysym_list[-n:])
-
-    dico = {}
-    #for n in nass_list:
-    for n in (6,) :
-        dico['assembly_map_%d' % n] = BLOC(condition="nb_assembly==%d" % n,
-                                           xaxis=SIMP(statut='o',
-                                                      typ='TXM',
-                                                      min=n+2, max=n+2,
-                                                      defaut=def_xaxis[n],),
-                                                      #defaut=def_xaxis[n],
-                                                      #nomXML='xaxis'+str(n)),
-                                           yaxis=SIMP(statut='o',
-                                                      typ='TXM',
-                                                      min=n+2, max=n+2,
-                                                      defaut=def_yaxis[n]),
-                                           assembly_map=SIMP(statut="o",
-                                                             typ=Matrice(nbLigs=n+2,
-                                                                         nbCols=n+2,
-                                                                         #valSup=1,
-                                                                         #valMin=-1,
-                                                                         #typElt='TXM',  # ici c'est le nom de l'assemblage
-                                                                         typElt=myAssembly,  # ici c'est le nom de l'assemblage
-                                                                         listeHeaders=None),
-                                                              ),
-                                           rod_map=SIMP(statut="o",
-                                                        typ=Matrice(nbLigs=n+2,
-                                                                    nbCols=n+2,
-                                                                    valSup=1,
-                                                                    valMin=-1,
-                                                                    typElt='TXM',  # ici c'est le nom de l'assemblage
-                                                                    listeHeaders=None),
-                                                        defaut=(n+2)*[(n+2)*['.']]))
-
-    return dico
-
-
-Techno_data = OPER(nom='Techno_data', sd_prod=myTechnoData,
-                   assembly_list=SIMP(statut='o', typ=myAssembly, min=1, max="**"),  # à resorber quand on mettra dans la Matrice
-                   rodbank_list=SIMP(statut='o', typ=myRodBank, min=0, max="**"),  # idem
-                   radial_description=FACT(statut='o',
-                                           nb_assembly=SIMP(statut='o', typ='I', into=list(range(NMIN_ASSEMBLY, NMAX_ASSEMBLY))),
-                                           **(generate_ass_map(range(NMIN_ASSEMBLY, NMAX_ASSEMBLY)))
-                                           ),  # Radial_Description
-                   axial_description=FACT(statut='o',
-                                          lower_refl_size=SIMP(statut='o', typ='R'),
-                                          upper_refl_size=SIMP(statut='o', typ='R'),
-                                          ),
-                   nominal_power=SIMP(statut='o', typ='R'),
-                   fuel_power_fraction=SIMP(statut='o', typ='R'),
-                   )  # Techno data
-
-Model_data = OPER(nom='Model_data', sd_prod=myModelData,
-                  physics=SIMP(statut='o', typ='TXM', into=(
-                      'Neutronics', 'Thermalhydraulics')),
-                  scale=SIMP(statut='o', typ='TXM', into=(
-                      'system', 'component', 'local')),
-                  b_neutro_compo=BLOC(condition='physics=="Neutronics" and scale=="component"',
-                                      codeNeutro=SIMP(statut='o', typ='TXM', into=('COCAGNE', 'APOLLO3')),
-                                      radial_meshingNeutro=FACT(statut='o',
-                                                          flux_solver=SIMP(statut='o', typ='TXM', into=('subdivision', 'pin-by-pin')),
-                                                          b_flux_subdivision=BLOC(condition='flux_solver=="subdivision"',
-                                                                                  flux_subdivision=SIMP(statut='o', typ='I')),
-                                                          feedback_solver=SIMP(statut='o', typ='TXM', into=('subdivision', 'pin-by-pin')),
-                                                          b_feedback_subdivision=BLOC(condition='feedback_solver=="subdivision"',
-                                                                                      feedback_subdivision=SIMP(statut='o', typ='I')))),
-                  b_thermo_compo=BLOC(condition='physics=="Thermalhydraulics" and scale=="component"',
-                                      code=SIMP(statut='o', typ='TXM', into=('THYC', 'CATHARE3', 'FLICA4')),
-                                      radial_meshing=FACT(statut='o',
-                                                          fluid=SIMP(statut='o', typ='TXM', into=('subdivision', 'subchannel')),
-                                                          b_fluid_subdivision=BLOC(condition='fluid=="subdivision"',
-                                                                                   fluid_subdivision=SIMP(statut='o', typ='I')),
-                                                          pellet=SIMP(statut='o', typ='I'),
-                                                          clad=SIMP(statut='o', typ='I'))),
-                  b_scale_compo=BLOC(condition='scale=="component"',
-                                     axial_meshing=FACT(statut='o',
-                                                        lower_refl=SIMP(statut='o', typ='I'),
-                                                        fuel=SIMP(statut='o', typ='I'),
-                                                        upper_refl=SIMP(statut='o', typ='I'))),
-                  b_scale_local=BLOC(condition='scale=="local"',
-                                     mesh_file=SIMP(statut='o', typ='Fichier')),
-                  )
-
-
-Scenario_data = OPER(nom='Scenario_data', sd_prod=myScenarioData,
-                     initial_power=SIMP(statut='o', typ='R', val_min=0., defaut=100.),
-                     initial_power_unit=SIMP(statut='o', typ='TXM',
-                                             into=('% Nominal power', 'W'),
-                                             defaut ='% Nominal power',),
-                     initial_rod_positions=SIMP(statut='o',
-                                                typ=Tuple(2),
-                                                validators=VerifTypeTuple(['TXM', 'I']),
-                                                ang="Type@label, position (e.g. RodBank@RB, 0)",
-                                                max='**'),
-                     scenario_type=SIMP(statut='o',
-                                        typ='TXM',
-                                        into=['RIA']),
-                     b_ria=BLOC(condition='scenario_type=="RIA"',
-                                ejected_rod=SIMP(statut='o',
-                                                 typ='TXM'),
-                                rod_position_program=SIMP(statut='o',
-                                                          typ=Tuple(2),
-                                                          validators=VerifTypeTuple(['R', 'I']),
-                                                          max='**'),
-                                ),
-                     post_processing=SIMP(statut='f',
-                                          typ=Tuple(2),
-                                          validators=VerifPostTreatment(),
-                                          max='**'),
-                     )
diff --git a/Poc/cdm_helpers.py b/Poc/cdm_helpers.py
deleted file mode 100644 (file)
index f09e022..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-try:
-    import cataPocRN_driver as drv
-except ImportError:
-    raise Exception("This module requires the Common Data Model Driver (cata_CSAndCPS_driver module)")
-
-def getMainEntities(wkflDataset,typeName,sdName=None):
-    cdm  = wkflDataset.step_Essai
-    _typename='T_'+typeName
-    if sdName != None :
-       return [c for c in cdm[:] if ( isinstance(c,getattr(drv,_typename)) and (c.sdName == sdName) )]
-    else:
-       return [c for c in cdm[:] if   isinstance(c,getattr(drv,_typename)) ]
-
-
-#Si les attributs ne sont pas multiple values
-def getMultipleAttr(e,attributename):
-    if attributename.count('.') != 0:
-        pIndex=attributename.index('.')
-        # print("--------",attributename[0:pIndex],"     ",attributename[pIndex+1:],"------------")
-        return getMultipleAttr(getattr(e,attributename[0:pIndex]),attributename[pIndex+1:])
-    else:
-       # print("+++++++++", getattr(e,attributename), type(getattr(e,attributename)) )
-       return getattr(e,attributename)
-
-def getFilteredEntities(element,attributename=None,attributevalue=None):
-#    print("getFilteredEntities(element,attributename=None,attributevalue=None):",element,attributename,attributevalue)
-    if attributename != None :
-      return [e for e in element[:] if getMultipleAttr(e,attributename) == attributevalue]
-    else:
-      return element[:]
-
-
diff --git a/Poc/edg32.comm b/Poc/edg32.comm
deleted file mode 100644 (file)
index 211d5b0..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-
-REF=Assembly(assembly_name='REF',
-             assembly_type='REF',);
-
-U1=Assembly(assembly_name='U1',
-            assembly_type='UOX',
-            assembly_width=0.21504,
-            radial_description=_F(clad_outer_radius=0.00475,
-                                  guide_tube_outer_radius=0.006025,
-                                  fuel_rod_pitch=0.0126,
-                                  nfuel_rods=264,),
-            axial_description=_F(active_length_start=0.2,
-                                 active_length_end=1.5,),
-            grids=_F(mixing=_F(positions=(1.0807,),
-                               size=0.033,),
-                     non_mixing=_F(positions=(0.026,),
-                                   size=0.033,),),);
-
-RB=RodBank(rodbank_name='RB',
-           step_height=0.008,
-           nsteps=162,);
-
-techno_data=Techno_data(assembly_list=(REF,U1,),
-                        rodbank_list=(RB,),
-                        radial_description=_F(nb_assembly=6,
-                                              xaxis=('RW','F','E','D','C','B','A','RE',),
-                                              yaxis=('RS','06','05','04','03','02','01','RN',),
-                                              assembly_map=
-                                              (['REF','REF','REF','REF',
-                                                             'REF','REF','REF','REF'],['REF','REF','U1','U1','U1','U1',
-                                                             'REF','REF'],['REF','U1','U1','U1','U1','U1','U1','REF'],
-                                                             ['REF','U1','U1','U1','U1','U1','U1','REF'],['REF','U1',
-                                                             'U1','U1','U1','U1','U1','REF'],['REF','U1','U1','U1',
-                                                             'U1','U1','U1','REF'],['REF','REF','U1','U1','U1','U1',
-                                                             'REF','REF'],['REF','REF','REF','REF','REF','REF','REF',
-                                                             'REF'],),
-                                              rod_map=
-                                              (['#','#','#','#','#','#','#',
-                                                        '#'],['#','#','.','.','.','.','#','#'],['#','.','.','.','RB','.',
-                                                        '.','#'],['#','.','RB','.','.','.','.','#'],['#','.','.','.','.',
-                                                        'RB','.','#'],['#','.','.','RB','.','.','.','#'],['#','#','.','.',
-                                                        '.','.','#','#'],['#','#','#','#','#','#','#','#'],),),
-                        axial_description=_F(lower_refl_size=0.2,
-                                             upper_refl_size=0.2,),
-                        nominal_power=100000000.0,
-                        fuel_power_fraction=0.974,);
-
-neutro_model=Model_data(physics='Neutronics',
-                        scale='component',
-                        codeNeutro='COCAGNE',
-                        radial_meshingNeutro=_F(flux_solver='subdivision',
-                                                flux_subdivision=2,
-                                                feedback_solver='subdivision',
-                                                feedback_subdivision=1,),
-                        axial_meshing=_F(lower_refl=1,
-                                         fuel=21,
-                                         upper_refl=1,),);
-
-thermo_model=Model_data(physics='Thermalhydraulics',
-                        scale='component',
-                        code='THYC',
-                        radial_meshing=_F(fluid='subdivision',
-                                          fluid_subdivision=1,
-                                          pellet=8,
-                                          clad=2,),
-                        axial_meshing=_F(lower_refl=1,
-                                         fuel=40,
-                                         upper_refl=1,),);
-
-scenario_data=Scenario_data(initial_power=100.0,
-                            initial_power_unit='% Nominal power',
-                            initial_rod_positions=(('Rodbank@RB',162),('Rodcluster@B04',0)),
-                            scenario_type='RIA',
-                            ejected_rod='B04',
-                            rod_position_program=((0.0,0),(0.1,162)),
-                            post_processing=(('Fuel temperature@Thermalhydraulics','MAX'),('Neutronic power@Neutronics','SUM'),('Fuel temperature@Thermalhydraulics','MED')),);
-#VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE
-#CHECKSUM:7826a282bd2c99da86490d6dee3e0fd7  -:FIN CHECKSUM
\ No newline at end of file
diff --git a/Poc/edg32.comm.ref b/Poc/edg32.comm.ref
deleted file mode 100644 (file)
index 7d9a605..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-
-REF=Assembly(assembly_name='REF',
-             assembly_type='REF',);
-
-U1=Assembly(assembly_name='U1',
-            assembly_type='UOX',
-            assembly_width=0.21504,
-            radial_description=_F(clad_outer_radius=0.00475,
-                                  guide_tube_outer_radius=0.006025,
-                                  fuel_rod_pitch=0.0126,
-                                  nfuel_rods=264,),
-            axial_description=_F(active_length_start=0.2,
-                                 active_length_end=1.5,),
-            grids=_F(mixing=_F(positions=(1.0807,),
-                               size=0.033,),
-                     non_mixing=_F(positions=(0.026,),
-                                   size=0.033,),),);
-
-RB=RodBank(rodbank_name='RB',
-           step_height=0.008,
-           nsteps=162,);
-
-techno_data=Techno_data(assembly_list=(REF,U1,),
-                        rodbank_list=(RB,),
-                        radial_description=_F(nb_assembly=6,
-                                              xaxis=('RW','F','E','D','C','B','A','RE',),
-                                              yaxis=('RS','06','05','04','03','02','01','RN',),
-                                              assembly_map=
-                                              (['REF','REF','REF','REF',
-                                                             'REF','REF','REF','REF'],['REF','REF','U1','U1','U1','U1',
-                                                             'REF','REF'],['REF','U1','U1','U1','U1','U1','U1','REF'],
-                                                             ['REF','U1','U1','U1','U1','U1','U1','REF'],['REF','U1',
-                                                             'U1','U1','U1','U1','U1','REF'],['REF','U1','U1','U1',
-                                                             'U1','U1','U1','REF'],['REF','REF','U1','U1','U1','U1',
-                                                             'REF','REF'],['REF','REF','REF','REF','REF','REF','REF',
-                                                             'REF'],),
-                                              rod_map=
-                                              (['#','#','#','#','#','#','#',
-                                                        '#'],['#','#','.','.','.','.','#','#'],['#','.','.','.','RB','.',
-                                                        '.','#'],['#','.','RB','.','.','.','.','#'],['#','.','.','.','.',
-                                                        'RB','.','#'],['#','.','.','RB','.','.','.','#'],['#','#','.','.',
-                                                        '.','.','#','#'],['#','#','#','#','#','#','#','#'],),),
-                        axial_description=_F(lower_refl_size=0.2,
-                                             upper_refl_size=0.2,),
-                        nominal_power=100000000.0,
-                        fuel_power_fraction=0.974,);
-
-neutro_model=Model_data(physics='Neutronics',
-                        scale='component',
-                        code='COCAGNE',
-                        radial_meshing=_F(flux_solver='subdivision',
-                                          flux_subdivision=2,
-                                          feedback_solver='subdivision',
-                                          feedback_subdivision=1,),
-                        axial_meshing=_F(lower_refl=1,
-                                         fuel=21,
-                                         upper_refl=1,),);
-
-thermo_model=Model_data(physics='Thermalhydraulics',
-                        scale='component',
-                        code='THYC',
-                        radial_meshing=_F(fluid='subdivision',
-                                          fluid_subdivision=1,
-                                          pellet=8,
-                                          clad=2,),
-                        axial_meshing=_F(lower_refl=1,
-                                         fuel=40,
-                                         upper_refl=1,),);
-
-scenario_data=Scenario_data(initial_power=100.0,
-                            initial_power_unit='% Nominal power',
-                            initial_rod_positions=(('Rodbank@RB',162),('Rodcluster@B04',0)),
-                            scenario_type='RIA',
-                            ejected_rod='B04',
-                            rod_position_program=((0.0,0),(0.1,162)),
-                            post_processing=(('Fuel temperature@Thermalhydraulics','MAX'),('Neutronic power@Neutronics','SUM'),('Fuel temperature@Thermalhydraulics','MED')),);
-#VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE
-#CHECKSUM:5a186f50f4816d725e42d0b050a11764  -:FIN CHECKSUM
\ No newline at end of file
diff --git a/Poc/edg32WithAssemblyName.comm b/Poc/edg32WithAssemblyName.comm
deleted file mode 100644 (file)
index 38b82cf..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-
-REF=Assembly(assembly_name='REF',
-             assembly_type='REF',);
-
-U1=Assembly(assembly_name='U1',
-            assembly_type='UOX',
-            assembly_width=0.21504,
-            radial_description=_F(clad_outer_radius=0.00475,
-                                  guide_tube_outer_radius=0.006025,
-                                  fuel_rod_pitch=0.0126,
-                                  nfuel_rods=264,),
-            axial_description=_F(active_length_start=0.2,
-                                 active_length_end=1.5,),
-            grids=_F(mixing=_F(positions=(1.0807,),
-                               size=0.033,),
-                     non_mixing=_F(positions=(0.026,),
-                                   size=0.033,),),);
-
-RB=RodBank(rodbank_name='RB',
-           step_height=0.008,
-           nsteps=162,);
-
-techno_data=Techno_data(assembly_list=(REF,U1,),
-                        rodbank_list=(RB,),
-                        radial_description=_F(nb_assembly=6,
-                                              xaxis=('RW','F','E','D','C','B','A','RE',),
-                                              yaxis=('RS','06','05','04','03','02','01','RN',),
-                                              assembly_map=((REF,REF,REF,REF,REF,REF,REF,REF,),(REF,REF,U1,U1,U1,U1,REF,REF,),(REF,U1,U1,U1,U1,U1,U1,REF,),(REF,U1,U1,U1,U1,U1,REF,REF,),(REF,U1,U1,U1,U1,U1,U1,REF,),(REF,U1,U1,U1,U1,U1,REF,REF,),(REF,REF,U1,U1,U1,U1,REF,REF,),(REF,REF,REF,REF,REF,REF,REF,REF,),),
-                                              rod_map=
-                                              (['#','#','#','#','#','#','#',
-                                                        '#'],['#','#','.','.','.','.','#','#'],['#','.','.','.','RB','.',
-                                                        '.','#'],['#','.','RB','.','.','.','.','#'],['#','.','.','.','.',
-                                                        'RB','.','#'],['#','.','.','RB','.','.','.','#'],['#','#','.','.',
-                                                        '.','.','#','#'],['#','#','#','#','#','#','#','#'],),),
-                        axial_description=_F(lower_refl_size=0.2,
-                                             upper_refl_size=0.2,),
-                        nominal_power=100000000.0,
-                        fuel_power_fraction=0.974,);
-
-neutro_model=Model_data(physics='Neutronics',
-                        scale='component',
-                        codeNeutro='COCAGNE',
-                        radial_meshingNeutro=_F(flux_solver='subdivision',
-                                                flux_subdivision=2,
-                                                feedback_solver='subdivision',
-                                                feedback_subdivision=1,),
-                        axial_meshing=_F(lower_refl=1,
-                                         fuel=21,
-                                         upper_refl=1,),);
-
-thermo_model=Model_data(physics='Thermalhydraulics',
-                        scale='component',
-                        code='THYC',
-                        radial_meshing=_F(fluid='subdivision',
-                                          fluid_subdivision=1,
-                                          pellet=8,
-                                          clad=2,),
-                        axial_meshing=_F(lower_refl=1,
-                                         fuel=40,
-                                         upper_refl=1,),);
-
-scenario_data=Scenario_data(initial_power=100.0,
-                            initial_power_unit='% Nominal power',
-                            initial_rod_positions=(('Rodbank@RB',162),('Rodcluster@B04',0)),
-                            scenario_type='RIA',
-                            ejected_rod='B04',
-                            rod_position_program=((0.0,0),(0.1,162)),
-                            post_processing=(('Fuel temperature@Thermalhydraulics','MAX'),('Neutronic power@Neutronics','SUM'),('Fuel temperature@Thermalhydraulics','MED')),);
-#VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE
-#CHECKSUM:650687868fdfea444161002a5481615c  -:FIN CHECKSUM
\ No newline at end of file
diff --git a/Poc/essaiGetattr.py b/Poc/essaiGetattr.py
deleted file mode 100755 (executable)
index c2f786c..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2021   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
-#
-"""
-"""
-import sys,os
-import prefs
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..'))
-
-from InterfaceQT4 import eficas_go
-jdd = eficas_go.createFromDocumentAccas('cataPocRN.py','edg32.comm')
-
-
-monRodBank=jdd.RodBank[0]
-print ('MonObjet ', monRodBank, ' a pour nom', monRodBank.sdnom)
-print (monRodBank.rodbank_name)
-
-print ('on fait une erreur volontaire')
-try :
-  monRodBank=jdd.rodrank[0]
-except : pass
-
-monRodBank2=jdd.getEtapeByConceptName('RB')
-assert monRodBank2 == monRodBank
-
-
-techno=jdd.Techno_data[0]
-print (techno.assembly_list)
-print (techno.rodbank_list)
-try :
-  print (techno.toto)
-except : pass
-
-print (techno.radial_description)
-print (techno.radial_description.nb_assembly)
-print (techno.radial_description.xaxis)
-print (techno.radial_description.yaxis)
-print (techno.radial_description.assembly_map)
-print (techno.radial_description.assembly_map[0][3])
-
diff --git a/Poc/generateXML.py b/Poc/generateXML.py
deleted file mode 100755 (executable)
index d8fd33d..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2013   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
-#
-"""
-   Ce module sert a lancer EFICAS configure pour Meteo 
-"""
-# Modules Python
-# Modules Eficas
-import prefs
-name='prefs_'+prefs.code
-__import__(name)
-
-import sys
-import os
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'../..'))
-
-import prefs
-from InterfaceQT4 import eficas_go
-eficas_go.genereXML(code=prefs.code)
diff --git a/Poc/generateXSD.py b/Poc/generateXSD.py
deleted file mode 100755 (executable)
index ed55061..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2013   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
-#
-"""
-   Ce module sert a lancer EFICAS configure pour Meteo 
-"""
-# Modules Python
-# Modules Eficas
-import prefs
-name='prefs_'+prefs.code
-__import__(name)
-
-import sys
-import os
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'../..'))
-
-import prefs
-from InterfaceQT4 import eficas_go
-eficas_go.genereXSD(code=prefs.code)
diff --git a/Poc/metier.py b/Poc/metier.py
deleted file mode 100644 (file)
index fa4f1d7..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-
-def RodsWorthSetting(*args,**kwargs) :
-   print ('je suis dans RodsWorthSetting')
-   print ('je peux effectuer un traitement')
diff --git a/Poc/pocEssaiExecution.py b/Poc/pocEssaiExecution.py
deleted file mode 100644 (file)
index f6a47ef..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-import os, sys
-import prefs
-name='prefs_'+prefs.code
-__import__(name)
-from Accas import *
-from Noyau.N__F import _F
-
-print ('___________    Appel sans validation supplementaire ________________')
-print ('\n l appel a ete cree par eficas et donc est valide')
-from metier import *
-RodsWorthSetting(version='1.0.0',
-                 virtual_groups=_F(group_name='monG1',
-                                   value_def=('1','2','3',),),
-                 xenon_feedback='locked',
-                 cb='upstream_state',
-                 states=('s1','s2',),
-                 calcul_type='integral_worth',
-                 Integral_O='pas compris',
-                 Integral=_F(step_unit='inserted_steps',
-                             config=_F(key_config='k1',
-                                       value_def=1.0,),),);
-
-
-
-print ('\n\n')
-print ('___________    Appel avec validation supplementaire ________________')
-print ('\n l appel a ete cree manuellement')
-from InterfaceQT4.eficas_go import validateFonction
-RodsWorthSetting=validateFonction(RodsWorthSetting)
-
-print ('fonction appel valide')
-print ('____________________')
-RodsWorthSetting(version='1.0.0',
-                 virtual_groups=_F(group_name='monG1',
-                                   value_def=('1','2','3',),),
-                 xenon_feedback='locked',
-                 cb='upstream_state',
-                 states=('s1','s2',),
-                 calcul_type='integral_worth',
-                 Integral_O='pas compris',
-                 Integral=_F(step_unit='inserted_steps',
-                             config=_F(key_config='k1',
-                                       value_def=1.0,),),);
-
-print ('fonction appel invalide')
-print ('____________________')
-RodsWorthSetting(monArgument='je ne passe pas les bons arguments')
diff --git a/Poc/prefs.py b/Poc/prefs.py
deleted file mode 100644 (file)
index 540898b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2007-2012   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
-#
-code="Essai" 
-import sys, os
-if os.path.dirname(os.path.abspath(__file__)) not in sys.path :
-   sys.path.insert(0,os.path.dirname(os.path.abspath(__file__)))
diff --git a/Poc/prefs_Essai.py b/Poc/prefs_Essai.py
deleted file mode 100644 (file)
index 8d1bc00..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-#            maConfiguration MANAGEMENT OF EDF VERSION
-# ======================================================================
-# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
-# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
-# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
-# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
-# (AT YOUR OPTION) ANY LATER VERSION.
-#
-# THIS PROGRAM 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
-# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
-#
-# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
-# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
-#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
-#
-#
-# ======================================================================
-
-import os,sys
-# repIni sert a localiser le fichier editeur.ini
-# Obligatoire
-repIni=os.path.dirname(os.path.abspath(__file__))
-INSTALLDIR=os.path.join(repIni,'..')
-sys.path[:0]=[INSTALLDIR]
-
-
-# lang indique la langue utilisee pour les chaines d'aide : fr ou ang
-lang='fr'
-
-# Codage des strings qui accepte les accents (en remplacement de 'ascii')
-encoding='iso-8859-1'
-
-#
-#typeDeCata='XML'
-catalogues=(
-    ('Essai','Poc',os.path.join(repIni,'cataPoc.py'),'python','python'),
-)
-#nombreDeBoutonParLigne=4
-simpleClic=True
-#closeFrameRechercheCommande=True
-boutonDsMenuBar=False
-#closeArbre=True
-afficheListesPliees=False
-#withXSD=True
-afficheCommandesPliees = False
-#dumpXSD=True
-#afficheIhm=False
diff --git a/Poc/qtEficasEssai.py b/Poc/qtEficasEssai.py
deleted file mode 100755 (executable)
index 349334a..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2013   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
-#
-"""
-   Ce module sert a lancer EFICAS configure pour MAP 
-"""
-# Modules Python
-# Modules Eficas
-import prefs
-name='prefs_'+prefs.code
-__import__(name)
-
-import os, sys
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..'))
-
-import prefs
-from InterfaceQT4 import eficas_go
-print (prefs.code)
-eficas_go.lanceEficas(code=prefs.code)
diff --git a/Poc/raw/__init__.py b/Poc/raw/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/Poc/readExemple.py b/Poc/readExemple.py
deleted file mode 100644 (file)
index 41453b2..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-from cataPocRN_driver import *
-import cataPocRN_driver as m 
-import cdm_helpers as hlp
-
-#pyxb.GlobalValidationConfig._setContentInfluencesGeneration(pyxb.GlobalValidationConfig.ALWAYS)
-#pyxb.GlobalValidationConfig._setInvalidElementInContent(pyxb.GlobalValidationConfig.RAISE_EXCEPTION)
-#pyxb.GlobalValidationConfig._setOrphanElementInContent(pyxb.GlobalValidationConfig.RAISE_EXCEPTION)
-
-jdd = CreateFromDocument(open('edg32.xml').read())
-print (jdd.toDOM().toprettyxml())
-
-#Helper pour trier les PROC du premier niveau
-# il est possible de filter par le nom aussi
-technoList=hlp.getMainEntities(jdd,'Techno_data')
-techno1=technoList[0]
-
-#Accès direct sans le helper
-techno2=jdd.step_Essai[3]
-assert(techno1==techno2)
-techno=techno1
-
-techno.assembly_list
-techno.rodbank_list
-techno.radial_description.nb_assembly
-techno.radial_description.xaxis
-techno.radial_description.yaxis
-techno.radial_description.assembly_map.line[:]
-techno.radial_description.assembly_map.line[0]
-techno.radial_description.assembly_map.line[1]
-techno.radial_description.assembly_map.line[1][3]
-print(techno.toDOM().toprettyxml())
-
-monAssembly1=T_Assembly('REF','REF')
-#Sans élément racine, il faut spécifier un element_name
-print(monAssembly1.toDOM(element_name='essai').toprettyxml())
-#Génère une erreur attendue :
-try:
-   monAssembly1=T_Assembly('REF','REFP')
-except BaseException as e:
-   print('Cette erreur est voulue...',e)
-
-#Avec l'élément racine, plus besoin de spécifier un element_name
-m.Essai(monAssembly1).toxml()
-print(m.Essai(monAssembly1).toDOM().toprettyxml())
-
-l1=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l2=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l3=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l4=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l5=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l6=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l7=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l8=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-
-#On construit un assembly_map incomplet
-ma=m.T_assembly_map(l1,l2,l3,l4,l5,l6,l7)
-try:
-  print (ma.toDOM(element_name='Essai'))
-  ma.validateBinding()
-except BaseException as e:
-   print('Cette erreur est voulue...',e)
-
-ma=m.T_assembly_map(l1,l2,l3,l4,l5,l6,l7,l8)
-print (ma.toDOM(element_name='Essai'))
-
-ll1=m.T_rod_map_line(['#','#','#','#','#','#','#','#'])
-ll2=ll1
-ll3=ll1
-ll4=ll1
-ll5=ll1
-ll6=ll1
-ll7=ll1
-ll8=ll1
-ro=m.T_rod_map(ll1,ll2,ll3,ll4,ll5,ll6,ll7,ll8)
-print (ro.toDOM(element_name='essai2').toprettyxml())
-
-nb=m.T_nb_assembly(6)
-xa=m.T_xaxis(('RW', 'F', 'E', 'D', 'C', 'B', 'A', 'RE'))
-ya=m.T_yaxis(['RS', '06', '05', '04', '03', '02', '01', 'RN'])
-
diff --git a/Poc/readExempleWithAssemblyName.py b/Poc/readExempleWithAssemblyName.py
deleted file mode 100644 (file)
index e2be516..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-from cataPocRNWithAssemblyName_driver import *
-import cataPocRNWithAssemblyName_driver as m 
-
-pyxb.GlobalValidationConfig._setContentInfluencesGeneration(pyxb.GlobalValidationConfig.ALWAYS)
-pyxb.GlobalValidationConfig._setInvalidElementInContent(pyxb.GlobalValidationConfig.RAISE_EXCEPTION)
-pyxb.GlobalValidationConfig._setOrphanElementInContent(pyxb.GlobalValidationConfig.RAISE_EXCEPTION)
-
-jdd = CreateFromDocument(open('edg32WithAssemblyName.xml').read())
-print (jdd.toDOM().toprettyxml())
-
-techno=jdd.step_Essai[3]
-techno.assembly_list
-techno.rodbank_list
-techno.radial_description.nb_assembly
-techno.radial_description.xaxis
-techno.radial_description.yaxis
-techno.radial_description.assembly_map.line[:]
-techno.radial_description.assembly_map.line[0]
-techno.radial_description.assembly_map.line[1]
-techno.radial_description.assembly_map.line[1][3]
-print(techno.toDOM().toprettyxml())
-
-monAssembly1=T_Assembly('REF','REF')
-#Sans élément racine, il faut spécifier un element_name
-print(monAssembly1.toDOM(element_name='essai').toprettyxml())
-#Génère une erreur attendue :
-try:
-   monAssembly1=T_Assembly('REF','REFP')
-except BaseException as e:
-   print('Cette erreur est voulue...',e)
-
-#Avec l'élément racine, plus besoin de spécifier un element_name
-m.Essai(monAssembly1).toxml()
-print(m.Essai(monAssembly1).toDOM().toprettyxml())
-
-l1=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l2=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l3=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l4=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l5=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l6=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l7=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-l8=m.T_assembly_map_line(('REF','REF','REF','REF','REF','REF','REF','REF'))
-
-#On construit un assembly_map incomplet
-ma=m.T_assembly_map(l1,l2,l3,l4,l5,l6,l7)
-try:
-  print (ma.toDOM(element_name='Essai'))
-  ma.validateBinding()
-except BaseException as e:
-   print('Cette erreur est voulue...',e)
-
-ma=m.T_assembly_map(l1,l2,l3,l4,l5,l6,l7,l8)
-print (ma.toDOM(element_name='Essai'))
-
-ll1=m.T_rod_map_line(['#','#','#','#','#','#','#','#'])
-ll2=ll1
-ll3=ll1
-ll4=ll1
-ll5=ll1
-ll6=ll1
-ll7=ll1
-ll8=ll1
-ro=m.T_rod_map(ll1,ll2,ll3,ll4,ll5,ll6,ll7,ll8)
-print (ro.toDOM(element_name='essai2').toprettyxml())
-
-nb=m.T_nb_assembly(6)
-xa=m.T_xaxis(('RW', 'F', 'E', 'D', 'C', 'B', 'A', 'RE'))
-ya=m.T_yaxis(['RS', '06', '05', '04', '03', '02', '01', 'RN'])
-
-jdd = CreateFromDocument(open('edg32.xml').read())
-print (jdd.toDOM().toprettyxml())
-
diff --git a/ReacteurNumerique/cataPocRN.py b/ReacteurNumerique/cataPocRN.py
deleted file mode 100644 (file)
index 4b739b5..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2008-2018 EDF R&D
-#
-# This file is part of SALOME ADAO module
-#
-# 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
-import os, re
-import Accas
-from Accas import *
-monFichier=os.path.abspath(__file__)
-
-JdC = JDC_CATA (
-    code='Essai'
-    )
-VERSION_CATALOGUE='V_0'
-
-
-class Matrice:
-  def __init__(self,nbLigs=None,nbCols=None,methodeCalculTaille=None,formatSortie="ligne",valSup=None,valMin=None,structure=None,typElt='R',typEltInto=None, listeHeaders=None):
-      self.nbLigs=nbLigs
-      self.nbCols=nbCols
-      self.methodeCalculTaille=methodeCalculTaille
-      self.formatSortie=formatSortie
-      self.valSup=valSup
-      self.valMin=valMin
-      self.structure=structure
-      self.typElt=typElt
-      self.listeHeaders=listeHeaders
-      self.typEltInto=typEltInto
-
-  def __convert__(self,valeur):
-    # Attention ne verifie pas grand chose
-    if type(valeur) != types.ListType :
-      return None
-    return valeur
-
-  def info(self):
-      return "Matrice %s x %s" % (self.nbLigs, self.nbCols)
-
-      __repr__=info
-      __str__=info
-
-
-
-Techno_Data = PROC( nom = 'Techno_Data',
-    Radial_Description = FACT (statut ='o',
-        assembly_width = SIMP (statut='o', typ = 'R'),
-        assembly_map = SIMP ( statut = "o",
-            typ = Matrice(nbLigs=8,
-                          nbCols=8,
-                          valSup=1,
-                          valMin=-1,
-                          typElt='TXM',
-                          typEltInto=('U1','R1'),
-                          listeHeaders=None),
-          defaut=(['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'])
-                          ),
-
-    ), # Radial_Description
-        #road_map = SIMP ( statut = "o",
-        #    typ = Matrice(nbLigs=8,
-        #                  nbCols=8,
-        #                  valSup=1,
-        #                  valMin=-1,
-        #                  ),),
-        
-    Rod_Description = FACT (statut ='o',
-        RB=FACT( statut ='o',
-           step_height =  SIMP (statut='o', typ = 'R'),
-           nsteps = SIMP (statut='o', typ = 'I',),
-         ),
-    ), # Rod_Description
-   Axial_Description = FACT(statut ='o',
-       lower_refl_size =  SIMP (statut='o', typ = 'R'),
-       fuel_size =  SIMP (statut='o', typ = 'R'),
-       upper_ref =  SIMP (statut='o', typ = 'R'),
-    ),
-   Grids = FACT (statut ='o',
-       mixing = FACT(statut ='o',
-         positions =  SIMP (statut='o', typ = 'R'),
-         size =  SIMP (statut='o', typ = 'R'),
-       ),
-       non_mixing = FACT( statut ='o',
-         positions =  SIMP (statut='o', typ = 'R'),
-         size =  SIMP (statut='o', typ = 'R'),
-       ),
-    ),
-    Nominal_Power =  SIMP (statut='o', typ = 'R'),
-    
-    
-) # Techno data
-
-
diff --git a/ReacteurNumerique/cataPocRNWithAssemblyName.py b/ReacteurNumerique/cataPocRNWithAssemblyName.py
deleted file mode 100644 (file)
index 4fdb2de..0000000
+++ /dev/null
@@ -1,295 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2008-2018 EDF R&D
-#
-# This file is part of SALOME ADAO module
-#
-# 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
-import os
-from Accas import OPER, BLOC, FACT, SIMP, ASSD, JDC_CATA, VerifTypeTuple, Matrice
-from Extensions.i18n import tr
-import types
-monFichier = os.path.abspath(__file__)
-
-JdC = JDC_CATA(
-    code='Essai'
-)
-VERSION_CATALOGUE = 'V_0'
-
-
-NMIN_ASSEMBLY = 1
-NMAX_ASSEMBLY = 18
-
-
-class Tuple:
-    def __init__(self, ntuple):
-        self.ntuple = ntuple
-
-    def __convert__(self, valeur):
-        if len(valeur) != self.ntuple:
-            return None
-        return valeur
-
-    def info(self):
-        return "Tuple de %s elements" % self.ntuple
-
-
-
-class VerifPostTreatment(VerifTypeTuple):
-
-    def __init__(self):
-        super(VerifPostTreatment, self).__init__(('TXM', 'TXM'))
-        self.cata_info = ""
-        self.physValeurs = ('Neutronics', 'Thermalhydraulics')
-        self.typeValeurs = ('MED', 'SUM', 'MIN', 'MAX', 'MEAN')
-
-    def info(self):
-        return tr(": verifie les \ntypes dans un tuple")
-
-    def infoErreurListe(self):
-        return tr("Les types entres ne sont pas permis")
-
-    def default(self, valeur):
-        return valeur
-
-    def isList(self):
-        return 1
-
-    def convertItem(self, valeur):
-        if len(valeur) != len(self.typeDesTuples):
-            raise ValueError(
-                tr("%s devrait etre de type  %s ") % (valeur, self.typeDesTuples))
-        ok = self.verifType(valeur)
-        if ok == 0:
-            raise ValueError(
-                tr("%s devrait etre de type  %s (%d)") % (valeur, self.typeDesTuples, ok))
-        if ok < 0:
-            raise ValueError(
-                tr("%s devrait etre dans %s ") % (valeur[1], self.typeValeurs))
-        return valeur
-
-    def verifItem(self, valeur):
-        try:
-            if len(valeur) != len(self.typeDesTuples):
-                return 0
-            ok = self.verifType(valeur)
-            if ok != 1:
-                return 0
-        except:
-            return 0
-        return 1
-
-    def verifType(self, valeur):
-        ok = 0
-        for v in valeur:
-            if type(v) == bytes or type(v) == str:
-                ok += 1
-        if ok == len(self.typeDesTuples):
-            if valeur[1] in self.typeValeurs:  # and valeur[1] in self.physValeurs:
-                return 1
-            return -1
-        return 0
-
-    def verif(self, valeur):
-        if type(valeur) in (list, tuple):
-            liste = list(valeur)
-            for val in liste:
-                if self.verifItem(val) != 1:
-                    return 0
-            return 1
-        return 0
-
-
-class myAssembly(ASSD):
-    pass
-
-
-class myTechnoData(ASSD):
-    pass
-
-
-class myRodBank(ASSD):
-    pass
-
-
-class myModelData(ASSD):
-    pass
-
-
-class myScenarioData(ASSD):
-    pass
-
-
-Assembly = OPER(nom='Assembly', sd_prod=myAssembly,
-                assembly_name=SIMP(statut='o', typ='TXM'),
-                assembly_type=SIMP(statut='o', typ='TXM', into=("UOX", "MOX", "REF")),
-                description=BLOC(condition='assembly_type != "REF"',
-                                 assembly_width=SIMP(statut='o', typ='R'),
-                                 radial_description=FACT(statut='o',
-                                                         clad_outer_radius=SIMP(statut='o', typ='R'),
-                                                         guide_tube_outer_radius=SIMP(statut='o', typ='R'),
-                                                         fuel_rod_pitch=SIMP(statut='o', typ='R'),
-                                                         nfuel_rods=SIMP(statut='o', typ='I')),
-                                 axial_description=FACT(statut='o',
-                                                        active_length_start=SIMP(statut='o', typ='R'),
-                                                        active_length_end=SIMP(statut='o', typ='R')),
-                                 grids=FACT(statut='o',
-                                            mixing=FACT(statut='o',
-                                                        positions=SIMP(
-                                                            statut='f', typ='R', max="**"),
-                                                        size=SIMP(statut='o', typ='R')),
-                                            non_mixing=FACT(statut='o',
-                                                            positions=SIMP(
-                                                                statut='f', typ='R', max='**'),
-                                                            size=SIMP(statut='o', typ='R')),
-                                            )
-                                 )
-                )
-
-
-RodBank = OPER(nom="RodBank", sd_prod=myRodBank,
-               rodbank_name=SIMP(statut='o', typ='TXM'),
-               step_height=SIMP(statut='o', typ='R'),
-               nsteps=SIMP(statut='o', typ='I'))
-
-
-def add_lr_refl(ass_list):
-    return ["RW"] + ass_list + ["RE"]
-
-
-def add_tb_refl(ass_list):
-    return ["RS"] + ass_list + ["RN"]
-
-
-def generate_ass_map(nass_list):
-    xsym_list = [a for a in 'ABCDEFGHJKLNPRSTUVWXYZ']
-    xsym_list.reverse()
-    ysym_list = ["%02d" % i for i in range(NMIN_ASSEMBLY, NMAX_ASSEMBLY+1)]
-    ysym_list.reverse()
-    def_xaxis = {}
-    def_yaxis = {}
-    for n in range(NMIN_ASSEMBLY, NMAX_ASSEMBLY+1):
-        def_xaxis[n] = add_lr_refl(xsym_list[-n:])
-        def_yaxis[n] = add_tb_refl(ysym_list[-n:])
-
-    dico = {}
-    #for n in nass_list:
-    for n in (6,) :
-        dico['assembly_map_%d' % n] = BLOC(condition="nb_assembly==%d" % n,
-                                           xaxis=SIMP(statut='o',
-                                                      typ='TXM',
-                                                      min=n+2, max=n+2,
-                                                      defaut=def_xaxis[n],),
-                                                      #defaut=def_xaxis[n],
-                                                      #nomXML='xaxis'+str(n)),
-                                           yaxis=SIMP(statut='o',
-                                                      typ='TXM',
-                                                      min=n+2, max=n+2,
-                                                      defaut=def_yaxis[n]),
-                                           assembly_map=SIMP(statut="o",
-                                                             typ=Matrice(nbLigs=n+2,
-                                                                         nbCols=n+2,
-                                                                         #valSup=1,
-                                                                         #valMin=-1,
-                                                                         #typElt='TXM',  # ici c'est le nom de l'assemblage
-                                                                         typElt=myAssembly,  # ici c'est le nom de l'assemblage
-                                                                         listeHeaders=None),
-                                                              ),
-                                           rod_map=SIMP(statut="o",
-                                                        typ=Matrice(nbLigs=n+2,
-                                                                    nbCols=n+2,
-                                                                    valSup=1,
-                                                                    valMin=-1,
-                                                                    typElt='TXM',  # ici c'est le nom de l'assemblage
-                                                                    listeHeaders=None),
-                                                        defaut=(n+2)*[(n+2)*['.']]))
-
-    return dico
-
-
-Techno_data = OPER(nom='Techno_data', sd_prod=myTechnoData,
-                   assembly_list=SIMP(statut='o', typ=myAssembly, min=1, max="**"),  # à resorber quand on mettra dans la Matrice
-                   rodbank_list=SIMP(statut='o', typ=myRodBank, min=0, max="**"),  # idem
-                   radial_description=FACT(statut='o',
-                                           nb_assembly=SIMP(statut='o', typ='I', into=list(range(NMIN_ASSEMBLY, NMAX_ASSEMBLY))),
-                                           **(generate_ass_map(range(NMIN_ASSEMBLY, NMAX_ASSEMBLY)))
-                                           ),  # Radial_Description
-                   axial_description=FACT(statut='o',
-                                          lower_refl_size=SIMP(statut='o', typ='R'),
-                                          upper_refl_size=SIMP(statut='o', typ='R'),
-                                          ),
-                   nominal_power=SIMP(statut='o', typ='R'),
-                   fuel_power_fraction=SIMP(statut='o', typ='R'),
-                   )  # Techno data
-
-Model_data = OPER(nom='Model_data', sd_prod=myModelData,
-                  physics=SIMP(statut='o', typ='TXM', into=(
-                      'Neutronics', 'Thermalhydraulics')),
-                  scale=SIMP(statut='o', typ='TXM', into=(
-                      'system', 'component', 'local')),
-                  b_neutro_compo=BLOC(condition='physics=="Neutronics" and scale=="component"',
-                                      codeNeutro=SIMP(statut='o', typ='TXM', into=('COCAGNE', 'APOLLO3')),
-                                      radial_meshingNeutro=FACT(statut='o',
-                                                          flux_solver=SIMP(statut='o', typ='TXM', into=('subdivision', 'pin-by-pin')),
-                                                          b_flux_subdivision=BLOC(condition='flux_solver=="subdivision"',
-                                                                                  flux_subdivision=SIMP(statut='o', typ='I')),
-                                                          feedback_solver=SIMP(statut='o', typ='TXM', into=('subdivision', 'pin-by-pin')),
-                                                          b_feedback_subdivision=BLOC(condition='feedback_solver=="subdivision"',
-                                                                                      feedback_subdivision=SIMP(statut='o', typ='I')))),
-                  b_thermo_compo=BLOC(condition='physics=="Thermalhydraulics" and scale=="component"',
-                                      code=SIMP(statut='o', typ='TXM', into=('THYC', 'CATHARE3', 'FLICA4')),
-                                      radial_meshing=FACT(statut='o',
-                                                          fluid=SIMP(statut='o', typ='TXM', into=('subdivision', 'subchannel')),
-                                                          b_fluid_subdivision=BLOC(condition='fluid=="subdivision"',
-                                                                                   fluid_subdivision=SIMP(statut='o', typ='I')),
-                                                          pellet=SIMP(statut='o', typ='I'),
-                                                          clad=SIMP(statut='o', typ='I'))),
-                  b_scale_compo=BLOC(condition='scale=="component"',
-                                     axial_meshing=FACT(statut='o',
-                                                        lower_refl=SIMP(statut='o', typ='I'),
-                                                        fuel=SIMP(statut='o', typ='I'),
-                                                        upper_refl=SIMP(statut='o', typ='I'))),
-                  b_scale_local=BLOC(condition='scale=="local"',
-                                     mesh_file=SIMP(statut='o', typ='Fichier')),
-                  )
-
-
-Scenario_data = OPER(nom='Scenario_data', sd_prod=myScenarioData,
-                     initial_power=SIMP(statut='o', typ='R', val_min=0., defaut=100.),
-                     initial_power_unit=SIMP(statut='o', typ='TXM',
-                                             into=('% Nominal power', 'W'),
-                                             defaut ='% Nominal power',),
-                     initial_rod_positions=SIMP(statut='o',
-                                                typ=Tuple(2),
-                                                validators=VerifTypeTuple(['TXM', 'I']),
-                                                ang="Type@label, position (e.g. RodBank@RB, 0)",
-                                                max='**'),
-                     scenario_type=SIMP(statut='o',
-                                        typ='TXM',
-                                        into=['RIA']),
-                     b_ria=BLOC(condition='scenario_type=="RIA"',
-                                ejected_rod=SIMP(statut='o',
-                                                 typ='TXM'),
-                                rod_position_program=SIMP(statut='o',
-                                                          typ=Tuple(2),
-                                                          validators=VerifTypeTuple(['R', 'I']),
-                                                          max='**'),
-                                ),
-                     post_processing=SIMP(statut='f',
-                                          typ=Tuple(2),
-                                          validators=VerifPostTreatment(),
-                                          max='**'),
-                     )
diff --git a/ReacteurNumerique/cata_MatriceColoree.py b/ReacteurNumerique/cata_MatriceColoree.py
new file mode 100644 (file)
index 0000000..1afbeac
--- /dev/null
@@ -0,0 +1,293 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2008-2018 EDF R&D
+#
+# This file is part of SALOME ADAO module
+#
+# 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
+import os
+from Accas import OPER, BLOC, FACT, SIMP, ASSD, JDC_CATA, VerifTypeTuple, Matrice
+from Extensions.i18n import tr
+import types
+monFichier = os.path.abspath(__file__)
+
+JdC = JDC_CATA(
+    code='Essai'
+)
+VERSION_CATALOGUE = 'V_0'
+
+
+NMIN_ASSEMBLY = 1
+NMAX_ASSEMBLY = 18
+
+
+class Tuple:
+    def __init__(self, ntuple):
+        self.ntuple = ntuple
+
+    def __convert__(self, valeur):
+        if len(valeur) != self.ntuple:
+            return None
+        return valeur
+
+    def info(self):
+        return "Tuple de %s elements" % self.ntuple
+
+
+
+class VerifPostTreatment(VerifTypeTuple):
+
+    def __init__(self):
+        super(VerifPostTreatment, self).__init__(('TXM', 'TXM'))
+        self.cata_info = ""
+        self.physValeurs = ('Neutronics', 'Thermalhydraulics')
+        self.typeValeurs = ('MED', 'SUM', 'MIN', 'MAX', 'MEAN')
+
+    def info(self):
+        return tr(": verifie les \ntypes dans un tuple")
+
+    def infoErreurListe(self):
+        return tr("Les types entres ne sont pas permis")
+
+    def default(self, valeur):
+        return valeur
+
+    def isList(self):
+        return 1
+
+    def convertItem(self, valeur):
+        if len(valeur) != len(self.typeDesTuples):
+            raise ValueError(
+                tr("%s devrait etre de type  %s ") % (valeur, self.typeDesTuples))
+        ok = self.verifType(valeur)
+        if ok == 0:
+            raise ValueError(
+                tr("%s devrait etre de type  %s (%d)") % (valeur, self.typeDesTuples, ok))
+        if ok < 0:
+            raise ValueError(
+                tr("%s devrait etre dans %s ") % (valeur[1], self.typeValeurs))
+        return valeur
+
+    def verifItem(self, valeur):
+        try:
+            if len(valeur) != len(self.typeDesTuples):
+                return 0
+            ok = self.verifType(valeur)
+            if ok != 1:
+                return 0
+        except:
+            return 0
+        return 1
+
+    def verifType(self, valeur):
+        ok = 0
+        for v in valeur:
+            if type(v) == bytes or type(v) == str:
+                ok += 1
+        if ok == len(self.typeDesTuples):
+            if valeur[1] in self.typeValeurs:  # and valeur[1] in self.physValeurs:
+                return 1
+            return -1
+        return 0
+
+    def verif(self, valeur):
+        if type(valeur) in (list, tuple):
+            liste = list(valeur)
+            for val in liste:
+                if self.verifItem(val) != 1:
+                    return 0
+            return 1
+        return 0
+
+
+class myAssembly(ASSD):
+    pass
+
+
+class myTechnoData(ASSD):
+    pass
+
+
+class myRodBank(ASSD):
+    pass
+
+
+class myModelData(ASSD):
+    pass
+
+
+class myScenarioData(ASSD):
+    pass
+
+
+Assembly = OPER(nom='Assembly', sd_prod=myAssembly,
+                assembly_name=SIMP(statut='o', typ='TXM'),
+                assembly_type=SIMP(statut='o', typ='TXM', into=("UOX", "MOX", "REF")),
+                description=BLOC(condition='assembly_type != "REF"',
+                                 assembly_width=SIMP(statut='o', typ='R'),
+                                 radial_description=FACT(statut='o',
+                                                         clad_outer_radius=SIMP(statut='o', typ='R'),
+                                                         guide_tube_outer_radius=SIMP(statut='o', typ='R'),
+                                                         fuel_rod_pitch=SIMP(statut='o', typ='R'),
+                                                         nfuel_rods=SIMP(statut='o', typ='I')),
+                                 axial_description=FACT(statut='o',
+                                                        active_length_start=SIMP(statut='o', typ='R'),
+                                                        active_length_end=SIMP(statut='o', typ='R')),
+                                 grids=FACT(statut='o',
+                                            mixing=FACT(statut='o',
+                                                        positions=SIMP(
+                                                            statut='f', typ='R', max="**"),
+                                                        size=SIMP(statut='o', typ='R')),
+                                            non_mixing=FACT(statut='o',
+                                                            positions=SIMP(
+                                                                statut='f', typ='R', max='**'),
+                                                            size=SIMP(statut='o', typ='R')),
+                                            )
+                                 )
+                )
+
+
+RodBank = OPER(nom="RodBank", sd_prod=myRodBank,
+               rodbank_name=SIMP(statut='o', typ='TXM'),
+               step_height=SIMP(statut='o', typ='R'),
+               nsteps=SIMP(statut='o', typ='I'))
+
+
+def add_lr_refl(ass_list):
+    return ["RW"] + ass_list + ["RE"]
+
+
+def add_tb_refl(ass_list):
+    return ["RS"] + ass_list + ["RN"]
+
+
+def generate_ass_map(nass_list):
+    xsym_list = [a for a in 'ABCDEFGHJKLNPRSTUVWXYZ']
+    xsym_list.reverse()
+    ysym_list = ["%02d" % i for i in range(NMIN_ASSEMBLY, NMAX_ASSEMBLY+1)]
+    ysym_list.reverse()
+    def_xaxis = {}
+    def_yaxis = {}
+    for n in range(NMIN_ASSEMBLY, NMAX_ASSEMBLY+1):
+        def_xaxis[n] = add_lr_refl(xsym_list[-n:])
+        def_yaxis[n] = add_tb_refl(ysym_list[-n:])
+
+    dico = {}
+    #for n in nass_list:
+    for n in (6,) :
+        dico['assembly_map_%d' % n] = BLOC(condition="nb_assembly==%d" % n,
+                                           xaxis=SIMP(statut='o',
+                                                      typ='TXM',
+                                                      min=n+2, max=n+2,
+                                                      defaut=def_xaxis[n],),
+                                           yaxis=SIMP(statut='o',
+                                                      typ='TXM',
+                                                      min=n+2, max=n+2,
+                                                      defaut=def_yaxis[n]),
+                                           assembly_map=SIMP(statut="o",
+                                                             typ=Matrice(nbLigs=n+2,
+                                                                         nbCols=n+2,
+                                                                         typElt=myAssembly,  # ici c'est le nom de l'assemblage
+                                                                         listeHeaders=(def_xaxis[n],def_yaxis[n]),
+                                                                         coloree=True),
+                                                              ),
+                                           rod_map=SIMP(statut="o",
+                                                        typ=Matrice(nbLigs=n+2,
+                                                                    nbCols=n+2,
+                                                                    valSup=1,
+                                                                    valMin=-1,
+                                                                    typElt='TXM',  # ici c'est le nom de l'assemblage
+                                                                    listeHeaders=None,
+                                                                    coloree=True,),
+                                                        defaut=(n+2)*[(n+2)*['.']]),
+                                            )
+
+    return dico
+
+
+Techno_data = OPER(nom='Techno_data', sd_prod=myTechnoData,
+                   assembly_list=SIMP(statut='o', typ=myAssembly, min=1, max="**"),  # à resorber quand on mettra dans la Matrice
+                   rodbank_list=SIMP(statut='o', typ=myRodBank, min=0, max="**"),  # idem
+                   radial_description=FACT(statut='o',
+                                           nb_assembly=SIMP(statut='o', typ='I', into=list(range(NMIN_ASSEMBLY, NMAX_ASSEMBLY))),
+                                           **(generate_ass_map(range(NMIN_ASSEMBLY, NMAX_ASSEMBLY)))
+                                           ),  # Radial_Description
+                   axial_description=FACT(statut='o',
+                                          lower_refl_size=SIMP(statut='o', typ='R'),
+                                          upper_refl_size=SIMP(statut='o', typ='R'),
+                                          ),
+                   nominal_power=SIMP(statut='o', typ='R'),
+                   fuel_power_fraction=SIMP(statut='o', typ='R'),
+                   )  # Techno data
+
+Model_data = OPER(nom='Model_data', sd_prod=myModelData,
+                  physics=SIMP(statut='o', typ='TXM', into=(
+                      'Neutronics', 'Thermalhydraulics')),
+                  scale=SIMP(statut='o', typ='TXM', into=(
+                      'system', 'component', 'local')),
+                  b_neutro_compo=BLOC(condition='physics=="Neutronics" and scale=="component"',
+                                      codeNeutro=SIMP(statut='o', typ='TXM', into=('COCAGNE', 'APOLLO3')),
+                                      radial_meshingNeutro=FACT(statut='o',
+                                                          flux_solver=SIMP(statut='o', typ='TXM', into=('subdivision', 'pin-by-pin')),
+                                                          b_flux_subdivision=BLOC(condition='flux_solver=="subdivision"',
+                                                                                  flux_subdivision=SIMP(statut='o', typ='I')),
+                                                          feedback_solver=SIMP(statut='o', typ='TXM', into=('subdivision', 'pin-by-pin')),
+                                                          b_feedback_subdivision=BLOC(condition='feedback_solver=="subdivision"',
+                                                                                      feedback_subdivision=SIMP(statut='o', typ='I')))),
+                  b_thermo_compo=BLOC(condition='physics=="Thermalhydraulics" and scale=="component"',
+                                      code=SIMP(statut='o', typ='TXM', into=('THYC', 'CATHARE3', 'FLICA4')),
+                                      radial_meshing=FACT(statut='o',
+                                                          fluid=SIMP(statut='o', typ='TXM', into=('subdivision', 'subchannel')),
+                                                          b_fluid_subdivision=BLOC(condition='fluid=="subdivision"',
+                                                                                   fluid_subdivision=SIMP(statut='o', typ='I')),
+                                                          pellet=SIMP(statut='o', typ='I'),
+                                                          clad=SIMP(statut='o', typ='I'))),
+                  b_scale_compo=BLOC(condition='scale=="component"',
+                                     axial_meshing=FACT(statut='o',
+                                                        lower_refl=SIMP(statut='o', typ='I'),
+                                                        fuel=SIMP(statut='o', typ='I'),
+                                                        upper_refl=SIMP(statut='o', typ='I'))),
+                  b_scale_local=BLOC(condition='scale=="local"',
+                                     mesh_file=SIMP(statut='o', typ='Fichier')),
+                  )
+
+
+Scenario_data = OPER(nom='Scenario_data', sd_prod=myScenarioData,
+                     initial_power=SIMP(statut='o', typ='R', val_min=0., defaut=100.),
+                     initial_power_unit=SIMP(statut='o', typ='TXM',
+                                             into=('% Nominal power', 'W'),
+                                             defaut ='% Nominal power',),
+                     initial_rod_positions=SIMP(statut='o',
+                                                typ=Tuple(2),
+                                                validators=VerifTypeTuple(['TXM', 'I']),
+                                                ang="Type@label, position (e.g. RodBank@RB, 0)",
+                                                max='**'),
+                     scenario_type=SIMP(statut='o',
+                                        typ='TXM',
+                                        into=['RIA']),
+                     b_ria=BLOC(condition='scenario_type=="RIA"',
+                                ejected_rod=SIMP(statut='o',
+                                                 typ='TXM'),
+                                rod_position_program=SIMP(statut='o',
+                                                          typ=Tuple(2),
+                                                          validators=VerifTypeTuple(['R', 'I']),
+                                                          max='**'),
+                                ),
+                     post_processing=SIMP(statut='f',
+                                          typ=Tuple(2),
+                                          validators=VerifPostTreatment(),
+                                          max='**'),
+                     )
deleted file mode 100644 (file)
index 4b739b5772eb10de7d6a6d6a42f6ac237fb0e7a6..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2008-2018 EDF R&D
-#
-# This file is part of SALOME ADAO module
-#
-# 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
-import os, re
-import Accas
-from Accas import *
-monFichier=os.path.abspath(__file__)
-
-JdC = JDC_CATA (
-    code='Essai'
-    )
-VERSION_CATALOGUE='V_0'
-
-
-class Matrice:
-  def __init__(self,nbLigs=None,nbCols=None,methodeCalculTaille=None,formatSortie="ligne",valSup=None,valMin=None,structure=None,typElt='R',typEltInto=None, listeHeaders=None):
-      self.nbLigs=nbLigs
-      self.nbCols=nbCols
-      self.methodeCalculTaille=methodeCalculTaille
-      self.formatSortie=formatSortie
-      self.valSup=valSup
-      self.valMin=valMin
-      self.structure=structure
-      self.typElt=typElt
-      self.listeHeaders=listeHeaders
-      self.typEltInto=typEltInto
-
-  def __convert__(self,valeur):
-    # Attention ne verifie pas grand chose
-    if type(valeur) != types.ListType :
-      return None
-    return valeur
-
-  def info(self):
-      return "Matrice %s x %s" % (self.nbLigs, self.nbCols)
-
-      __repr__=info
-      __str__=info
-
-
-
-Techno_Data = PROC( nom = 'Techno_Data',
-    Radial_Description = FACT (statut ='o',
-        assembly_width = SIMP (statut='o', typ = 'R'),
-        assembly_map = SIMP ( statut = "o",
-            typ = Matrice(nbLigs=8,
-                          nbCols=8,
-                          valSup=1,
-                          valMin=-1,
-                          typElt='TXM',
-                          typEltInto=('U1','R1'),
-                          listeHeaders=None),
-          defaut=(['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
-                 ['U1','U1','U1','U1','U1','U1','U1','U1'])
-                          ),
-
-    ), # Radial_Description
-        #road_map = SIMP ( statut = "o",
-        #    typ = Matrice(nbLigs=8,
-        #                  nbCols=8,
-        #                  valSup=1,
-        #                  valMin=-1,
-        #                  ),),
-        
-    Rod_Description = FACT (statut ='o',
-        RB=FACT( statut ='o',
-           step_height =  SIMP (statut='o', typ = 'R'),
-           nsteps = SIMP (statut='o', typ = 'I',),
-         ),
-    ), # Rod_Description
-   Axial_Description = FACT(statut ='o',
-       lower_refl_size =  SIMP (statut='o', typ = 'R'),
-       fuel_size =  SIMP (statut='o', typ = 'R'),
-       upper_ref =  SIMP (statut='o', typ = 'R'),
-    ),
-   Grids = FACT (statut ='o',
-       mixing = FACT(statut ='o',
-         positions =  SIMP (statut='o', typ = 'R'),
-         size =  SIMP (statut='o', typ = 'R'),
-       ),
-       non_mixing = FACT( statut ='o',
-         positions =  SIMP (statut='o', typ = 'R'),
-         size =  SIMP (statut='o', typ = 'R'),
-       ),
-    ),
-    Nominal_Power =  SIMP (statut='o', typ = 'R'),
-    
-    
-) # Techno data
-
-
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..9da046fdf6a9a591fb49e03765cda4fca894a09f
--- /dev/null
@@ -0,0 +1 @@
+cata_MatriceColoree.py
\ No newline at end of file
diff --git a/ReacteurNumerique/cata_ReacteurNumerique.py_matriceAncienneVersion b/ReacteurNumerique/cata_ReacteurNumerique.py_matriceAncienneVersion
new file mode 100644 (file)
index 0000000..4b739b5
--- /dev/null
@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2008-2018 EDF R&D
+#
+# This file is part of SALOME ADAO module
+#
+# 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
+import os, re
+import Accas
+from Accas import *
+monFichier=os.path.abspath(__file__)
+
+JdC = JDC_CATA (
+    code='Essai'
+    )
+VERSION_CATALOGUE='V_0'
+
+
+class Matrice:
+  def __init__(self,nbLigs=None,nbCols=None,methodeCalculTaille=None,formatSortie="ligne",valSup=None,valMin=None,structure=None,typElt='R',typEltInto=None, listeHeaders=None):
+      self.nbLigs=nbLigs
+      self.nbCols=nbCols
+      self.methodeCalculTaille=methodeCalculTaille
+      self.formatSortie=formatSortie
+      self.valSup=valSup
+      self.valMin=valMin
+      self.structure=structure
+      self.typElt=typElt
+      self.listeHeaders=listeHeaders
+      self.typEltInto=typEltInto
+
+  def __convert__(self,valeur):
+    # Attention ne verifie pas grand chose
+    if type(valeur) != types.ListType :
+      return None
+    return valeur
+
+  def info(self):
+      return "Matrice %s x %s" % (self.nbLigs, self.nbCols)
+
+      __repr__=info
+      __str__=info
+
+
+
+Techno_Data = PROC( nom = 'Techno_Data',
+    Radial_Description = FACT (statut ='o',
+        assembly_width = SIMP (statut='o', typ = 'R'),
+        assembly_map = SIMP ( statut = "o",
+            typ = Matrice(nbLigs=8,
+                          nbCols=8,
+                          valSup=1,
+                          valMin=-1,
+                          typElt='TXM',
+                          typEltInto=('U1','R1'),
+                          listeHeaders=None),
+          defaut=(['U1','U1','U1','U1','U1','U1','U1','U1'],
+                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
+                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
+                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
+                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
+                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
+                 ['U1','U1','U1','U1','U1','U1','U1','U1'],
+                 ['U1','U1','U1','U1','U1','U1','U1','U1'])
+                          ),
+
+    ), # Radial_Description
+        #road_map = SIMP ( statut = "o",
+        #    typ = Matrice(nbLigs=8,
+        #                  nbCols=8,
+        #                  valSup=1,
+        #                  valMin=-1,
+        #                  ),),
+        
+    Rod_Description = FACT (statut ='o',
+        RB=FACT( statut ='o',
+           step_height =  SIMP (statut='o', typ = 'R'),
+           nsteps = SIMP (statut='o', typ = 'I',),
+         ),
+    ), # Rod_Description
+   Axial_Description = FACT(statut ='o',
+       lower_refl_size =  SIMP (statut='o', typ = 'R'),
+       fuel_size =  SIMP (statut='o', typ = 'R'),
+       upper_ref =  SIMP (statut='o', typ = 'R'),
+    ),
+   Grids = FACT (statut ='o',
+       mixing = FACT(statut ='o',
+         positions =  SIMP (statut='o', typ = 'R'),
+         size =  SIMP (statut='o', typ = 'R'),
+       ),
+       non_mixing = FACT( statut ='o',
+         positions =  SIMP (statut='o', typ = 'R'),
+         size =  SIMP (statut='o', typ = 'R'),
+       ),
+    ),
+    Nominal_Power =  SIMP (statut='o', typ = 'R'),
+    
+    
+) # Techno data
+
+
diff --git a/ReacteurNumerique/qtEficasEssai.py b/ReacteurNumerique/qtEficasEssai.py
deleted file mode 100755 (executable)
index 863353f..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2013   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
-#
-"""
-   Ce module sert a lancer EFICAS configure pour MAP 
-"""
-# Modules Python
-# Modules Eficas
-import prefs
-name='prefs_'+prefs.code
-__import__(name)
-
-
-import sys,os
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..'))
-
-import prefs
-from InterfaceQT4 import eficas_go
-eficas_go.lanceEficas(code=prefs.code)
diff --git a/docCataWriter/.oper_and_proc.rst.swp b/docCataWriter/.oper_and_proc.rst.swp
deleted file mode 100644 (file)
index 10cedad..0000000
Binary files a/docCataWriter/.oper_and_proc.rst.swp and /dev/null differ
diff --git a/docCataWriter/.structure_rules.rst.swp b/docCataWriter/.structure_rules.rst.swp
deleted file mode 100644 (file)
index 07058df..0000000
Binary files a/docCataWriter/.structure_rules.rst.swp and /dev/null differ