version travail

diff --git a/MAP/CMakeLists.txt b/MAP/CMakeLists.txt
index e7e4546f3ec8ba9480fc2713897d87ca97373f76..63a1fcdb4873c4b86363807f5ff1ded43c8fa529 100644 (file)
--- a/MAP/CMakeLists.txt
+++ b/MAP/CMakeLists.txt
@@ -28,7 +28,7 @@ install ( FILES qtEficas_map.py
                style.py
                prefs_MAP.py
                configuration_MAP.py
-               catalogues_MAP.ini
+               #catalogues_MAP.ini
                 s_poly_st_1_V1.py
                 s_poly_st_1_V1_clefs_docu
                 s_scc_st_2_V1.py

diff --git a/MAP/cataDebut.py b/MAP/cataDebut.py
new file mode 100644 (file)
index 0000000..eaa6dcc
--- /dev/null
+++ b/MAP/cataDebut.py
@@ -0,0 +1,177 @@
+#)# -*- coding: utf-8 -*-
+#
+## --------------------------------------------------
+## debut entete
+## --------------------------------------------------
+#
+from Accas import *
+import os
+import sys
+import types
+from prefs_MAP import PATH_MAP
+
+
+class Tuple:
+  def __init__(self,ntuple):
+    self.ntuple=ntuple
+
+  def __convert__(self,valeur):
+    if type(valeur) == types.StringType:
+      return None
+    if len(valeur) != self.ntuple:
+      return None
+    return valeur
+
+  def info(self):
+    return "Tuple de %s elements" % self.ntuple
+
+  __repr__=info
+  __str__=info
+
+#
+#CONTEXT.debug = 1
+JdC = JDC_CATA ( code = 'MAP',
+                execmodul = None,
+                #regles=(AU_MOINS_UN('DISPL',),A_CLASSER('RBM','DISPL'))
+                       )# Fin JDC_CATA
+#
+
+
+specter_path=PROC(nom='specter_path',op=None,
+      path=SIMP(typ='Fichier',defaut='/home/A28637/SVN_MAP/trunk/vendor/PERFORM_20110225/perfect_dev/tools/bin/specter', statut='o', fr = '', ang = 'A class for the definition of a file', max=1,),
+                    )
+
+
+residual_energy_model=PROC(nom='residual_energy_model',op=None,
+          access=SIMP(statut= 'o',typ = 'TXM', defaut="user", max=1),
+         beta=FACT(statut='o', max=1, fr = '', ang = 'A class for the definition of a numerical value', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.779, max=1),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='None', max=1),
+                  ),
+          short_doc=SIMP(statut= 'o',typ = 'TXM', defaut="The model which gives the total number of surviving point defects for cascades in iron up to 10 keV. ", max=1),
+         alpha=FACT(statut='o', max=1, fr = '', ang = 'A class for the definition of a numerical value', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=5.67, max=1),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='None', max=1),
+                  ),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+      )
+mfvisc2_path=PROC(nom='mfvisc2_path',op=None,
+      path=SIMP(typ='Fichier',defaut='/home/A28637/SVN_MAP/trunk/vendor/PERFORM_20110225/perfect_dev/tools/bin/mfvisc', statut='o', fr = '', ang = 'A class for the definition of a file', max=1,),
+                    )
+
+
+mfvisc2_parametrisation=PROC(nom='mfvisc2_parametrisation',op=None,
+         stop_if_solute_loss=FACT(statut='o', max=1, fr = '', ang = 'Choose Yes if you want the rate-theory calculation to stop when a solute loss (i.e. Cu or He in the case of RPV and INTERN respectively) is detected. Choose No otherwise.', 
+               value=SIMP(statut= 'o',typ = 'TXM', defaut="No", max=1,into=['Yes', 'No']),
+                  ),
+         bound_solute=FACT(statut='o', max=1, fr = '', ang = 'Choose Yes if you want the to artifically impose the solute conservation by imposing a null flux for concentrations at Nob.', 
+               value=SIMP(statut= 'o',typ = 'TXM', defaut="Yes", max=1,into=['Yes', 'No']),
+                  ),
+         numerical_scheme_i=FACT(statut='o', max=1, fr = '', ang = 'Numerical parameters scheme for interstitials', 
+            No=FACT(statut='o', max=1, fr = '', ang = 'Number of discrete equations for species i', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=30, max=1,val_min=0),
+                        ),
+            Nc=FACT(statut='o', max=1, fr = '', ang = 'Number of continuous equations for species i', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=300, max=1,val_min=0),
+                        ),
+            M=FACT(statut='o', max=1, fr = '', ang = 'Step value for species i', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=30, max=1,val_min=0),
+                        ),
+            kmet=FACT(statut='o', max=1, fr = '', ang = 'Step value for species i', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=97, max=1,val_min=0),
+                        ),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+         ),
+         numerical_scheme_b=FACT(statut='o', max=1, fr = '', ang = 'Numerical parameters scheme for the solute element', 
+            No=FACT(statut='o', max=1, fr = '', ang = 'Number of discrete equations for species b', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=0, max=1,val_min=0),
+                        ),
+            Nc=FACT(statut='o', max=1, fr = '', ang = 'Number of continuous equations for species b', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=0, max=1,val_min=0),
+                        ),
+            M=FACT(statut='o', max=1, fr = '', ang = 'Step value for species b', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=0, max=1,val_min=0),
+                        ),
+            kmet=FACT(statut='o', max=1, fr = '', ang = 'Step value for species b', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=0, max=1,val_min=0),
+                        ),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+         ),
+          access=SIMP(statut= 'o',typ = 'TXM', defaut="user", max=1),
+         solver_absolute_error=FACT(statut='o', max=1, fr = '', ang = 'Absolute error for the rate theory solver', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.0001, max=1,val_min=0),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='None', max=1),
+                  ),
+         solver_relative_error=FACT(statut='o', max=1, fr = '', ang = 'Relative error for the rate theory solver', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.001, max=1,val_min=0),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='None', max=1),
+                  ),
+          short_doc=SIMP(statut= 'o',typ = 'TXM', defaut="Parametrisation of the rate theory code", max=1),
+         numerical_scheme_v=FACT(statut='o', max=1, fr = '', ang = 'Numerical parameters scheme for vacancies', 
+            No=FACT(statut='o', max=1, fr = '', ang = 'Number of discrete equations for species v', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=30, max=1,val_min=0),
+                        ),
+            Nc=FACT(statut='o', max=1, fr = '', ang = 'Number of continuous equations for species v', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=300, max=1,val_min=0),
+                        ),
+            M=FACT(statut='o', max=1, fr = '', ang = 'Step value for species v', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=30, max=1,val_min=0),
+                        ),
+            kmet=FACT(statut='o', max=1, fr = '', ang = 'Step value for species v', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=55, max=1,val_min=0),
+                        ),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+         ),
+         bound_self_defects=FACT(statut='o', max=1, fr = '', ang = 'Choose Yes if you want the to artifically impose self defects conservation by imposing a null flux for concentrations at $(No+Nc)$. Choose stop to stop the calculation in case of leakage.', 
+               value=SIMP(statut= 'o',typ = 'TXM', defaut="Stop", max=1,into=['Yes', 'No', 'Stop']),
+                  ),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+      )
+neutron_spectrum=PROC(nom='neutron_spectrum',op=None,
+         spectrum=FACT(statut='o', max=1, fr = '', ang = 'Neutron spectrum table', 
+         values=SIMP(statut= 'o',typ = Tuple(2), defaut=[[0.0465, 21000000000000.0], [0.10000000000000001, 24300000000000.0], [0.20000000000000001, 27300000000000.0], [0.40000000000000002, 37800000000000.0], [0.80000000000000004, 46600000000000.0], [1.0, 16400000000000.0], [1.3999999999999999, 25800000000000.0], [2.5, 41200000000000.0]], min=1, max='**'),
+         ),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+          spectrum_time=SIMP(statut= 'o',typ = 'TXM', defaut="None", max=1),
+          access=SIMP(statut= 'o',typ = 'TXM', defaut="user", max=1),
+          short_doc=SIMP(statut= 'o',typ = 'TXM', defaut="Data object containing the neutron spectrum table.", max=1),
+      )
+material_content=PROC(nom='material_content',op=None,
+      valeur=FACT(statut='o', max=1, fr = '', ang = 'Chemical composition of the steel', 
+          Cu=SIMP(statut= 'o',typ = 'R', defaut=0.0, max=1,val_min=0.0,val_max=0.1),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut='atomic percent', max=1),
+            ),
+      )
+experimental_resolutions=PROC(nom='experimental_resolutions',op=None,
+          short_doc=SIMP(statut= 'o',typ = 'TXM', defaut="A base class for the minimum radius of interstitial and vacancy clusters taken into account in number densities calculations.", max=1),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+         R_min_V=FACT(statut='o', max=1, fr = '', ang = 'Minimum radius of vacancy clusters taken into account in number densities calculations.', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.0, max=1),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='nm', max=1),
+                  ),
+          access=SIMP(statut= 'o',typ = 'TXM', defaut="user", max=1),
+         interstitial_cluster_shape=FACT(statut='o', max=1, fr = '', ang = 'Choice for the shape of interstitials clusters, disks or spheres.  This only impacts the calculation of the radius of the cluster and associated radial density.', 
+               value=SIMP(statut= 'o',typ = 'TXM', defaut="disk", max=1,into=['disk', 'sphere']),
+                  ),
+         R_min_B=FACT(statut='o', max=1, fr = '', ang = 'Minimum radius of copper precipitates taken into account in number densities calculations.                            ', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.0, max=1),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='nm', max=1),
+                  ),
+         R_min_I=FACT(statut='o', max=1, fr = '', ang = 'Minimum radius of interstitial clusters taken into account in number densities calculations.                            ', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.0, max=1),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='nm', max=1),
+                  ),
+      )
+damage_energy_model=PROC(nom='damage_energy_model',op=None,
+          a=SIMP(statut= 'o',typ = 'R', defaut=1.11787605409e-09, max=1),
+          elect=SIMP(statut= 'o',typ = 'R', defaut=4.8e-10, max=1),
+          r_bohr=SIMP(statut= 'o',typ = 'R', defaut=5.29e-09, max=1),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+          z_p=SIMP(statut= 'o',typ = 'R', defaut=26.0, max=1),
+          z_t=SIMP(statut= 'o',typ = 'R', defaut=26.0, max=1),
+          access=SIMP(statut= 'o',typ = 'TXM', defaut="expert", max=1),
+          short_doc=SIMP(statut= 'o',typ = 'TXM', defaut="Lindhard damage energy model", max=1),
+          m_p=SIMP(statut= 'o',typ = 'R', defaut=55.0, max=1),
+          m_t=SIMP(statut= 'o',typ = 'R', defaut=55.0, max=1),
+      )
+

diff --git a/MAP/creeCataFromDict.py b/MAP/creeCataFromDict.py
new file mode 100755 (executable)
index 0000000..37dc972
--- /dev/null
+++ b/MAP/creeCataFromDict.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import types
+class CataMAP:
+
+   def __init__(self,dict1,dict2):
+      self.cata=""
+      self.texte=self.readfile("cataDebut.py")
+      self.dictParam=dict1
+      self.dictData=dict2
+      self.traiteDico(self.dictParam)
+
+
+   def readfile(self,fn):
+      try:
+         texte=open(fn).read()
+      except:
+         print "Impossible ouvrir fichier %s" % filename
+         return texte
+
+
+   def traiteDico(self,dict):
+       for clef in dict.keys() :
+           d=dict[clef]
+           texteSIMP="=SIMP(typ=%s,statut=%s)\n,"%d
+           texteSIMp=clef+texteSIMP
+           print texteSIMP
+
+   def execute(self):
+      contexte = globals()
+      try :
+          exec self.texte in contexte
+      except  :
+          import traceback
+          traceback.print_exc()
+
+
+if __name__ == "__main__" :
+     dicoParam={"p1":{"typ":"TXM","statut":"o"}}
+     dicoVal={"val1":{"typ":"R","statut":"o"}}
+     monCata=CataMAP(dicoParam,dicoVal)
+     print monCata.texte

diff --git a/MAP/prefs_MAP.py b/MAP/prefs_MAP.py
index b667b55ab75406a955bde6c108e07ad5b957b295..aea6917ccf049af6f264d8d00faac04cc3047cd1 100644 (file)
--- a/MAP/prefs_MAP.py
+++ b/MAP/prefs_MAP.py
@@ -56,12 +56,16 @@ MAP_DIRECTORY=os.getenv("MAP_DIRECTORY")
 \r
 catalogues = (\r
 # (code, identifiant, catalogue, formatOut, formatIN)\r
-  ('MAP','s_Perfect_V1',os.path.join(repIni,'s_Perfect_V1.py'),'s_Perfect'),\r
+  ('MAP','V1',os.path.join(repIni,'s_Perfect_V1.py'),'Perfect'),\r
   ('MAP','V0',os.path.join(repIni,'s_DIC_V1.py'),'s_DIC'),\r
   ('MAP','V1',os.path.join(repIni,'s_DIC_V1.py'),'s_DIC','defaut'),\r
   ('MAP','V1',os.path.join(repIni,'s_scc_3d_analysis_V1.py'),'s_scc_3d','defaut'),\r
+  ('MAP','V1',os.path.join(repIni,'Essai/maquette.py'),'maquette','defaut'),\r
+  ('MAP','V1',os.path.join(repIni,'Essai/comp_c_image_3d.py'),'c_image_3d','defaut'),\r
+  ('MAP','V1',os.path.join(repIni,'Essai/c_pre_interface_mesh.py.py'),'c_pre_interface_mesh','defaut'),\r
+  ('MAP','V1',os.path.join(repIni,'Essai/c_post_distribution_properties.py'),'c_post_distribution_properties','defaut'),\r
 )\r
 \r
 OpenTURNS_path='/local/noyret/Salome/V6_main/tools/install/Openturns_tool-0150-py266-r272-ro144-rp208-sw204-xm278-la331-gr2263-dox173_patch-tbb30/lib/python2.6/site-packages'\r
-sys.path[:0]=[INSTALLDIR, OpenTURNS_path]\r
+sys.path[:0]=[repIni,INSTALLDIR, OpenTURNS_path]\r
 \r

diff --git a/MAP/s_Perfect_V1.py b/MAP/s_Perfect_V1.py
index 1d45aa4fe7e014281965f4eea9fa222823d39c6a..eaa6dcc36a645f4babb50b429ae376a44740fb3c 100644 (file)
--- a/MAP/s_Perfect_V1.py
+++ b/MAP/s_Perfect_V1.py
@@ -7,6 +7,7 @@
 from Accas import *
 import os
 import sys
+import types
 from prefs_MAP import PATH_MAP
 
 
@@ -34,197 +35,143 @@ JdC = JDC_CATA ( code = 'MAP',
                 #regles=(AU_MOINS_UN('DISPL',),A_CLASSER('RBM','DISPL'))
                        )# Fin JDC_CATA
 #
-specter_path=PROC(nom="specter_path",op= None,
-              path = SIMP ( typ = 'TXM', defaut=PATH_MAP+"perfect_dev/tools/bin/specter",
-                            statut='o', fr = "", ang = "specter_path ", max=1,
-                          ),
-)
-residual_energy_model=PROC(nom="residual_energy_model",op= None,
-              beta =  FACT (statut='o', max=1,
-                      ang = "total number of surviving point defects for cascades in iron up",
-                      name= SIMP(statut= "f",typ = 'TXM', ang = "",max=1),
-                      value=SIMP(statut= "o",typ = 'R', defaut=0.779, max=1),
-                      unit= SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                      ),
-              alpha =  FACT (statut='o', max=1,
-                      name= SIMP(statut= "f",typ = 'TXM', ang = "",max=1),
-                      value=SIMP(statut= "o",typ = 'R', defaut=5.67, ang = "",max=1,),
-                      unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                      ),
-)
-mfvisc2_path=PROC(nom="mfvisc2_path",op= None,
-              path = SIMP ( typ = 'TXM', defaut=PATH_MAP+"perfect_dev/tools/bin/mfvisc",
-                            statut='o', fr = "", ang = "specter_path ", max=1,
-                          ),
-)
 
-mfvisc2_parametrisation=PROC(nom="mfvisc2_parametrisation",op= None,
-              stop_if_solute_loss=SIMP (statut= "f",typ = 'TXM', 
-                            ang = "Yes if you want the rate-theory calculation to stop when a solute loss is detected",
-                            defaut="No",into=("Yes","No")
-                          ),
-              bound_solute=SIMP (statut= "f",typ = 'TXM', 
-                            ang = "Yes if you want the to artifically impose the solute conservation by imposing a null flux for concentrations at Nob",
-                            defaut="Yes",into=("Yes","No") 
-                          ),
-              numerical_scheme_i =  FACT (statut='o', max=1,
-                      ang="Numerical parameters scheme for interstitial",
-                      No=FACT(statut='o', max=1,
-                         ang='Number of discrete equations for species i',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='No_i', ang = "",max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=30,into=(30,), ang = "",max=1,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      Nc=FACT(statut='o', max=1,
-                         ang='Number of continous equations for species i',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='Nc_i', ang = "",max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=300, ang = "",max=1,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      M=FACT(statut='o', max=1, ang='Step value for species i',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='M_i', max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=50, max=1,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      kmet=FACT(statut='o', max=1, ang='Step value for species i',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='kmet_i', max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=97, max=1,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      species=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                      ),
-              numerical_scheme_b =  FACT (statut='o', max=1,
-                      ang="Numerical parameters scheme for the solute element",
-                      No=FACT(statut='o', max=1,
-                         ang='Number of discrete equations for species b',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='No_b', ang = "",max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=0, ang = "",max=1,val_min=0,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      Nc=FACT(statut='o', max=1,
-                         ang='Number of continous equations for species b',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='Nc_b', ang = "",max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=0, ang = "",max=1,val_min=0,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      M=FACT(statut='o', max=1, ang='Step value for species b',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='M_b', max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=0, max=1,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      kmet=FACT(statut='o', max=1, ang='Step value for species b',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='kmet_b', max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=0, max=1,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      species=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                      ),
-              numerical_scheme_v =  FACT (statut='o', max=1,
-                      ang="Numerical parameters scheme for vacancies",
-                      No=FACT(statut='o', max=1,
-                         ang='Number of discrete equations for species v',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='No_v', ang = "",max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=30, ang = "",max=1,val_min=0,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      Nc=FACT(statut='o', max=1,
-                         ang='Number of continous equations for species v',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='Nc_v', ang = "",max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=300, ang = "",max=1,val_min=0,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      M=FACT(statut='o', max=1, ang='Step value for species v',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='M_v', max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=30, max=1,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      kmet=FACT(statut='o', max=1, ang='Step value for species v',
-                         name=SIMP(statut= "f", typ = 'TXM', defaut='kmet_v', max=1,),
-                         value=SIMP(statut= "o",typ = 'I', defaut=55, max=1,),
-                         unit=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                              ),
-                      species=SIMP (statut= "f",typ = 'TXM', ang = "",max=1),
-                      ),
 
-              ignore_Helium = SIMP (statut= "f",typ = 'TXM', ang = "",max=1,
-                            defaut="Yes",into=("Yes","No"),),
-              bound_self_defects = SIMP (statut= "f",typ = 'TXM', max=1,
-                            ang="Yes if you want the to artifically impose self defects conservation by imposing a null flux for concentrations at $(No+Nc)$. Choose 'stop' to stop the calculation in case of leakage.",
-                            defaut="Stop",into=("Yes","No","Stop"),)
-)
-
-operating_conditions=PROC(nom="operating_conditions",op= None,
-
-            relative_time_increments=SIMP (statut= "o",typ = 'R', min=3, max='**',
-                     ang="Relative time increments for the LONG_TERM computation",
-                     defaut=(1e-10, 1.0000000000000001e-09, 3e-09, 1e-08, 2.9999999999999997e-08, 9.9999999999999995e-08, 2.9999999999999999e-07, 9.9999999999999995e-07, 3.0000000000000001e-06, 1.0000000000000001e-05, 3.0000000000000001e-05, 0.0001, 0.00029999999999999997, 0.001, 0.0030000000000000001, 0.01, 0.029999999999999999, 0.10000000000000001, 0.29999999999999999, 1.0),
-            ),
-            rescaling_NRT_damage_rate=FACT(statut='o', max=1, 
-               ang="rescaling NRT damage rate (dpa/s)",
-               value=SIMP(statut= "o",typ = 'R', defaut=0.0, val_min=0,),
-               unit=SIMP (statut= "f",typ = 'TXM', defaut='dpa_per_s',into=('dpa_per_s',)),
+specter_path=PROC(nom='specter_path',op=None,
+      path=SIMP(typ='Fichier',defaut='/home/A28637/SVN_MAP/trunk/vendor/PERFORM_20110225/perfect_dev/tools/bin/specter', statut='o', fr = '', ang = 'A class for the definition of a file', max=1,),
+                    )
+
+
+residual_energy_model=PROC(nom='residual_energy_model',op=None,
+          access=SIMP(statut= 'o',typ = 'TXM', defaut="user", max=1),
+         beta=FACT(statut='o', max=1, fr = '', ang = 'A class for the definition of a numerical value', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.779, max=1),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='None', max=1),
+                  ),
+          short_doc=SIMP(statut= 'o',typ = 'TXM', defaut="The model which gives the total number of surviving point defects for cascades in iron up to 10 keV. ", max=1),
+         alpha=FACT(statut='o', max=1, fr = '', ang = 'A class for the definition of a numerical value', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=5.67, max=1),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='None', max=1),
+                  ),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+      )
+mfvisc2_path=PROC(nom='mfvisc2_path',op=None,
+      path=SIMP(typ='Fichier',defaut='/home/A28637/SVN_MAP/trunk/vendor/PERFORM_20110225/perfect_dev/tools/bin/mfvisc', statut='o', fr = '', ang = 'A class for the definition of a file', max=1,),
+                    )
+
+
+mfvisc2_parametrisation=PROC(nom='mfvisc2_parametrisation',op=None,
+         stop_if_solute_loss=FACT(statut='o', max=1, fr = '', ang = 'Choose Yes if you want the rate-theory calculation to stop when a solute loss (i.e. Cu or He in the case of RPV and INTERN respectively) is detected. Choose No otherwise.', 
+               value=SIMP(statut= 'o',typ = 'TXM', defaut="No", max=1,into=['Yes', 'No']),
+                  ),
+         bound_solute=FACT(statut='o', max=1, fr = '', ang = 'Choose Yes if you want the to artifically impose the solute conservation by imposing a null flux for concentrations at Nob.', 
+               value=SIMP(statut= 'o',typ = 'TXM', defaut="Yes", max=1,into=['Yes', 'No']),
+                  ),
+         numerical_scheme_i=FACT(statut='o', max=1, fr = '', ang = 'Numerical parameters scheme for interstitials', 
+            No=FACT(statut='o', max=1, fr = '', ang = 'Number of discrete equations for species i', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=30, max=1,val_min=0),
+                        ),
+            Nc=FACT(statut='o', max=1, fr = '', ang = 'Number of continuous equations for species i', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=300, max=1,val_min=0),
+                        ),
+            M=FACT(statut='o', max=1, fr = '', ang = 'Step value for species i', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=30, max=1,val_min=0),
+                        ),
+            kmet=FACT(statut='o', max=1, fr = '', ang = 'Step value for species i', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=97, max=1,val_min=0),
+                        ),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+         ),
+         numerical_scheme_b=FACT(statut='o', max=1, fr = '', ang = 'Numerical parameters scheme for the solute element', 
+            No=FACT(statut='o', max=1, fr = '', ang = 'Number of discrete equations for species b', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=0, max=1,val_min=0),
+                        ),
+            Nc=FACT(statut='o', max=1, fr = '', ang = 'Number of continuous equations for species b', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=0, max=1,val_min=0),
+                        ),
+            M=FACT(statut='o', max=1, fr = '', ang = 'Step value for species b', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=0, max=1,val_min=0),
+                        ),
+            kmet=FACT(statut='o', max=1, fr = '', ang = 'Step value for species b', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=0, max=1,val_min=0),
+                        ),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+         ),
+          access=SIMP(statut= 'o',typ = 'TXM', defaut="user", max=1),
+         solver_absolute_error=FACT(statut='o', max=1, fr = '', ang = 'Absolute error for the rate theory solver', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.0001, max=1,val_min=0),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='None', max=1),
+                  ),
+         solver_relative_error=FACT(statut='o', max=1, fr = '', ang = 'Relative error for the rate theory solver', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.001, max=1,val_min=0),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='None', max=1),
+                  ),
+          short_doc=SIMP(statut= 'o',typ = 'TXM', defaut="Parametrisation of the rate theory code", max=1),
+         numerical_scheme_v=FACT(statut='o', max=1, fr = '', ang = 'Numerical parameters scheme for vacancies', 
+            No=FACT(statut='o', max=1, fr = '', ang = 'Number of discrete equations for species v', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=30, max=1,val_min=0),
+                        ),
+            Nc=FACT(statut='o', max=1, fr = '', ang = 'Number of continuous equations for species v', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=300, max=1,val_min=0),
+                        ),
+            M=FACT(statut='o', max=1, fr = '', ang = 'Step value for species v', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=30, max=1,val_min=0),
+                        ),
+            kmet=FACT(statut='o', max=1, fr = '', ang = 'Step value for species v', 
+                    value=SIMP(statut= 'o',typ = 'I', defaut=55, max=1,val_min=0),
+                        ),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+         ),
+         bound_self_defects=FACT(statut='o', max=1, fr = '', ang = 'Choose Yes if you want the to artifically impose self defects conservation by imposing a null flux for concentrations at $(No+Nc)$. Choose stop to stop the calculation in case of leakage.', 
+               value=SIMP(statut= 'o',typ = 'TXM', defaut="Stop", max=1,into=['Yes', 'No', 'Stop']),
+                  ),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+      )
+neutron_spectrum=PROC(nom='neutron_spectrum',op=None,
+         spectrum=FACT(statut='o', max=1, fr = '', ang = 'Neutron spectrum table', 
+         values=SIMP(statut= 'o',typ = Tuple(2), defaut=[[0.0465, 21000000000000.0], [0.10000000000000001, 24300000000000.0], [0.20000000000000001, 27300000000000.0], [0.40000000000000002, 37800000000000.0], [0.80000000000000004, 46600000000000.0], [1.0, 16400000000000.0], [1.3999999999999999, 25800000000000.0], [2.5, 41200000000000.0]], min=1, max='**'),
+         ),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+          spectrum_time=SIMP(statut= 'o',typ = 'TXM', defaut="None", max=1),
+          access=SIMP(statut= 'o',typ = 'TXM', defaut="user", max=1),
+          short_doc=SIMP(statut= 'o',typ = 'TXM', defaut="Data object containing the neutron spectrum table.", max=1),
+      )
+material_content=PROC(nom='material_content',op=None,
+      valeur=FACT(statut='o', max=1, fr = '', ang = 'Chemical composition of the steel', 
+          Cu=SIMP(statut= 'o',typ = 'R', defaut=0.0, max=1,val_min=0.0,val_max=0.1),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut='atomic percent', max=1),
             ),
-           flux_cut_off_energy=FACT(statut='o', max=1,
-               ang="Energy threshold for the calculation of the flux",
-               value=SIMP(statut= "o",typ = 'R', defaut=1.0, val_min=0,),
-               unit=SIMP (statut= "f",typ = 'TXM', defaut='MeV',into=('MeV',)),
-             ),
-           toughness_calculation_time_index = SIMP (statut= "o",typ = 'R', defaut=-1,into=(-1,),),
-           temp_irrad=FACT(statut='o', max=1,
-               ang="Energy threshold for the calculation of the flux",
-               name=SIMP(statut= "f", typ = 'TXM', defaut='T', max=1,),
-               value=SIMP(statut= "o",typ = 'R',   defaut=573.0, val_min=0,),
-               unit=SIMP (statut= "f",typ = 'TXM', defaut='K',into=('K',)),
-             ),
-           time_irrad=FACT(statut='o', max=1,
-               unit=SIMP(statut= "f", typ = 'TXM', defaut='s', max=1,),
-               value=SIMP(statut= "o",typ = 'R', defaut=100000.0, val_min=0,),
-            ),
-           rescaling_flux=FACT(statut='o', max=1,
-               unit=SIMP(statut= "f", typ = 'TXM', defaut='n_per_cm2_per_s', max=1,),
-               value=SIMP(statut= "o",typ = 'R', defaut=0.0, val_min=0,),
-            ),
-)
-
-bcc_crystal=PROC(nom="bcc_crystal",op= None,
-           lattice_parameter=FACT(statut='o', max=1,
-               unit=SIMP(statut= "f", typ = 'TXM', defaut='angstrom', max=1,),
-               value=SIMP(statut= "o",typ = 'R', defaut=2.87, ),
-            ),
-           atomic_volume=FACT(statut='o', max=1,
-               unit=SIMP(statut= "f", typ = 'TXM', defaut='m3', max=1,),
-               value=SIMP(statut= "o",typ = 'R', defaut=1.18199515e-29, ),
-            ),
-           structure=SIMP (statut= "f",typ = 'TXM', defaut='bcc',into=('bcc','fcc'),
-              ang='Crystalline structure of the considered alloy'),
-           atomic_density=FACT(statut='o', max=1,
-               unit=SIMP(statut= "f", typ = 'TXM', defaut='at_per_m3', max=1,),
-               value=SIMP(statut= "o",typ = 'R', defaut=8.46027160095e+28, ),
-            ),
-)
-           
-neutron_spectrum=PROC(nom="neutron_spectrum",op= None,
-           spectrum=SIMP(statut= "o",typ = 'R',max='**', defaut=(0.0465, 21000000000000.0, 0.10000000000000001, 24300000000000.0, 0.20000000000000001, 27300000000000.0, 0.40000000000000002, 37800000000000.0, 0.80000000000000004, 46600000000000.0, 1.0, 16400000000000.0, 1.3999999999999999, 25800000000000.0, 2.5, 41200000000000.0)),
-
-           spectrum_description=SIMP(statut= "f", typ = 'TXM', max=1,),
-)
-
-diffusion_model=PROC(nom="diffusion_model",op=None,
-           mv=FACT(statut='o', max=1,
-           value=SIMP(statut= "o",typ = 'R', defaut=5., ),
-           unit=SIMP(statut= "f", typ = 'TXM', defaut='atomic percent', max=1,),
-)
-)
-           
-
-
-
-
-
-
-
-
-
-
-
+      )
+experimental_resolutions=PROC(nom='experimental_resolutions',op=None,
+          short_doc=SIMP(statut= 'o',typ = 'TXM', defaut="A base class for the minimum radius of interstitial and vacancy clusters taken into account in number densities calculations.", max=1),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+         R_min_V=FACT(statut='o', max=1, fr = '', ang = 'Minimum radius of vacancy clusters taken into account in number densities calculations.', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.0, max=1),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='nm', max=1),
+                  ),
+          access=SIMP(statut= 'o',typ = 'TXM', defaut="user", max=1),
+         interstitial_cluster_shape=FACT(statut='o', max=1, fr = '', ang = 'Choice for the shape of interstitials clusters, disks or spheres.  This only impacts the calculation of the radius of the cluster and associated radial density.', 
+               value=SIMP(statut= 'o',typ = 'TXM', defaut="disk", max=1,into=['disk', 'sphere']),
+                  ),
+         R_min_B=FACT(statut='o', max=1, fr = '', ang = 'Minimum radius of copper precipitates taken into account in number densities calculations.                            ', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.0, max=1),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='nm', max=1),
+                  ),
+         R_min_I=FACT(statut='o', max=1, fr = '', ang = 'Minimum radius of interstitial clusters taken into account in number densities calculations.                            ', 
+               value=SIMP(statut= 'o',typ = 'R', defaut=0.0, max=1),
+               unit=SIMP(statut= 'o',typ = 'TXM', defaut='nm', max=1),
+                  ),
+      )
+damage_energy_model=PROC(nom='damage_energy_model',op=None,
+          a=SIMP(statut= 'o',typ = 'R', defaut=1.11787605409e-09, max=1),
+          elect=SIMP(statut= 'o',typ = 'R', defaut=4.8e-10, max=1),
+          r_bohr=SIMP(statut= 'o',typ = 'R', defaut=5.29e-09, max=1),
+          unit=SIMP(statut= 'o',typ = 'TXM', defaut="", max=1),
+          z_p=SIMP(statut= 'o',typ = 'R', defaut=26.0, max=1),
+          z_t=SIMP(statut= 'o',typ = 'R', defaut=26.0, max=1),
+          access=SIMP(statut= 'o',typ = 'TXM', defaut="expert", max=1),
+          short_doc=SIMP(statut= 'o',typ = 'TXM', defaut="Lindhard damage energy model", max=1),
+          m_p=SIMP(statut= 'o',typ = 'R', defaut=55.0, max=1),
+          m_t=SIMP(statut= 'o',typ = 'R', defaut=55.0, max=1),
+      )