From: pascale.noyret Date: Wed, 16 Jun 2021 15:16:37 +0000 (+0200) Subject: push apres merge avec la v9_Dev du 16 juin X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0f79c7d1d850670674ec44a363b8cfad02b9490d;p=tools%2Feficas.git push apres merge avec la v9_Dev du 16 juin --- 0f79c7d1d850670674ec44a363b8cfad02b9490d diff --cc Accas/A_BLOC.py.orig index 00000000,00000000..862e9c4d new file mode 100644 --- /dev/null +++ b/Accas/A_BLOC.py.orig @@@ -1,0 -1,0 +1,49 @@@ ++# -*- 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 --cc Accas/A_ETAPE.py.orig index 00000000,00000000..0eb5e9a2 new file mode 100644 --- /dev/null +++ b/Accas/A_ETAPE.py.orig @@@ -1,0 -1,0 +1,41 @@@ ++# -*- 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 --cc Accas/A_FACT.py.orig index 00000000,00000000..49ab3084 new file mode 100644 --- /dev/null +++ b/Accas/A_FACT.py.orig @@@ -1,0 -1,0 +1,55 @@@ ++# -*- 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 --cc Accas/A_JDC.py.orig index 00000000,00000000..f55fc6dd new file mode 100644 --- /dev/null +++ b/Accas/A_JDC.py.orig @@@ -1,0 -1,0 +1,53 @@@ ++# -*- 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 --cc Accas/A_JDC_CATA.py.orig index 00000000,00000000..18143024 new file mode 100644 --- /dev/null +++ b/Accas/A_JDC_CATA.py.orig @@@ -1,0 -1,0 +1,44 @@@ ++# -*- 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 --cc Accas/A_MACRO_ETAPE.py.orig index 00000000,00000000..10ec4a9a new file mode 100644 --- /dev/null +++ b/Accas/A_MACRO_ETAPE.py.orig @@@ -1,0 -1,0 +1,44 @@@ ++# -*- 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 --cc Accas/A_MCBLOC.py.orig index 00000000,00000000..e7661c7f new file mode 100644 --- /dev/null +++ b/Accas/A_MCBLOC.py.orig @@@ -1,0 -1,0 +1,41 @@@ ++# -*- 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 --cc Accas/A_MCFACT.py.orig index 00000000,00000000..1cd864a3 new file mode 100644 --- /dev/null +++ b/Accas/A_MCFACT.py.orig @@@ -1,0 -1,0 +1,40 @@@ ++# -*- 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 --cc Accas/A_MCLIST.py.orig index 00000000,00000000..2f7a0c36 new file mode 100644 --- /dev/null +++ b/Accas/A_MCLIST.py.orig @@@ -1,0 -1,0 +1,39 @@@ ++# -*- 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 --cc Accas/A_MCSIMP.py.orig index 00000000,00000000..eb9cec62 new file mode 100644 --- /dev/null +++ b/Accas/A_MCSIMP.py.orig @@@ -1,0 -1,0 +1,40 @@@ ++# -*- 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 --cc Accas/A_OPER.py.orig index 00000000,00000000..1760dc8a new file mode 100644 --- /dev/null +++ b/Accas/A_OPER.py.orig @@@ -1,0 -1,0 +1,45 @@@ ++# -*- 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 --cc Accas/A_PROC.py.orig index 00000000,00000000..362650a3 new file mode 100644 --- /dev/null +++ b/Accas/A_PROC.py.orig @@@ -1,0 -1,0 +1,44 @@@ ++# -*- 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 --cc Accas/A_PROC_ETAPE.py.orig index 00000000,00000000..74d0652e new file mode 100644 --- /dev/null +++ b/Accas/A_PROC_ETAPE.py.orig @@@ -1,0 -1,0 +1,41 @@@ ++# -*- 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 --cc Accas/A_SIMP.py.orig index 00000000,00000000..c23cf7f8 new file mode 100644 --- /dev/null +++ b/Accas/A_SIMP.py.orig @@@ -1,0 -1,0 +1,42 @@@ ++# -*- 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 --cc Efi2Xsd/MCAccasXML.py index 00000000,c6937f8b..fe3e2e72 mode 000000,100755..100755 --- a/Efi2Xsd/MCAccasXML.py +++ b/Efi2Xsd/MCAccasXML.py @@@ -1,0 -1,681 +1,682 @@@ + #!/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 inspect + import traceback + def trace(): + traceback.print_stack() + #import raw.efficas as efficas + import types + + sys.path.insert(0,os.path.abspath(os.path.join(os.getcwd(),'..'))) + + try : + import pyxb + import pyxb.binding + import pyxb.binding.basis + #import pyxb.utils.utility + #import pyxb.utils.domutils + except : pass + + from Accas import A_ASSD + + class X_OBJECT: + # ------------- + + def delObjPyxb(self, debug=False): + if not self.cata or not self.cata.modeleMetier : return + if self.nom == 'Consigne' : return None + trouve = False + + if debug : print ('--------------- in delObjPyxb pour ' , self.nom) + if debug : print (self.perePyxb.objPyxb.orderedContent()) + if debug : print (list(map(lambda o:o.value, self.perePyxb.objPyxb.orderedContent()))) + + elt=pyxb.binding.basis.ElementContent(self.objPyxb, instance=self.perePyxb.objPyxb, tag=pyxb.namespace.ExpandedName(self.cata.modeleMetier.Namespace, self.nom)) + if debug : print ('element moi = ', elt, 'id de moi = ', id(self.objPyxb), self.objPyxb) + if (elt.elementDeclaration.isPlural()): + if debug : print ('je suis Plural') + # monIndexInOrderedContent=0 + # for c in self.perePyxb.objPyxb.orderedContent(): + # if isinstance(c._Content__value,list) and isinstance(c._Content__value[0], type(self.objPyxb)): monIndexInOrderedContent += 1 + # listeObjetsAccas=self.parent.getChild(self.nom,restreint='oui') + # if len(listeObjetsAccas) == 1 : monIndex=0 + # else : monIndex=listeObjetsAccas.index(self) + # listeObjetsPyxb=getattr(self.perePyxb.objPyxb,elt.elementDeclaration._ElementDeclaration__key) + # listeObjetsPyxb.pop(monIndex) + # self.perePyxb.objPyxb.orderedContent().pop(monIndexInOrderedContent) + for c in self.perePyxb.objPyxb.orderedContent(): + trouve=False + if isinstance(c._Content__value,list) and isinstance(c._Content__value[0],type(self.objPyxb)): + monIndex=c.value.index(self.objPyxb) + trouve = True + if trouve : break + if not trouve : print ("************ pas trouve au delete"); return + listeObjetsPyxb=getattr(self.perePyxb.objPyxb,elt.elementDeclaration._ElementDeclaration__key) + listeObjetsPyxb.pop(monIndex) + # si dernier ? + else : + newOrderedContent = [] + for i in self.perePyxb.objPyxb.orderedContent(): + if id(self.objPyxb) == id(i._Content__value) : trouve = True ;continue + newOrderedContent.append(i) + if not trouve : print ('elt a supprimer ', self.nom, 'non trouve') + for i in range(len(newOrderedContent)): + self.perePyxb.objPyxb.orderedContent()[i]=newOrderedContent[i] + self.perePyxb.objPyxb.orderedContent().pop(len(newOrderedContent)) + + setattr(self.perePyxb.objPyxb,elt.elementDeclaration._ElementDeclaration__key,None) + if debug : print (list(map(lambda o:o.value, self.perePyxb.objPyxb.orderedContent()))) + + + + def addObjPyxb(self,indiceDsLeContenu,debug=False): + if not self.cata or not self.cata.modeleMetier : return + if debug :print ('_____________ addObjPyxb ds X_OBJECT', self.nom, indiceDsLeContenu) + # adherence Accas sur le parent + parent=self.parent + while (parent.isBLOC()): + if parent != self.parent : indiceDsLeContenu += parent.rangDsPyxb() + parent=parent.parent + self.perePyxb=parent + + if debug :print ('indiceDsLeContenu',indiceDsLeContenu) + if debug :print (pyxb.namespace.ExpandedName(self.cata.modeleMetier.Namespace, self.nom)) + + #if self.objPyxb ! = None : self.objPyxb.objAccas=self + elt=pyxb.binding.basis.ElementContent(self.objPyxb, instance=self.perePyxb.objPyxb, tag=pyxb.namespace.ExpandedName(self.cata.modeleMetier.Namespace, self.nom)) + self.perePyxb.objPyxb.orderedContent().insert(indiceDsLeContenu,elt) + if (elt.elementDeclaration.isPlural()): + # je suis donc un MCList + listeObjetsAccas=self.parent.getChild(self.nom,restreint='oui') + if len(listeObjetsAccas) == 1 : monIndex=1 + else : monIndex=listeObjetsAccas.index(self) + listeObjetsPyxb=getattr(self.perePyxb.objPyxb,elt.elementDeclaration._ElementDeclaration__key) + listeObjetsPyxb.insert(monIndex,self.objPyxb) + else : + setattr(self.perePyxb.objPyxb,elt.elementDeclaration._ElementDeclaration__key,self.objPyxb) + if debug : print (list(map(lambda o:o.value, self.perePyxb.objPyxb.orderedContent()))) + if debug : print ('fin _____________ addObjPyxb ds X_OBJECT', self.nom, indiceDsLeContenu) + + + def rangDsPyxb(self): + monRangEnAccas=self.parent.mcListe.index(self) + rangEnPyxb=0 + for frere in self.parent.mcListe[0: monRangEnAccas] : + rangEnPyxb += frere.longueurDsArbre() + return rangEnPyxb + + + class X_MCSIMP(X_OBJECT): + # ----------------------- + + def buildObjPyxb(self, debug=True) : + if not self.cata or not self.cata.modeleMetier : return + if self.nom == 'Consigne' : return None + if debug : print (self.definition.nomComplet()) + if debug : print ('_______________ X_MCSIMP buildObjPyxb', self.nom, self,self.valeur) + if debug and self.objPyxbDeConstruction == None : print (self.nom, ' pas de pyxb') + elif debug : print ('objPyxbDeConstruction', self.objPyxbDeConstruction) + + if self.objPyxbDeConstruction != None : + self.objPyxb = self.objPyxbDeConstruction + self.maClasseModeleMetier =type(self.objPyxb) + self.objPyxbDeConstruction = None + if issubclass(self.maClasseModeleMetier, self.cata.modeleMetier.pyxb.binding.basis.STD_union): + self.needFactory=True + self.maClasseModeleMetierFactory=getattr(self.maClasseModeleMetier,'Factory') + else : self.needFactory=False + else : + self.monNomClasseModeleMetier ='T_'+self.nom + if hasattr(self.definition,'nomXML') and self.definition.nomXML != None : self.monNomClasseModeleMetier='T_'+self.definition.nomXML + if self.monNomClasseModeleMetier in list(self.cata.DicoNomTypeDifferentNomElt.keys()) : + nomComplet=self.definition.nomComplet() + if nomComplet in list(self.cata.DicoNomTypeDifferentNomElt[self.monNomClasseModeleMetier].keys()): + self.monNomClasseModeleMetier=self.cata.DicoNomTypeDifferentNomElt[self.monNomClasseModeleMetier][nomComplet] + if debug : print ('Pour', self.nom, ' le type est ', self.monNomClasseModeleMetier) + self.maClasseModeleMetier=getattr(self.cata.modeleMetier,self.monNomClasseModeleMetier) + + if self.waitMatrice() : + #PNPN : Attention rien ne relie les objets listeObjPyxb a un objAccas + # 27/04 je ne sais pas si cela posera pb + self.listeLines = [] + self.maClasseModeleMetier=getattr(self.cata.modeleMetier,self.monNomClasseModeleMetier) + self.maClasseModeleMetier_line=getattr(self.cata.modeleMetier,self.monNomClasseModeleMetier+'_line') + if debug : print ('Matrice de type ', self.maClasseModeleMetier) + for v in self.valeur: + l=self.maClasseModeleMetier_line(v) + self.listeLines.append(l) + self.objPyxb=self.maClasseModeleMetier(*self.listeLines) + #if self.objPyxb !=None : self.objPyxb.objAccas=self + if debug : print ('Matrice ', self.nom, self.objPyxb) + return + if self.waitTuple() : + self.objPyxb = [] + self.maClasseModeleMetier=getattr(self.cata.modeleMetier,self.monNomClasseModeleMetier) + # if faut traiter l autre cas + # et optimiser + if self.definition.max !=1 : + for v in self.valeur : + if debug : print ('je traite ', v) + listeConstruction=[] + for i in range(self.combienEltDsTuple()): + num=i+1 + maClasseElt=getattr(self.cata.modeleMetier,self.monNomClasseModeleMetier+'_n'+str(num)) + listeConstruction.append(maClasseElt(v[i])) + self.objPyxb.append(self.maClasseModeleMetier(*listeConstruction)) + if debug : print (self.objPyxb) + return + if self.waitChaineAvecBlancs() and self.definition.max > 1: + self.maClasseModeleMetier=getattr(self.cata.modeleMetier,self.monNomClasseModeleMetier) - print (self.valeur) - self.objPyxb = self.maClasseModeleMetier(*self.valeur) ++ if debug : print (self.valeur) ++ if self.valeur != None and self.valeur != [] : self.objPyxb = self.maClasseModeleMetier(*self.valeur) ++ else :self.objPyxb = self.maClasseModeleMetier() + if debug : print ('X_MCSIMP', self.nom, self.objPyxb, ) + if debug : print ('__________ fin X_MCSIMP', self.objPyxb, self.nom, self, self.maClasseModeleMetier,self.valeur) + return + + + if issubclass(self.maClasseModeleMetier, self.cata.modeleMetier.pyxb.binding.basis.STD_union): + if debug : print ('needFactory') + self.needFactory=True + self.maClasseModeleMetierFactory=getattr(self.maClasseModeleMetier,'Factory') + else : self.needFactory=False + + if self.valeur != None : + if self.needFactory : + if self.definition.max > 1 : + # PNPN A corriger + # self.objPyxb=self.maClasseModeleMetier(self.valeur) + self.objPyxb=self.maClasseModeleMetierFactory(self.valeur) + else : self.objPyxb=self.maClasseModeleMetierFactory(self.valeur) + else : self.objPyxb=self.maClasseModeleMetier(self.valeur) + else : + if self.needFactory : self.objPyxb=None + else : self.objPyxb=self.maClasseModeleMetier(_validate_constraints=False) + + + #if self.objPyxb !=None : self.objPyxb.objAccas=self + if debug : print ('X_MCSIMP', self.nom, self.objPyxb, ) + if debug : print ('__________ fin X_MCSIMP', self.objPyxb, self.nom, self, self.maClasseModeleMetier,self.valeur) + + + def setValeurObjPyxb(self,newVal, debug=False): + if not self.cata or not self.cata.modeleMetier : return + if debug : print (' ___________________________ dans setValeurObjPyxb MCSIMP ', self.nom, newVal) + if debug : print (' self.perePyxb = ', self.perePyxb.nom) + if debug : print (self.nom , ' a pour pere', self.perePyxb, self.perePyxb.nom, self.perePyxb.objPyxb) + if debug : print ('debut du setValeurObjPyxb pour ', self.nom, self.perePyxb.objPyxb.orderedContent()) + + #if newVal != None : nvlObj=self.maClasseModeleMetier(newVal) + if newVal != None : + if self.needFactory : nvlObj=self.maClasseModeleMetierFactory(newVal) + else : nvlObj=self.maClasseModeleMetier(newVal) + else : + if self.needFactory : nvlObj =None + else : nvlObj=self.maClasseModeleMetier(_validate_constraints=False) + self.val=newVal + if debug : print ('fin du setValeurObjPyxb pour ', self.nom, self.perePyxb.objPyxb.orderedContent()) + + if inspect.isclass(newVal) and issubclass(newVal,A_ASSD) : + newVal = newVal.nom + setattr(self.perePyxb.objPyxb,self.nom,nvlObj) + trouve=False + indice=0 + for i in self.perePyxb.objPyxb.orderedContent(): + if i.elementDeclaration.id() == self.nom: + #if isinstance(i._Content__value, self.maClasseModeleMetier) : + self.perePyxb.objPyxb.orderedContent()[indice]=self.perePyxb.objPyxb.orderedContent()[-1] + del(self.perePyxb.objPyxb.orderedContent()[-1]) + trouve=True + break + indice+=1 + if not trouve : print ('Attention souci au changement de valeur de ', self.nom) + self.objPyxb=nvlObj + #self.objPyxb.objAccas=self + if debug : print ('fin du setValeurObjPyxb pour ', self.nom, self.perePyxb.objPyxb.orderedContent()) + + + + + class X_MCCOMPO(X_OBJECT) : + # ------------------------- + # + def buildObjPyxb(self,mc_list, debug=False) : + if not self.cata or not self.cata.modeleMetier : return + + #if self.nom == 'Scenario_data' : debug=1 + if debug : print ('X_MCCOMPO', self.nom) + deepDebug=False + self.listArg=[] + self.dicoArg={} + for objAccas in mc_list : + if objAccas.nature == 'MCBLOC' : + self.exploreBLOC(objAccas) + elif objAccas.nature == 'MCList' : + if objAccas[0].definition.max > 1 : + self.listArg.append(objAccas) # les MCList n ont pas objPyxb + self.dicoArg[objAccas.nom]=[] + for fils in objAccas : + fils.perePyxb=self + self.dicoArg[objAccas.nom].append(fils.objPyxb) + else : + objAccas[0].perePyxb=self + self.dicoArg[objAccas.nom]=objAccas[0].objPyxb + self.listArg.append(objAccas[0].objPyxb) + else : + if objAccas.nom == 'Consigne' : continue + print ('______________', objAccas.nom, objAccas.objPyxb) + self.listArg.append(objAccas.objPyxb) + self.dicoArg[objAccas.nom]=objAccas.objPyxb + objAccas.perePyxb=self + + if debug : print('X_MCCOMPO -- listArg ---',self.nom,self.listArg) + if debug : print('X_MCCOMPO -- dicoArg ---',self.nom,self.dicoArg) + + + self.monNomClasseModeleMetier='T_'+self.nom + if self.monNomClasseModeleMetier in list(self.cata.DicoNomTypeDifferentNomElt.keys()) : + self.nomComplet=self.definition.nomComplet() + self.monNomClasseModeleMetier=self.cata.DicoNomTypeDifferentNomElt[self.monNomClasseModeleMetier][self.nomComplet] + self.maClasseModeleMetier=getattr(self.cata.modeleMetier,self.monNomClasseModeleMetier) + + # PN : Ne doit-on pas tester avant + if self.objPyxbDeConstruction != None : + self.objPyxb = self.objPyxbDeConstruction + self.objPyxbDeConstruction = None + if debug : print ('je passe dans le if pour ', self.nom, self.objPyxb, self) + if debug : print ('X_MCCOMPO', self, self.nom, self.objPyxb,self.listArg,self.objPyxb.orderedContent()) + else : + if debug : print (self.listArg) + if debug : print (self.maClasseModeleMetier) + # self.objPyxb=self.maClasseModeleMetier(*self.listArg) + self.objPyxb=self.maClasseModeleMetier(**self.dicoArg) + if deepDebug : + print ('debut de __________ new ordered content') + for o in self.objPyxb.orderedContent(): + print ('o', o) + print ('value', o.value) + print ('type', type(o.value)) + print ('id', id(o.value)) + print ('fin __________ new ordered content') + print ('debut de __________ listArg') + for obj in self.listArg: + print ('obj',obj) + print ('type obj', type(obj)) + print ('id(obj)', id(obj)) + print ('fin __________ listArg') + + newOrderedContent=[] + if debug : print ('list Arg') + for obj in self.listArg: + if debug : + print ('obj',obj) + print ('type obj', type(obj)) + print ('id(obj)', id(obj)) + + # on teste le caractere pluriel + if isinstance(obj, list): + for c in self.objPyxb.orderedContent() : + if hasattr (c,'value') and c.value == obj : + newOrderedContent.append(c) + continue + if (hasattr(obj, 'nature')) : # attention on a un object Accas et non un pyxb car les MCList n ont pas de objPyxb + max=obj[0].definition.max + else : max = 1 + if max == 1 : + #if not(issubclass(type(obj), pyxb.binding.basis.enumeration_mixin) ): + # newOrderedContent.append(self.objPyxb.orderedContent()[list(map(lambda o:id(o.value), self.objPyxb.orderedContent())).index(id(obj))] ) + #else : + # newOrderedContent.append(self.objPyxb.orderedContent()[list(map(lambda o:type(o.value), self.objPyxb.orderedContent())).index(type(obj))] ) + # PN 22 sept 2020 . pourquoi pas toujours l id. le tyoe ne convient pas en cas d union d enum + newOrderedContent.append(self.objPyxb.orderedContent()[list(map(lambda o:id(o.value), self.objPyxb.orderedContent())).index(id(obj))] ) + else : # element Pural + for c in self.objPyxb.orderedContent() : + if isinstance(c._Content__value,list) and isinstance(c._Content__value[0], type(obj[0].objPyxb)): newOrderedContent.append(c) + + for i in range(len(self.listArg)): + self.objPyxb.orderedContent()[i]=newOrderedContent[i] + debug=True + if debug : print ('X_MCCOMPO', self, self.nom, self.objPyxb) + if debug : print ('X_MCCOMPO', self.listArg) + if debug : print ('X_MCCOMPO', newOrderedContent) + if debug : print ( 'X_MCCOMPO',self.objPyxb.orderedContent()) + if debug : print ('fin buildObjetPyxb _______________________________________') + # assert(self.objPyxb.validateBinding()) + + + def exploreBLOC(self,objAccas,debug=False): + if debug : print (' ds exploreBLOC', objAccas.nom) + laListeSsLesBlocs=[] + for fils in objAccas.mcListe: + if fils.nature == 'MCBLOC' : + self.exploreBLOC(fils) + elif fils.nature == 'MCList' : + #print ('exploreBLOC des MCList', fils.nom) + self.dicoArg[fils.nom]=[] + if fils[0].definition.max > 1 : + #print ('ajout de ', fils) + self.listArg.append(fils) # les MCList n ont pas objPyxb + for objFils in fils : + objFils.perePyxb=self + self.dicoArg[fils.nom].append(objFils.objPyxb) + else: + fils[0].perePyxb=self + self.dicoArg[fils.nom]=fils[0].objPyxb + self.listArg.append(fils[0].objPyxb) + else : + if fils.nom == "Consigne" : continue + self.listArg.append(fils.objPyxb) + self.dicoArg[fils.nom]=fils.objPyxb + fils.perePyxb=self + if debug : print (fils.nom ,' est un SIMP a pour pere Pyxb', self, self.nom) + if debug : print ('fin ds exploreBLOC', objAccas .nom) + + + + + class X_MCBLOC (X_MCCOMPO): + # -------------------------- + def buildObjPyxb(self,mc_list,debug=False): + if not self.cata or not self.cata.modeleMetier : return + if debug : print ('X_MCBLOC buildObjPyxb', self.nom, self, mc_list, 'ne fait rien') + self.perePyxb=None + self.objPyxb=None + + def addObjPyxb(self, indiceDsLeContenu, debug=False): + if not self.cata or not self.cata.modeleMetier : return + if debug : print ('X_MCBLOC addObjPyxb', self.nom, self, self.mcListe, indiceDsLeContenu) + rangDeLObjet=indiceDsLeContenu + for obj in self.mcListe: + obj.addObjPyxb( rangDeLObjet) + rangDeLObjet=rangDeLObjet+obj.longueurDsArbre() + + def delObjPyxb(self, debug=False): + if not self.cata or not self.cata.modeleMetier : return + if debug : print ('X_MCBLOC delObjPyxb', self.nom, ' --------------------------') + for obj in self.mcListe: + obj.delObjPyxb() + if debug : print ('fin X_MCBLOC delObjPyxb --------------------------') + + class X_MCLIST (X_MCCOMPO): + # -------------------------- + + def buildObjPyxb(self,mc_list, debug=False): + if debug : print ('X_MCLIST buildObjPyxb ne fait rien', self.nom, self, mc_list) + pass + + def addObjPyxb(self,indiceDsLeContenu, debug=False): + if debug : print ('X_MCLIST addObjPyxb', self.nom, indiceDsLeContenu) + rangDeLObjet=indiceDsLeContenu + for objFils in self : + objFils.addObjPyxb(rangDeLObjet) + rangDeLObjet= rangDeLObjet + 1 + + def delObjPyxb(self, debug=False): + if not self.cata or not self.cata.modeleMetier : return + if debug : print ('X_MCLIST delObjPyxb', self.nom, ' --------------------------') + for obj in self: + obj.delObjPyxb() + if debug : print ('fin X_MCLIST delObjPyxb --------------------------') + + + class X_MCFACT (X_MCCOMPO): + # ------------------------- + pass + + class X_ETAPE(X_MCCOMPO) : + # ------------------------- + + def metAJourNomASSD(self, nom,debug=False): + if not self.cata or not self.cata.modeleMetier : return + if debug : print ('X_ETAPE metAJourLesAttributs', self.nom, nom,' --------------------------') + self.objPyxb.sdName=nom + + class X_JDC (X_MCCOMPO): + # --------------------- + + def __init__(self): + self.perePyxb=None + if not self.cata or not self.cata.modeleMetier : return + #if hasattr(self.cata,'DicoNomTypeDifferentNomElt') : print ('jkllllllllllllllll') + if not(hasattr(self.cata,'DicoNomTypeDifferentNomElt')) : self.cata.DicoNomTypeDifferentNomElt={} + self.monNomClasseModeleMetier=self.code + self.maClasseModeleMetier=getattr(self.cata.modeleMetier,self.monNomClasseModeleMetier) + self.objPyxb=self.maClasseModeleMetier() + #self.objPyxb.objAccas=self + pyxb.GlobalValidationConfig._setContentInfluencesGeneration(pyxb.GlobalValidationConfig.NEVER) + pyxb.GlobalValidationConfig._setInvalidElementInContent(pyxb.GlobalValidationConfig.RAISE_EXCEPTION) + pyxb.GlobalValidationConfig._setOrphanElementInContent(pyxb.GlobalValidationConfig.RAISE_EXCEPTION) + + + + def enregistreEtapePyxb(self,etape,indice=0): + # ne fonctionne pas : a reecrire avec les fonctions addObjPyxb et ReconstruitPerePyxb + # ne contient pas indice pour l insant + # print ( 'hhhhhhhhhhhhhhh enregistreEtapePyxb hhhhhhhhhhhhhhhhhhhhhhhhh') + # print ('enregistre ds ',self, etape.nom, 'indice = ', indice) + if not self.cata.modeleMetier : return + self.objPyxb.append(etape.objPyxb) + etape.perePyxb = self + + #print (self.objPyxb.orderedContent()) + #if indice != (len(self.objPyxb.orderedContent()) ) : + # tampon=self.objPyxb.orderedContent()[-1] + # for i in reversed(range(len(self.objPyxb.orderedContent()))): + # self.objPyxb.orderedContent()[i]=self.objPyxb.orderedContent()[i-1] + # if i == indice + 1 : break + # self.objPyxb.orderedContent()[indice]=tampon + + #print (self.objPyxb.orderedContent()) + #try: + # self.objPyxb.validateBinding() + #except pyxb.ValidationError as e: + # print(e.details()) + + def toXml(self,fichier=None, debug=False): + if debug : print ('ds to XML') + if not self.cata or not self.cata.modeleMetier : return + if debug : print (' to xml ***************',self.objPyxb,'***************',) + if debug : print (' to xml ***************',self,'***************',) + if debug : print (' to xml ***************',self.objPyxb.orderedContent(),'***************',) + if debug : print(self.objPyxb.toDOM().toprettyxml()) + if debug : print(self.objPyxb.toxml()) + return (self.objPyxb.toDOM().toprettyxml()) + + + def analyseFromXML(self,debug=False): + print ("je suis ds analyseFromXML -- > appel ds analyseXML de I_JDC.py") + if self.procedure == "" : return + self.objPyxb=self.cata.modeleMetier.CreateFromDocument(self.procedure) + if not hasattr(self.cata.modeleMetier,'AccasUserAssd'): + from Accas import UserASSD + self.cata.modeleMetier.AccasUserAssd=UserASSD + for contentObjEtape in self.objPyxb.orderedContent(): + objEtape=contentObjEtape.value + objEtape.dictArgs=(self.pyxbToDict(objEtape)) + objEtape.monNomClasseAccas=objEtape._ExpandedName.localName() + objEtape.monNomClasseAccas=objEtape.monNomClasseAccas[2:] + # doute sur les 2 lignes suivantes : objEtape peut etre contentObjEtape 2juin20 + objEtape.dictPyxb['objEnPyxb']=objEtape + objEtape.dictArgs['dicoPyxbDeConstruction']=objEtape.dictPyxb + if debug : print ('dicoPyxbDeConstruction', objEtape.dictArgs['dicoPyxbDeConstruction']) + maClasseAccas=getattr(self.cata,objEtape.monNomClasseAccas) + if debug : print ( 'hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh') + if debug : print ('maClasseAccas ', maClasseAccas) + if debug : print ('objEtape ', objEtape , type(objEtape)) + if debug : print ('nomClasseAccas ',objEtape.monNomClasseAccas, type(objEtape.monNomClasseAccas)) + if debug : print ('_ExpandedName ', objEtape._ExpandedName, type(objEtape._ExpandedName)) + if debug : print ('dictArgs ',objEtape.dictArgs) + if debug : print ('dictPyxb ',objEtape.dictPyxb) + # attention au call d Oper qui renomme l objet pyxb + if hasattr(objEtape,'sdName') : + if debug and hasattr(objEtape,'sdName') :print ('sdName',objEtape.sdName) + objAccasEtape=maClasseAccas(nomXML=objEtape.sdName, **(objEtape.dictArgs)) + else : objAccasEtape=maClasseAccas(**(objEtape.dictArgs)) + if debug : print ( 'hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh') + + + def pyxbToDict(self,objAAnalyser, debug=True): + # la transformation de l objAAnalyser en type lu par eficas ne fonctionne pas pour tout + if objAAnalyser is None: return + if debug : print ('debut pour_____________________________ ',objAAnalyser) + dictArgs = {} + # traitement SIMP + # --------------- + # a revoir pour les matrices + # et les tuples + debug = 1 + if isinstance(objAAnalyser, pyxb.binding.basis.simpleTypeDefinition): + if debug : print ('je suis un MCSimple', objAAnalyser) + # traitement scalaire + objAAnalyser.dictPyxb=objAAnalyser + if not (isinstance(objAAnalyser,pyxb.binding.basis.STD_list)): + if debug : print ('je suis un scalaire') + if isinstance(objAAnalyser,self.cata.modeleMetier.AccasUserAssd) or isinstance(objAAnalyser,self.cata.modeleMetier.AccasUserAssdMultiple): + if debug : print ('je suis un UserASSD') + laClassePyxbUserAssd=type(objAAnalyser) + return self.creeUserAssd(objAAnalyser,laClassePyxbUserAssd) + if isinstance(objAAnalyser, pyxb.binding.datatypes.boolean) : return bool(objAAnalyser) + if isinstance(objAAnalyser, str) : return str(objAAnalyser) + if isinstance(objAAnalyser, int) : return int(objAAnalyser) + if isinstance(objAAnalyser, float): return float(objAAnalyser) + if isinstance(objAAnalyser, pyxb.binding.basis.enumeration_mixin): return str(objAAnalyser) + return objAAnalyser + else : + if debug : print ('je suis une liste') + laListe=[] + # liste homogene + if len(objAAnalyser)>0: + if issubclass(objAAnalyser[0].__class__,self.cata.modeleMetier.AccasUserAssd) or issubclass(objAAnalyser[0].__class__,self.cata.modeleMetier.AccasUserAssdMultiple): estUnUserASSDorUserASSDMultiple = True + else : estUnUserASSDorUserASSDMultiple=False + else : estUnUserASSDorUserASSDMultiple=False + if debug : print ('estUnUserASSDorUserASSDMultiple', estUnUserASSDorUserASSDMultiple) + for obj in objAAnalyser : + if estUnUserASSDorUserASSDMultiple: + laClassePyxbUserAssd=obj.__class__ + laListe.append(self.creeUserAssd(obj,laClassePyxbUserAssd)) + elif isinstance(obj, str): laListe.append (str(obj)) + elif isinstance(obj, int): laListe.append (int(obj)) + elif isinstance(obj, float): laListe.append (float(obj)) + elif isinstance(obj, pyxb.binding.basis.enumeration_mixin): laListe.append(str(obj)) + else : laListe.append(obj) + return (laListe) + # if debug : print ('je suis Plural') + # ou ? return objAAnalyser + #if isinstance(objAAnalyser, types.StringTypes): return pyxb.utils.utility.QuotedEscaped(objAAnalyser,) + #pour une enum getattr(value dans le type) + # return pythonLiteral(ReferenceFacet(facet=value, **kw)) + #print ('je suis un mot complexe') + # traitement FACT ou BLOC + # ------------------------ + # il faut traiter les fact multiples + objAAnalyser.dictPyxb = {} + objAAnalyser.dictPyxb['objEnPyxb']=objAAnalyser + #for expandedName, elementDeclaration in objAAnalyser._ElementMap.items(): + # objPyxbName = expandedName.localName() + # objPyxbValue = getattr(objAAnalyser, objPyxbName) + for objEltContentFils in objAAnalyser.orderedContent(): + objPyxbValue = objEltContentFils.value + objPyxbName = objEltContentFils.elementDeclaration.id() + elementDeclaration = objEltContentFils.elementDeclaration + #if objPyxbValue == None or objPyxbValue == [] : continue + if elementDeclaration.isPlural(): + if objPyxbName not in list(dictArgs.keys()) : dictArgs[objPyxbName]=[] + if objPyxbName not in list(objAAnalyser.dictPyxb.keys()) : objAAnalyser.dictPyxb[objPyxbName]=[] + dictArgs[objPyxbName].append(self.pyxbToDict(objPyxbValue)) + objAAnalyser.dictPyxb[objPyxbName].append(objPyxbValue.dictPyxb) + else: + dictArgs[objPyxbName] = self.pyxbToDict(getattr(objAAnalyser, objPyxbName)) + objAAnalyser.dictPyxb[objPyxbName] = objPyxbValue.dictPyxb + # print ('ajout dans dictPyxb', objPyxbName, objPyxbValue.dictPyxb) + #print ('avec la valeur', 'de', objAAnalyser.dictPyxb[objPyxbName]) + + #print ("***********************************") + #print ('pyxbToDict fin pour ********** ', objAAnalyser) + #print ('pyxbToDict ', objAAnalyser, objAAnalyser.dictPyxb) + #print ('pyxbToDict fin pour ********** ', objAAnalyser) + #print ("***********************************") + #print (dictArgs) + #print (dictPyxb) + #for i in dictArgs.keys(): print (i, " ", dictArgs[i], " ", type(dictArgs[i])) + #print ('fin pour ',objAAnalyser) + return dictArgs + + def creeUserAssd(self,objAAnalyser,laClassePyxbUserAssd,debug=True): + + enCreation=False + if debug : print ('creeUserAssd ', objAAnalyser, ' ',laClassePyxbUserAssd) + leTypeIntermediaire=laClassePyxbUserAssd.XsdSuperType() + if debug : print ('leTypeIntermediaire ', leTypeIntermediaire) + if debug : print ('leTypeIntermediaire ', leTypeIntermediaire.XsdSuperType()) + if leTypeIntermediaire.__name__[-2:]== '_C' : enCreation = True + elif leTypeIntermediaire.__name__[-2:] != '_U' : print ('pb avec', laClassePyxbUserAssd); return None #exit() + nomClasseAccasUserAssd=leTypeIntermediaire.XsdSuperType().__name__ + if debug : print ('nomClasseAccasUserAssd', nomClasseAccasUserAssd) + laClasseAccas=getattr(self.cata,nomClasseAccasUserAssd) + print (laClasseAccas) + if not(enCreation): + if str(objAAnalyser) in self.g_context.keys():return self.g_context[str(objAAnalyser)] + else : + obj=laClasseAccas() + self.g_context[str(objAAnalyser)]=obj + return obj + if str(objAAnalyser) in self.g_context.keys(): + if isinstance(self.g_context[str(objAAnalyser)],laClasseAccas): + return self.g_context[str(objAAnalyser)] + else : + nvlObj=laClasseAccas() + oldObj=self.g_context[str(objAAnalyser)] + nvlObj.transfere(oldObj) + self.g_context[str(objAAnalyser)]=nvlObj + return nvlObj + else : + obj=laClasseAccas() + self.g_context[str(objAAnalyser)]=obj + return obj + + # def analyseContent(self,objAAnalyser): + # objAAnalyser.dictArgs={} + # for objContenu in objAAnalyser.content(): + # #print ('j analyse ', objContenu) + # objContenu.monNomClasseModeleMetier=str(objContenu.__class__).split('.')[-1] + # objContenu.monNomClasseAccas=objContenu.monNomClasseModeleMetier[2:-2] + # #maClasseAccas=classeAccasPere.entites[objContenu.monNomClasseAccas] + # if objContenu._IsSimpleTypeContent(): + # print (objContenu.monNomClasseAccas,objContenu.pythonLiteral()) + # print (objContenu.monNomClasseAccas,objContenu.xsdLiteral()) + # #chaine=objContenu.pythonLiteral().split('(')[1].split(')')[0] + # print (dir(objContenu)) + # objAAnalyser.dictArgs[objContenu.monNomClasseAccas]=None + # #objAAnalyser.dictArgs[objContenu.monNomClasseAccas]=objContenu.pythonLiteral() + # else : + # self.analyseContent(objContenu) + # objAAnalyser.dictArgs[objContenu.monNomClasseAccas]=objContenu.dictArgs + #print ( '________________') + #print (objAAnalyser.monNomClasseAccas) + #for i in objAAnalyser.dictArgs : print (i, objAAnalyser.dictArgs[i]) + #print ( '________________') + + + + if __name__ == "__main__": + print ('a faire') diff --cc InterfaceQT4/editorSsIhm.py index d6b507c0,419092b9..419092b9 mode 100644,100755..100644 --- a/InterfaceQT4/editorSsIhm.py +++ b/InterfaceQT4/editorSsIhm.py diff --cc InterfaceQT4/qtEficas_with_log.py index 2eb78021,ad1b229b..00000000 deleted file mode 100644,100644 --- a/InterfaceQT4/qtEficas_with_log.py +++ /dev/null @@@ -1,612 -1,612 +1,0 @@@ --# -*- coding: iso-8859-1 -*- - # Copyright (C) 2007-2017 EDF R&D -# 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 os, sys -- -- --from PyQt4.QtGui import * --from PyQt4.QtCore import * --from myMain import Ui_Eficas --from viewManager import MyTabview --from getVersion import getEficasVersion -- --from Extensions.i18n import tr --from Extensions.eficas_exception import EficasException -- --from Editeur import session - import Accas -import Accas -- -- --class Appli(Ui_Eficas,QMainWindow): -- """ -- Class implementing the main user interface. -- """ -- def __init__(self,code=None,salome=0,parent=None,ssCode=None,multi=False,langue='fr'): -- """ -- Constructor -- """ -- QMainWindow.__init__(self,parent) -- Ui_Eficas.__init__(self) -- self.setupUi(self) -- -- version=getEficasVersion() -- self.VERSION_EFICAS="Eficas QT4 "+version -- self.salome=salome -- self.ihm="QT" -- self.top = self #(pour CONFIGURATION) -- self.QWParent=None #(Pour lancement sans IHM) -- self.code=code -- self.indice=0 -- self.dict_reels={} -- self.recent = QStringList() -- self.ficRecents={} -- self.listeAEnlever=[] -- self.ListeCode=['Aster','Carmel3D','Cuve2dg','Openturns_Study','Openturns_Wrapper','MAP'] -- myFilter = MyEventFilter() -- self.installEventFilter(myFilter) -- -- -- self.repIcon=os.path.join( os.path.dirname(os.path.abspath(__file__)),'../Editeur/icons') -- self.multi=multi -- if langue=='fr': self.langue=langue -- else : self.langue="ang" -- if self.multi == False : - self.definitCode(code,ssCode) - if code==None: return - self.definitCode(code,ssCode) - if code==None: return -- -- eficas_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -- self.ajoutIcones() -- -- self.viewmanager = MyTabview(self) -- self.recentMenu=self.menuFichier.addMenu(tr('&Recents')) -- self.connecterSignaux() -- if self.code != None : self.construitMenu() -- -- -- self.ouvreFichiers() -- self.setWindowTitle(self.VERSION_EFICAS) -- -- #def eventFilter(QObject watched, QEvent e) : -- #def eventFilter(watched, e) : -- # print "hhhhhhhhhhhhhhhhhhhhhh" -- # return QMainWindow.eventFilter(watched, e) -- -- def definitCode(self,code,ssCode) : -- self.code=code -- self.ssCode=ssCode -- if self.code==None : - self.cleanPath() - from monChoixCode import MonChoixCode - widgetChoix = MonChoixCode(self) - ret=widgetChoix.exec_() - self.cleanPath() - from monChoixCode import MonChoixCode - widgetChoix = MonChoixCode(self) - ret=widgetChoix.exec_() -- import sys -- if self.code == None:return # pour le cancel de la fenetre choix code -- name='prefs_'+self.code -- prefsCode=__import__(name) -- -- self.repIni=prefsCode.repIni -- if ssCode != None : - self.format_fichier= ssCode #par defaut - prefsCode.NAME_SCHEME=ssCode - self.format_fichier= ssCode #par defaut - prefsCode.NAME_SCHEME=ssCode -- else : - self.format_fichier="python" #par defaut - self.format_fichier="python" #par defaut -- -- nameConf='configuration_'+self.code -- configuration=__import__(nameConf) -- self.CONFIGURATION = configuration.make_config(self,prefsCode.repIni) -- self.CONFIGStyle = None -- if hasattr(configuration,'make_config_style'): - self.CONFIGStyle = configuration.make_config_style(self,prefsCode.repIni) - self.CONFIGStyle = configuration.make_config_style(self,prefsCode.repIni) -- if hasattr(prefsCode,'encoding'): - import sys - reload(sys) - sys.setdefaultencoding(prefsCode.encoding) - import sys - reload(sys) - sys.setdefaultencoding(prefsCode.encoding) -- -- def construitMenu(self): -- self.initPatrons() -- self.initRecents() -- self.initAides() -- for intituleMenu in ("menuTraduction","menuOptions","menuMesh","menuExecution"): - if hasattr(self,intituleMenu): - menu=getattr(self,intituleMenu) - menu.setAttribute(Qt.WA_DeleteOnClose) - menu.close() - delattr(self,intituleMenu) - if hasattr(self,intituleMenu): - menu=getattr(self,intituleMenu) - menu.setAttribute(Qt.WA_DeleteOnClose) - menu.close() - delattr(self,intituleMenu) -- for intituleAction in ("actionExecution","actionSaveRun",): -- if hasattr(self,intituleAction): - action=getattr(self,intituleAction) - self.toolBar.removeAction(action) - action=getattr(self,intituleAction) - self.toolBar.removeAction(action) -- if self.code in Appli.__dict__.keys(): - listeTexte=apply(Appli.__dict__[self.code],(self,)) - listeTexte=apply(Appli.__dict__[self.code],(self,)) -- -- def initAides(self): -- #print "je passe la" -- repAide=os.path.dirname(os.path.abspath(__file__)) -- fileName='index.html' -- self.docPath=repAide+"/../Aide" -- if hasattr(self,'CONFIGURATION') and hasattr(self.CONFIGURATION,'docPath') : self.docPath=self.CONFIGURATION.docPath -- if hasattr(self,'CONFIGURATION') and hasattr(self.CONFIGURATION,'fileName'):fileName=self.CONFIGURATION.fileName -- self.fileDoc=os.path.join(self.docPath,fileName) -- self.actionCode.setText(tr("Aide specifique ")+str(self.code)) -- if not os.path.isfile(self.fileDoc) : - self.fileDoc="" - self.docPath="" - self.actionCode.setEnabled(False) - return - self.fileDoc="" - self.docPath="" - self.actionCode.setEnabled(False) - return -- -- self.actionCode.setEnabled(True) -- self.menuAide.addAction(self.actionCode) -- -- def MAP(self): -- self.menuExecution = self.menubar.addMenu(QApplication.translate("Eficas", "Execution", None, QApplication.UnicodeUTF8)) -- self.actionExecution = QAction(self) -- icon6 = QIcon(self.repIcon+"/compute.png") -- self.actionExecution.setIcon(icon6) -- self.actionExecution.setObjectName("actionExecution") -- self.menuExecution.addAction(self.actionExecution) -- if not(self.actionExecution in self.toolBar.actions()): - self.toolBar.addAction(self.actionExecution) - self.toolBar.addAction(self.actionExecution) -- self.actionExecution.setText(QApplication.translate("Eficas", "Execution ", None, QApplication.UnicodeUTF8)) -- self.connect(self.actionExecution,SIGNAL("activated()"),self.run) -- -- self.actionSaveRun = QAction(self) -- icon7 = QIcon(self.repIcon+"/export_MAP.png") -- self.actionSaveRun.setIcon(icon7) -- self.actionSaveRun.setObjectName("actionSaveRun") -- self.menuExecution.addAction(self.actionSaveRun) -- if not(self.actionSaveRun in self.toolBar.actions()): - self.toolBar.addAction(self.actionSaveRun) - self.toolBar.addAction(self.actionSaveRun) -- self.actionSaveRun.setText(QApplication.translate("Eficas", "Save Run", None, QApplication.UnicodeUTF8)) -- self.connect(self.actionSaveRun,SIGNAL("activated()"),self.saveRun) -- -- self.menuOptions = self.menubar.addMenu("menuOptions") -- self.menuOptions.addAction(self.actionParametres_Eficas) -- self.menuOptions.setTitle(tr("Options")) -- -- -- def ASTER(self) : -- self.menuTraduction = self.menubar.addMenu("menuTraduction") -- self.menuTraduction.addAction(self.actionTraduitV7V8) -- self.menuTraduction.addAction(self.actionTraduitV8V9) -- self.menuTraduction.addAction(self.actionTraduitV9V10) -- self.menuTraduction.setTitle(tr("Traduction")) -- -- self.menuOptions = self.menubar.addMenu("menuOptions") -- self.menuOptions.addAction(self.actionParametres_Eficas) -- self.menuOptions.addAction(self.actionLecteur_Pdf) -- self.menuOptions.setTitle(tr("Options")) -- -- def CARMEL3D(self): -- #if self.salome == 0 : return -- self.menuMesh = self.menubar.addMenu("menuMesh") -- self.menuMesh.setObjectName("Mesh") -- self.menuMesh.addAction(self.actionChercheGrpMaille) -- -- def ChercheGrpMesh(self): -- Msg,listeGroup=self.ChercheGrpMeshInSalome() -- if Msg == None : - self.viewmanager.handleAjoutGroup(listeGroup) - self.viewmanager.handleAjoutGroup(listeGroup) -- else : - print "il faut gerer les erreurs" - print "il faut gerer les erreurs" -- -- def ChercheGrpMaille(self): -- Msg,listeGroup=self.ChercheGrpMailleInSalome() -- if Msg == None : - self.viewmanager.handleAjoutGroup(listeGroup) - self.viewmanager.handleAjoutGroup(listeGroup) -- else : - print "il faut gerer les erreurs" - print "il faut gerer les erreurs" -- -- -- def ajoutIcones(self) : -- # Pour pallier les soucis de repertoire d icone -- icon = QIcon(self.repIcon+"/New24.png") -- self.action_Nouveau.setIcon(icon) -- icon1 = QIcon(self.repIcon+"/Open24.png") -- self.action_Ouvrir.setIcon(icon1) -- icon2 = QIcon(self.repIcon+"/Save24.png") -- self.actionEnregistrer.setIcon(icon2) -- icon3 = QIcon(self.repIcon+"/Cut24.png") -- self.actionCouper.setIcon(icon3) -- icon4 = QIcon(self.repIcon+"/Copy24.png") -- self.actionCopier.setIcon(icon4) -- icon5 = QIcon(self.repIcon+"/Paste24.png") -- self.actionColler.setIcon(icon5) -- icon6 = QIcon(self.repIcon+"/Delete24.png") -- self.actionSupprimer.setIcon(icon6) -- -- -- -- def connecterSignaux(self) : -- self.connect(self.recentMenu,SIGNAL('aboutToShow()'),self.handleShowRecentMenu) -- -- self.connect(self.action_Nouveau,SIGNAL("activated()"),self.fileNew) -- self.connect(self.actionNouvel_Include,SIGNAL("activated()"),self.NewInclude) -- self.connect(self.action_Ouvrir,SIGNAL("activated()"),self.fileOpen) -- self.connect(self.actionEnregistrer,SIGNAL("activated()"),self.fileSave) -- self.connect(self.actionEnregistrer_sous,SIGNAL("activated()"),self.fileSaveAs) -- self.connect(self.actionFermer,SIGNAL("activated()"),self.fileClose) -- self.connect(self.actionFermer_tout,SIGNAL("activated()"),self.fileCloseAll) -- self.connect(self.actionQuitter,SIGNAL("activated()"),self.fileExit) -- -- self.connect(self.actionEficas,SIGNAL("activated()"),self.aidePPal) -- self.connect(self.actionVersion,SIGNAL("activated()"),self.version) -- -- self.connect(self.actionCouper,SIGNAL("activated()"),self.editCut) -- self.connect(self.actionCopier,SIGNAL("activated()"),self.editCopy) -- self.connect(self.actionColler,SIGNAL("activated()"),self.editPaste) -- self.connect(self.actionSupprimer,SIGNAL("activated()"),self.supprimer) -- self.connect(self.actionRechercher,SIGNAL("activated()"),self.rechercher) -- self.connect(self.actionDeplier_replier,SIGNAL("activated()"),self.Deplier) -- -- self.connect(self.actionRapport_de_Validation,SIGNAL("activated()"),self.jdcRapport) -- self.connect(self.actionFichier_Source,SIGNAL("activated()"),self.jdcFichierSource) -- self.connect(self.actionFichier_Resultat,SIGNAL("activated()"),self.visuJdcPy) -- -- -- #self.connect(self.helpIndexAction,SIGNAL("activated()"),self.helpIndex) -- #self.connect(self.helpContentsAction,SIGNAL("activated()"),self.helpContents) -- -- # Pour Aster -- self.actionTraduitV7V8 = QAction(self) -- self.actionTraduitV7V8.setObjectName("actionTraduitV7V8") -- self.actionTraduitV8V9 = QAction(self) -- self.actionTraduitV8V9.setObjectName("actionTraduitV8V9") -- self.actionTraduitV9V10 = QAction(self) -- self.actionTraduitV9V10.setObjectName("actionTraduitV9V10") -- self.actionTraduitV7V8.setText(tr("TraduitV7V8")) -- self.actionTraduitV8V9.setText(tr("TraduitV8V9")) -- self.actionTraduitV9V10.setText(tr("TraduitV9V10")) -- self.connect(self.actionParametres_Eficas,SIGNAL("activated()"),self.optionEditeur) -- self.connect(self.actionLecteur_Pdf,SIGNAL("activated()"),self.optionPdf) -- self.connect(self.actionTraduitV7V8,SIGNAL("activated()"),self.traductionV7V8) -- self.connect(self.actionTraduitV8V9,SIGNAL("activated()"),self.traductionV8V9) -- self.connect(self.actionTraduitV9V10,SIGNAL("activated()"),self.traductionV9V10) -- -- # Pour Carmel -- self.actionChercheGrpMaille = QAction(self) -- self.actionChercheGrpMaille.setText(tr("Acquiert Groupe Maille")) -- self.connect(self.actionChercheGrpMaille,SIGNAL("activated()"),self.ChercheGrpMaille) -- -- # Pour Aide -- self.actionCode = QAction(self) -- self.actionCode.setText(tr("Specificites Maille")) -- self.connect(self.actionCode,SIGNAL("activated()"),self.aideCode) -- -- def Deplier(self): -- self.viewmanager.handleDeplier() -- -- def ouvreFichiers(self) : -- # Ouverture des fichiers de commandes donnes sur la ligne de commande -- cwd=os.getcwd() -- self.dir=cwd -- for study in session.d_env.studies: -- os.chdir(cwd) -- d=session.get_unit(study,self) -- self.viewmanager.handleOpen(fichier=study["comm"],units=d) -- -- -- def getSource(self,file): -- # appele par Editeur/session.py -- import convert -- p=convert.plugins['python']() -- p.readfile(file) -- texte=p.convert('execnoparseur') -- return texte -- -- def initPatrons(self) : -- # Mise a jour du menu des fichiers recemment ouverts -- from Editeur import listePatrons -- if not(self.code in listePatrons.sous_menus.keys()) : - if hasattr(self,"menuPatrons"): - self.menuPatrons.setAttribute(Qt.WA_DeleteOnClose) - self.menuPatrons.close() - delattr(self,"menuPatrons") - return - if hasattr(self,"menuPatrons"): - self.menuPatrons.setAttribute(Qt.WA_DeleteOnClose) - self.menuPatrons.close() - delattr(self,"menuPatrons") - return -- if (not hasattr(self,"menuPatrons")): - self.menuPatrons = QMenu(self.menubar) - self.menuPatrons.setObjectName("menuPatrons") - self.menubar.addAction(self.menuPatrons.menuAction()) - self.menuPatrons.setTitle(QApplication.translate("Eficas", "Patrons", None, QApplication.UnicodeUTF8)) - self.menuPatrons = QMenu(self.menubar) - self.menuPatrons.setObjectName("menuPatrons") - self.menubar.addAction(self.menuPatrons.menuAction()) - self.menuPatrons.setTitle(QApplication.translate("Eficas", "Patrons", None, QApplication.UnicodeUTF8)) -- else : - self.menuPatrons.clear() - self.menuPatrons.clear() -- self.listePatrons = listePatrons.listePatrons(self.code) -- idx = 0 -- for nomSsMenu in self.listePatrons.liste.keys(): -- ssmenu=self.menuPatrons.addMenu(nomSsMenu) -- for fichier in self.listePatrons.liste[nomSsMenu]: - id = ssmenu.addAction(fichier) - self.ficPatrons[id]=fichier - self.connect(id, SIGNAL('triggered()'),self.handleOpenPatrons) - id = ssmenu.addAction(fichier) - self.ficPatrons[id]=fichier - self.connect(id, SIGNAL('triggered()'),self.handleOpenPatrons) -- # self.Patrons.setItemParameter(id,idx) - idx=idx+1 - idx=idx+1 -- -- def initRecents(self): - self.recent = QStringList() - try : - #if 1 : - rep=os.path.join(os.environ['HOME'],'.config/Eficas',self.code) - monFichier=rep+"/listefichiers_"+self.code - index=0 - f=open(monFichier) - while ( index < 9) : - ligne=f.readline() - if ligne != "" : - l=(ligne.split("\n"))[0] - self.recent.append(l) - index=index+1 - except : - #else : - pass - self.recent = QStringList() - try : - #if 1 : - rep=os.path.join(os.environ['HOME'],'.config/Eficas',self.code) - monFichier=rep+"/listefichiers_"+self.code - index=0 - f=open(monFichier) - while ( index < 9) : - ligne=f.readline() - if ligne != "" : - l=(ligne.split("\n"))[0] - self.recent.append(l) - index=index+1 - except : - #else : - pass -- - try : f.close() - except : pass - try : f.close() - except : pass -- -- def addToRecentList(self, fn): -- """ -- Public slot to add a filename to the list of recently opened files. -- -- @param fn name of the file to be added -- """ -- self.recent.removeAll(fn) -- self.recent.prepend(fn) -- if len(self.recent) > 9: -- self.recent = self.recent[:9] -- -- def sauveRecents(self) : - try : - rep=self.CONFIGURATION.rep_user - monFichier=rep+"/listefichiers_"+self.code - except : - return - try : - try : - rep=self.CONFIGURATION.rep_user - monFichier=rep+"/listefichiers_"+self.code - except : - return - try : -- f=open(monFichier,'w') -- if len(self.recent) == 0 : return -- index=0 -- while ( index < len(self.recent)): - ligne=str(self.recent[index])+"\n" - f.write(ligne) - index=index+1 - except : - ligne=str(self.recent[index])+"\n" - f.write(ligne) - index=index+1 - except : -- pass - try : - try : -- f.close() - except : - except : -- pass -- -- -- -- def traductionV7V8(self): -- from gereTraduction import traduction -- traduction(self.CONFIGURATION.repIni,self.viewmanager,"V7V8") -- -- def traductionV8V9(self): -- from gereTraduction import traduction -- traduction(self.CONFIGURATION.repIni,self.viewmanager,"V8V9") -- -- def traductionV9V10(self): -- from gereTraduction import traduction -- traduction(self.CONFIGURATION.repIni,self.viewmanager,"V9V10") -- -- def version(self) : -- from monVisu import DVisu -- titre = tr("version ") -- monVisuDialg=DVisu(parent=self,fl=0) -- monVisuDialg.setWindowTitle(titre) -- monVisuDialg.TB.setText(self.VERSION_EFICAS +tr(" pour ") + self.code) -- monVisuDialg.adjustSize() -- monVisuDialg.show() -- -- def aidePPal(self) : -- if self.code==None : return -- repAide=os.path.dirname(os.path.abspath(__file__)) -- maD=repAide+"/../Aide" -- try : - indexAide=maD+"/fichiers_EFICAS/index.html" - cmd="xdg-open "+indexAide - os.system(cmd) - indexAide=maD+"/fichiers_EFICAS/index.html" - cmd="xdg-open "+indexAide - os.system(cmd) -- except: - QMessageBox.warning( self,tr( "Aide Indisponible"),tr( "l'aide n est pas installee ")) - QMessageBox.warning( self,tr( "Aide Indisponible"),tr( "l'aide n est pas installee ")) -- -- -- def aideCode(self) : -- if self.code==None : return -- try : -- #if 1 : - cmd="xdg-open "+self.fileDoc - os.system(cmd) - cmd="xdg-open "+self.fileDoc - os.system(cmd) -- except: -- #else: - QMessageBox.warning( self,tr( "Aide Indisponible"),tr( "l'aide n est pas installee ")) - QMessageBox.warning( self,tr( "Aide Indisponible"),tr( "l'aide n est pas installee ")) -- -- -- def optionEditeur(self) : -- try : - name='monOptions_'+self.code - name='monOptions_'+self.code -- except : - QMessageBox.critical( self,tr( "Parametrage"),tr( "Veuillez d abord choisir un code")) - return - QMessageBox.critical( self,tr( "Parametrage"),tr( "Veuillez d abord choisir un code")) - return -- try : -- #if 1: - optionCode=__import__(name) - optionCode=__import__(name) -- except : -- #else : - QMessageBox.critical( self, tr("Parametrage"), tr("Pas de possibilite de personnalisation de la configuration ")) - return - QMessageBox.critical( self, tr("Parametrage"), tr("Pas de possibilite de personnalisation de la configuration ")) - return -- monOption=optionCode.Options(parent=self,modal = 0 ,configuration=self.CONFIGURATION) -- monOption.show() -- -- def optionPdf(self) : -- from monOptionsPdf import OptionPdf -- monOption=OptionPdf(parent=self,modal = 0 ,configuration=self.CONFIGURATION) -- monOption.show() -- -- def handleShowRecentMenu(self): -- """ -- Private method to set up recent files menu. -- """ -- self.recentMenu.clear() -- -- for rp in self.recent: -- id = self.recentMenu.addAction(rp) -- self.ficRecents[id]=rp -- self.connect(id, SIGNAL('triggered()'),self.handleOpenRecent) -- self.recentMenu.addSeparator() -- self.recentMenu.addAction(tr('&Effacer'), self.handleClearRecent) -- -- def handleOpenPatrons(self): -- idx=self.sender() -- fichier=self.repIni+"/../Editeur/Patrons/"+self.code+"/"+self.ficPatrons[idx] -- self.viewmanager.handleOpen(fichier=fichier, patron = 1) -- -- def handleOpenRecent(self): -- idx=self.sender() -- fichier=self.ficRecents[idx] -- self.viewmanager.handleOpen(fichier=fichier, patron =0 ) -- -- def handleClearRecent(self): -- self.recent = QStringList() -- self.sauveRecents() -- -- def fileNew(self): -- try: -- self.viewmanager.newEditor() -- except EficasException, exc: -- msg = unicode(exc) -- if msg != "": -- QMessageBox.warning(self, tr(u"Erreur"), msg) -- -- def fileOpen(self): -- try: -- self.viewmanager.handleOpen() -- except EficasException, exc: -- msg = unicode(exc) -- if msg != "": -- QMessageBox.warning(self, tr(u"Erreur"), msg) -- -- def fileSave(self): -- return self.viewmanager.saveCurrentEditor() -- -- def fileSaveAs(self): -- return self.viewmanager.saveAsCurrentEditor() -- -- def fileClose(self): -- self.viewmanager.handleClose(texte='&Fermer') -- -- def fileCloseAll(self): -- self.viewmanager.handleCloseAll(texte='&Fermer') -- -- def fileExit(self): -- # On peut sortir sur Abort -- res=self.viewmanager.handleCloseAll() -- if (res != 2) : -- self.close() -- return res -- -- def editCopy(self): -- self.viewmanager.handleEditCopy() -- -- def editCut(self): -- self.viewmanager.handleEditCut() -- -- def editPaste(self): -- self.viewmanager.handleEditPaste() -- -- def rechercher(self): -- self.viewmanager.handleRechercher() -- -- def run(self): -- self.viewmanager.run() -- -- def saveRun(self): -- self.viewmanager.saveRun() -- -- def runYACS(self): -- self.viewmanager.runYACS() -- -- def saveYACS(self): -- self.viewmanager.saveYACS() -- -- def supprimer(self): -- self.viewmanager.handleSupprimer() -- -- def jdcFichierSource(self): -- self.viewmanager.handleViewJdcFichierSource() -- -- def jdcRapport(self): -- self.viewmanager.handleViewJdcRapport() -- -- def visuJdcPy(self): -- self.viewmanager.handleViewJdcPy() -- -- -- def NewInclude(self): -- self.viewmanager.newIncludeEditor() -- -- def cleanPath(self): -- for pathCode in self.ListeCode: -- try: - aEnlever=os.path.abspath(os.path.join(os.path.dirname(__file__),'..',pathCode)) - sys.path.remove(aEnlever) - aEnlever=os.path.abspath(os.path.join(os.path.dirname(__file__),'..',pathCode)) - sys.path.remove(aEnlever) -- except : - pass - pass -- for pathCode in self.listeAEnlever: -- try: - sys.path.remove(aEnlever) - sys.path.remove(aEnlever) -- except : - pass - pass -- -- -- def closeEvent(self,event): - res=self.fileExit() - if res==2 : event.ignore() - res=self.fileExit() - if res==2 : event.ignore() -- --if __name__=='__main__': -- -- # Modules Eficas -- rep=os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__),'..','ASTER'))) -- sys.path.append(rep) -- from Aster import prefsCode -- if hasattr(prefsCode,'encoding'): - # Hack pour changer le codage par defaut des strings - import sys - reload(sys) - sys.setdefaultencoding(prefsCode.encoding) - del sys.setdefaultencoding - # Fin hack - # Hack pour changer le codage par defaut des strings - import sys - reload(sys) - sys.setdefaultencoding(prefsCode.encoding) - del sys.setdefaultencoding - # Fin hack -- -- from Editeur import import_code -- from Editeur import session -- -- # Analyse des arguments de la ligne de commande -- options=session.parse(sys.argv) -- code=options.code -- -- -- app = QApplication(sys.argv) -- #app.setMainWidget(mw) (qt3) -- Eficas=Appli() -- Eficas.show() -- -- #app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) -- #mw.ouvreFichiers() -- #mw.show() -- -- res=app.exec_() -- sys.exit(res) diff --cc ReacteurNumerique/cataPocRNWithAssemblyName.py index 00000000,00000000..4fdb2de6 new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/cataPocRNWithAssemblyName.py @@@ -1,0 -1,0 +1,295 @@@ ++# -*- 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 --cc ReacteurNumerique/cata_ReacteurNumerique.py index 00000000,00000000..4b739b57 new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/cata_ReacteurNumerique.py @@@ -1,0 -1,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 --cc ReacteurNumerique/cdm_helpers.py index 00000000,00000000..f09e022f new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/cdm_helpers.py @@@ -1,0 -1,0 +1,32 @@@ ++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 --cc ReacteurNumerique/configuration_EssaiRN.py index 4d130a7a,00000000..a38d1691 mode 100644,000000..100644 --- a/ReacteurNumerique/configuration_EssaiRN.py +++ b/ReacteurNumerique/configuration_EssaiRN.py @@@ -1,43 -1,0 +1,43 @@@ +# -*- coding: utf-8 -*- - # CONFIGURATION MANAGEMENT OF EDF VERSION ++# 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. +# +# +# ====================================================================== +""" + Ce module sert pour charger les paramètres de configuration d'EFICAS +""" +# Modules Python +from InterfaceQT4 import configuration +import os + + +class CONFIG(configuration.configBase): + + #----------------------------------- + def __init__(self,appli,repIni): + #----------------------------------- + + self.labels_user=['catalogues','lang','force_langue'] + self.labels_eficas=['lang','rep_cata','catalogues'] + + configuration.configBase.__init__(self,appli,'.Eficas_monCode') + + +def make_config(appli,rep): + return CONFIG(appli,rep) + diff --cc ReacteurNumerique/edg32.comm index 00000000,00000000..211d5b00 new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/edg32.comm @@@ -1,0 -1,0 +1,78 @@@ ++ ++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 diff --cc ReacteurNumerique/edg32.comm.ref index 00000000,00000000..7d9a605a new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/edg32.comm.ref @@@ -1,0 -1,0 +1,78 @@@ ++ ++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 diff --cc ReacteurNumerique/edg32WithAssemblyName.comm index 00000000,00000000..38b82cf6 new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/edg32WithAssemblyName.comm @@@ -1,0 -1,0 +1,70 @@@ ++ ++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 diff --cc ReacteurNumerique/edg32WithAssemblyName2.comm index 00000000,00000000..312e85cd new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/edg32WithAssemblyName2.comm @@@ -1,0 -1,0 +1,70 @@@ ++ ++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=1, ++ feedback_solver='subdivision', ++ feedback_subdivision=2,), ++ axial_meshing=_F(lower_refl=1, ++ fuel=21, ++ upper_refl=1,),); ++ ++thermo_model=Model_data(physics='Thermalhydraulics', ++ scale='component', ++ axial_meshing=_F(lower_refl=1, ++ fuel=40, ++ upper_refl=1,), ++ code='THYC', ++ radial_meshing=_F(fluid='subdivision', ++ fluid_subdivision=1, ++ pellet=8, ++ clad=2,),); ++ ++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:ce13abdd0825f97e69e9b5deb5d790c8 -:FIN CHECKSUM diff --cc ReacteurNumerique/essaiGetattr.py index 00000000,00000000..c2f786c5 new file mode 100755 --- /dev/null +++ b/ReacteurNumerique/essaiGetattr.py @@@ -1,0 -1,0 +1,57 @@@ ++#!/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 --cc ReacteurNumerique/generateXML.py index 00000000,00000000..d8fd33dd new file mode 100755 --- /dev/null +++ b/ReacteurNumerique/generateXML.py @@@ -1,0 -1,0 +1,36 @@@ ++#!/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 --cc ReacteurNumerique/generateXSD.py index 00000000,00000000..ed550619 new file mode 100755 --- /dev/null +++ b/ReacteurNumerique/generateXSD.py @@@ -1,0 -1,0 +1,36 @@@ ++#!/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 --cc ReacteurNumerique/metier.py index 00000000,00000000..fa4f1d73 new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/metier.py @@@ -1,0 -1,0 +1,4 @@@ ++ ++def RodsWorthSetting(*args,**kwargs) : ++ print ('je suis dans RodsWorthSetting') ++ print ('je peux effectuer un traitement') diff --cc ReacteurNumerique/pocEssaiExecution.py index 00000000,00000000..f6a47efe new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/pocEssaiExecution.py @@@ -1,0 -1,0 +1,47 @@@ ++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 --cc ReacteurNumerique/prefs.py index 2cabfffc,00000000..e4ed9a42 mode 100644,000000..100644 --- a/ReacteurNumerique/prefs.py +++ b/ReacteurNumerique/prefs.py @@@ -1,22 -1,0 +1,22 @@@ +# 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="EssaiRN" ++code="ReacteurNumerique" +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 --cc ReacteurNumerique/prefs_ReacteurNumerique.py index 00000000,00000000..38bfffad new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/prefs_ReacteurNumerique.py @@@ -1,0 -1,0 +1,41 @@@ ++# -*- 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=( ++ ('V0_RN','V0_RN',os.path.join(repIni,'cata_ReacteurNumerique.py'),'python','python'), ++) ++simpleClic=True diff --cc ReacteurNumerique/qtEficasEssai.py index 349334aa,00000000..863353f8 mode 100755,000000..100755 --- a/ReacteurNumerique/qtEficasEssai.py +++ b/ReacteurNumerique/qtEficasEssai.py @@@ -1,36 -1,0 +1,36 @@@ +#!/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 ++ ++import sys,os +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 --cc ReacteurNumerique/qtEficasReacteurNumerique.py index 00000000,00000000..863353f8 new file mode 100755 --- /dev/null +++ b/ReacteurNumerique/qtEficasReacteurNumerique.py @@@ -1,0 -1,0 +1,36 @@@ ++#!/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 --cc ReacteurNumerique/readExemple.py index 00000000,00000000..41453b26 new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/readExemple.py @@@ -1,0 -1,0 +1,80 @@@ ++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 --cc ReacteurNumerique/readExempleWithAssemblyName.py index 00000000,00000000..e2be516e new file mode 100644 --- /dev/null +++ b/ReacteurNumerique/readExempleWithAssemblyName.py @@@ -1,0 -1,0 +1,73 @@@ ++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 --cc Tests/EficasEngineTest.py index 1718c601,4e6823e2..00000000 deleted file mode 100644,100644 --- a/Tests/EficasEngineTest.py +++ /dev/null @@@ -1,249 -1,249 +1,0 @@@ --#!/usr/bin/env python --# -*- coding: utf-8 -*- --# 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 --# --""" -- Ce module sert a lancer EFICAS configure pour Code_Aster --""" --# Modules Python --# Modules Eficas -- --import sys,os --sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..')) -- --from PyQt4.QtCore import * --from InterfaceQT4 import eficas_go -- --import prefs --import difflib -- --from PyQt4.QtGui import * --from myMain import Ui_Eficas --from viewManager import MyTabview --from getVersion import getEficasVersion -- --from Extensions.i18n import tr --from Extensions.eficas_exception import EficasException -- --from Editeur import session -- --import unittest --import HTMLTestRunner -- --class EficasEngineTestSuite(unittest.TestSuite): -- def __init__(self, testList): -- unittest.TestSuite.__init__(self) -- for test in testList: -- self.addTest(test) -- --class EficasEngineTestCase(unittest.TestCase): -- def setUp(self): -- from qtEficas import Appli -- from Editeur import session -- from Extensions import localisation -- -- options = session.parse(sys.argv) -- if options.code!= None : code=options.code -- if options.ssCode!= None : ssCode=options.ssCode -- -- self.code=prefs.code -- self.Eficas=None -- self.editor=None -- -- self.app = QApplication(sys.argv) -- localisation.localise(self.app,'en') -- self.Eficas=Appli(code=self.code,ssCode=None,multi=False,langue='en') -- -- def tearDown(self): -- del self.Eficas -- self.Eficas = None -- del self.app -- self.app = None -- self.editor = None -- -- def close(self): -- if ( self.editor != None ): -- vm=self.Eficas.viewmanager -- index=vm.myQtab.currentIndex() -- idx=index -- while idx < len(vm.dict_editors) -1 : -- vm.dict_editors[idx]=vm.dict_editors[idx+1] -- idx = idx + 1 -- del vm.dict_editors[len (vm.dict_editors) -1] -- try : -- del vm.doubles[vm.dict_editors[index]] -- except : -- pass -- vm.myQtab.removeTab(index) -- self.editor = None -- -- def open_file(self, fileName): -- if ( self.Eficas == None ): -- return False -- -- result=True -- try: -- self.Eficas.viewmanager.handleOpen(fileName) -- index=self.Eficas.viewmanager.myQtab.currentIndex() -- self.editor=self.Eficas.viewmanager.dict_editors[index] -- except: -- result=False -- pass -- -- return result -- -- def save_file(self, file): -- if ( self.editor == None ): -- return False -- -- try: -- os.remove(file) -- except: -- pass -- -- result=True -- -- try: -- self.editor.saveFileAs(fileName=file) -- except: -- result=False -- pass -- return result -- -- def search_object(self, name): -- obj=None -- if ( self.editor != None ): -- obj=self.editor.jdc -- return self.search_subobject(obj, name) -- -- def search_subobject(self, obj, name): -- if ( obj==None ): -- return None -- - if ( hasattr( obj, 'get_sdname' ) and obj.get_sdname() == name ): - if ( hasattr( obj, 'getSdname' ) and obj.getSdname() == name ): -- return obj -- -- list=[] -- if ( hasattr(obj, 'etapes') ): -- list=obj.etapes -- elif ( hasattr(obj, 'mc_liste') ): -- list=obj.mc_liste -- -- o=None -- for i in list: -- o=self.search_subobject(i, name) -- if ( o != None ): -- break -- -- return o -- -- def search_param(self, obj, name): -- if ( obj == None ): -- return None -- -- if ( hasattr( obj, 'nom' ) and obj.nom == name ): -- return obj -- -- list=[] -- if ( hasattr(obj, 'etapes') ): -- list=obj.etapes -- elif ( hasattr(obj, 'mc_liste') ): -- list=obj.mc_liste -- -- o=None -- for i in list: -- o=self.search_param(i, name) -- if ( o != None ): -- break -- -- return o -- -- def remove_object(self, obj): -- if ( obj != None and hasattr( obj, 'parent' ) ): -- p=obj.parent -- if ( p != None ): - p.suppentite(obj) - p.suppEntite(obj) -- -- def compare_files(self, orig, test): -- origlines = open(orig, 'U').readlines() -- testlines = open(test, 'U').readlines() -- -- diff = difflib.unified_diff(origlines, testlines, orig, test) -- -- result = 0; -- for str in diff: -- if ( len(str) == 0 ): -- continue -- elif ( str[0] != ' ' ): -- result=1 -- print str -- -- return result -- -- def testCaseDataDir(self): -- return '/dn24/EFICAS/stv' -- -- def testCaseInputDataFile(self): -- return "" -- -- def testCasePatternDataFile(self): -- dataFile=self.testCaseInputDataFile() -- split=os.path.splitext(dataFile) -- return split[0] + '_ptrn' + split[1] -- -- def testCaseTestDataFile(self): -- dataFile=self.testCaseInputDataFile() -- split=os.path.splitext(dataFile) -- return split[0] + '_test' + split[1] -- -- def testCaseInputDataPath(self): -- return self.testCaseDataDir() + os.sep + self.testCaseInputDataFile() -- -- def testCasePatternDataPath(self): -- return self.testCaseDataDir() + os.sep + self.testCasePatternDataFile() -- -- def testCaseTestDataPath(self): -- return self.testCaseDataDir() + os.sep + self.testCaseTestDataFile() -- -- def runTest(self): -- inputFile=self.testCaseInputDataPath() -- -- self.assert_(self.open_file(inputFile), 'Can not open file: ' + inputFile) -- -- self.assert_(self.performTest(), 'Test not performed') -- -- testFile=self.testCaseTestDataPath() -- -- self.assert_(self.save_file(testFile), 'Can not save file: ' + testFile) -- -- patternFile=self.testCasePatternDataPath() -- cmp=self.compare_files(patternFile, testFile) -- -- self.assert_(cmp == 0, "Pattern file and test file are differs") -- -- self.close() -- -- def performTest(self): -- return True -- --def run_tests(reportFile, testSuit): -- print reportFile -- buf = file(reportFile, 'wb') -- runner = HTMLTestRunner.HTMLTestRunner(stream=buf, title='Test report', description='Result of tests') -- runner.run(testSuit) diff --cc Tests/HTMLTestRunner.py index 0439bf48,9c32b00e..00000000 deleted file mode 100644,100644 --- a/Tests/HTMLTestRunner.py +++ /dev/null @@@ -1,824 -1,824 +1,0 @@@ --""" --A TestRunner for use with the Python unit testing framework. It --generates a HTML report to show the result at a glance. -- --The simplest way to use this is to invoke its main method. E.g. -- -- import unittest -- import HTMLTestRunner -- -- ... define your tests ... -- -- if __name__ == '__main__': -- HTMLTestRunner.main() -- -- --For more customization options, instantiates a HTMLTestRunner object. --HTMLTestRunner is a counterpart to unittest's TextTestRunner. E.g. -- -- # output to a file -- fp = file('my_report.html', 'wb') -- runner = HTMLTestRunner.HTMLTestRunner( -- stream=fp, -- title='My unit test', -- description='This demonstrates the report output by HTMLTestRunner.' -- ) -- -- # Use an external stylesheet. -- # See the Template_mixin class for more customizable options -- runner.STYLESHEET_TMPL = '' -- -- # run the test -- runner.run(my_test_suite) -- -- -------------------------------------------------------------------------- --Copyright (c) 2004-2007, Wai Yip Tung --All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are --met: -- --* Redistributions of source code must retain the above copyright notice, -- this list of conditions and the following disclaimer. --* Redistributions in binary form must reproduce the above copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. --* Neither the name Wai Yip Tung nor the names of its contributors may be -- used to endorse or promote products derived from this software without -- specific prior written permission. -- --THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS --IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED --TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A --PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER --OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, --EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, --PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR --PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF --LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING --NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS --SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --""" -- --# URL: http://tungwaiyip.info/software/HTMLTestRunner.html -- --__author__ = "Wai Yip Tung" --__version__ = "0.8.2" -- -- --""" --Change History -- --Version 0.8.2 --* Show output inline instead of popup window (Viorel Lupu). -- --Version in 0.8.1 --* Validated XHTML (Wolfgang Borgert). --* Added description of test classes and test cases. -- --Version in 0.8.0 --* Define Template_mixin class for customization. --* Workaround a IE 6 bug that it does not treat -- --%(heading)s --%(report)s --%(ending)s -- -- -- --""" -- # variables: (title, generator, stylesheet, heading, report, ending) -- -- -- # ------------------------------------------------------------------------ -- # Stylesheet -- # -- # alternatively use a for external style sheet, e.g. -- # -- -- STYLESHEET_TMPL = """ -- --""" -- -- -- -- # ------------------------------------------------------------------------ -- # Heading -- # -- -- HEADING_TMPL = """
--

%(title)s

--%(parameters)s --

%(description)s

--
-- --""" # variables: (title, parameters, description) -- -- HEADING_ATTRIBUTE_TMPL = """

%(name)s: %(value)s

--""" # variables: (name, value) -- -- -- -- # ------------------------------------------------------------------------ -- # Report -- # -- -- REPORT_TMPL = """ --

Show --Summary --Failed --All --

-- ---------------- -- -- -- -- -- -- -- -- --%(test_list)s -- -- -- -- -- -- -- -- --
Test Group/Test caseCountPassFailErrorView
Total%(count)s%(Pass)s%(fail)s%(error)s 
--""" # variables: (test_list, count, Pass, fail, error) -- -- REPORT_CLASS_TMPL = r""" -- -- %(desc)s -- %(count)s -- %(Pass)s -- %(fail)s -- %(error)s -- Detail -- --""" # variables: (style, desc, count, Pass, fail, error, cid) -- -- -- REPORT_TEST_WITH_OUTPUT_TMPL = r""" -- --
%(desc)s
-- -- -- -- -- %(status)s -- -- -- -- -- -- --""" # variables: (tid, Class, style, desc, status) -- -- -- REPORT_TEST_NO_OUTPUT_TMPL = r""" -- --
%(desc)s
-- %(status)s -- --""" # variables: (tid, Class, style, desc, status) -- -- -- REPORT_TEST_OUTPUT_TMPL = r""" --%(id)s: %(output)s --""" # variables: (id, output) -- -- -- -- # ------------------------------------------------------------------------ -- # ENDING -- # -- -- ENDING_TMPL = """
 
""" -- --# -------------------- The end of the Template class ------------------- -- -- --TestResult = unittest.TestResult -- --class _TestResult(TestResult): -- # note: _TestResult is a pure representation of results. -- # It lacks the output and reporting ability compares to unittest._TextTestResult. -- -- def __init__(self, verbosity=1): -- TestResult.__init__(self) -- self.stdout0 = None -- self.stderr0 = None -- self.success_count = 0 -- self.failure_count = 0 -- self.error_count = 0 -- self.verbosity = verbosity -- -- # result is a list of result in 4 tuple -- # ( -- # result code (0: success; 1: fail; 2: error), -- # TestCase object, -- # Test output (byte string), -- # stack trace, -- # ) -- self.result = [] -- -- -- def startTest(self, test): -- TestResult.startTest(self, test) -- # just one buffer for both stdout and stderr -- self.outputBuffer = StringIO.StringIO() -- stdout_redirector.fp = self.outputBuffer -- stderr_redirector.fp = self.outputBuffer -- self.stdout0 = sys.stdout -- self.stderr0 = sys.stderr -- sys.stdout = stdout_redirector -- sys.stderr = stderr_redirector -- -- -- def complete_output(self): -- """ -- Disconnect output redirection and return buffer. -- Safe to call multiple times. -- """ -- if self.stdout0: -- sys.stdout = self.stdout0 -- sys.stderr = self.stderr0 -- self.stdout0 = None -- self.stderr0 = None - return self.outputBuffer.getvalue() - return self.outputBuffer.getValue() -- -- -- def stopTest(self, test): -- # Usually one of addSuccess, addError or addFailure would have been called. -- # But there are some path in unittest that would bypass this. -- # We must disconnect stdout in stopTest(), which is guaranteed to be called. -- self.complete_output() -- -- -- def addSuccess(self, test): -- self.success_count += 1 -- TestResult.addSuccess(self, test) -- output = self.complete_output() -- self.result.append((0, test, output, '')) -- if self.verbosity > 1: -- sys.stderr.write('ok ') -- sys.stderr.write(str(test)) -- sys.stderr.write('\n') -- else: -- sys.stderr.write('.') -- -- def addError(self, test, err): -- self.error_count += 1 -- TestResult.addError(self, test, err) -- _, _exc_str = self.errors[-1] -- output = self.complete_output() -- self.result.append((2, test, output, _exc_str)) -- if self.verbosity > 1: -- sys.stderr.write('E ') -- sys.stderr.write(str(test)) -- sys.stderr.write('\n') -- else: -- sys.stderr.write('E') -- -- def addFailure(self, test, err): -- self.failure_count += 1 -- TestResult.addFailure(self, test, err) -- _, _exc_str = self.failures[-1] -- output = self.complete_output() -- self.result.append((1, test, output, _exc_str)) -- if self.verbosity > 1: -- sys.stderr.write('F ') -- sys.stderr.write(str(test)) -- sys.stderr.write('\n') -- else: -- sys.stderr.write('F') -- -- --class HTMLTestRunner(Template_mixin): -- """ -- """ -- def __init__(self, stream=sys.stdout, verbosity=1, title=None, description=None): -- self.stream = stream -- self.verbosity = verbosity -- if title is None: -- self.title = self.DEFAULT_TITLE -- else: -- self.title = title -- if description is None: -- self.description = self.DEFAULT_DESCRIPTION -- else: -- self.description = description -- -- self.startTime = datetime.datetime.now() -- -- -- def run(self, test): -- "Run the given test case or test suite." -- result = _TestResult(self.verbosity) -- test(result) -- self.stopTime = datetime.datetime.now() -- self.generateReport(test, result) -- print >>sys.stderr, '\nTime Elapsed: %s' % (self.stopTime-self.startTime) -- return result -- -- -- def sortResult(self, result_list): -- # unittest does not seems to run in any particular order. -- # Here at least we want to group them together by class. -- rmap = {} -- classes = [] -- for n,t,o,e in result_list: -- cls = t.__class__ -- if not rmap.has_key(cls): -- rmap[cls] = [] -- classes.append(cls) -- rmap[cls].append((n,t,o,e)) -- r = [(cls, rmap[cls]) for cls in classes] -- return r -- -- -- def getReportAttributes(self, result): -- """ -- Return report attributes as a list of (name, value). -- Override this to add custom attributes. -- """ -- startTime = str(self.startTime)[:19] -- duration = str(self.stopTime - self.startTime) -- status = [] -- if result.success_count: status.append('Pass %s' % result.success_count) -- if result.failure_count: status.append('Failure %s' % result.failure_count) -- if result.error_count: status.append('Error %s' % result.error_count ) -- if status: -- status = ' '.join(status) -- else: -- status = 'none' -- return [ -- ('Start Time', startTime), -- ('Duration', duration), -- ('Status', status), -- ] -- -- -- def generateReport(self, test, result): -- report_attrs = self.getReportAttributes(result) -- generator = 'HTMLTestRunner %s' % __version__ -- stylesheet = self._generate_stylesheet() -- heading = self._generate_heading(report_attrs) -- report = self._generate_report(result) -- ending = self._generate_ending() -- output = self.HTML_TMPL % dict( -- title = saxutils.escape(self.title), -- generator = generator, -- stylesheet = stylesheet, -- heading = heading, -- report = report, -- ending = ending, -- ) -- self.stream.write(output.encode('utf8')) -- -- -- def _generate_stylesheet(self): -- return self.STYLESHEET_TMPL -- -- -- def _generate_heading(self, report_attrs): -- a_lines = [] -- for name, value in report_attrs: -- line = self.HEADING_ATTRIBUTE_TMPL % dict( -- name = saxutils.escape(name), -- value = saxutils.escape(value), -- ) -- a_lines.append(line) -- heading = self.HEADING_TMPL % dict( -- title = saxutils.escape(self.title), -- parameters = ''.join(a_lines), -- description = saxutils.escape(self.description), -- ) -- return heading -- -- -- def _generate_report(self, result): -- rows = [] -- sortedResult = self.sortResult(result.result) -- for cid, (cls, cls_results) in enumerate(sortedResult): -- # subtotal for a class -- np = nf = ne = 0 -- for n,t,o,e in cls_results: -- if n == 0: np += 1 -- elif n == 1: nf += 1 -- else: ne += 1 -- -- # format class description -- if cls.__module__ == "__main__": -- name = cls.__name__ -- else: -- name = "%s.%s" % (cls.__module__, cls.__name__) -- doc = cls.__doc__ and cls.__doc__.split("\n")[0] or "" -- desc = doc and '%s: %s' % (name, doc) or name -- -- row = self.REPORT_CLASS_TMPL % dict( -- style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass', -- desc = desc, -- count = np+nf+ne, -- Pass = np, -- fail = nf, -- error = ne, -- cid = 'c%s' % (cid+1), -- ) -- rows.append(row) -- -- for tid, (n,t,o,e) in enumerate(cls_results): -- self._generate_report_test(rows, cid, tid, n, t, o, e) -- -- report = self.REPORT_TMPL % dict( -- test_list = ''.join(rows), -- count = str(result.success_count+result.failure_count+result.error_count), -- Pass = str(result.success_count), -- fail = str(result.failure_count), -- error = str(result.error_count), -- ) -- return report -- -- -- def _generate_report_test(self, rows, cid, tid, n, t, o, e): -- # e.g. 'pt1.1', 'ft1.1', etc -- has_output = bool(o or e) -- tid = (n == 0 and 'p' or 'f') + 't%s.%s' % (cid+1,tid+1) -- name = t.id().split('.')[-1] -- doc = t.shortDescription() or "" -- desc = doc and ('%s: %s' % (name, doc)) or name -- tmpl = has_output and self.REPORT_TEST_WITH_OUTPUT_TMPL or self.REPORT_TEST_NO_OUTPUT_TMPL -- -- # o and e should be byte string because they are collected from stdout and stderr? -- if isinstance(o,str): -- # TODO: some problem with 'string_escape': it escape \n and mess up formating -- # uo = unicode(o.encode('string_escape')) -- uo = o.decode('latin-1') -- else: -- uo = o -- if isinstance(e,str): -- # TODO: some problem with 'string_escape': it escape \n and mess up formating -- # ue = unicode(e.encode('string_escape')) -- ue = e.decode('latin-1') -- else: -- ue = e -- -- script = self.REPORT_TEST_OUTPUT_TMPL % dict( -- id = tid, -- output = saxutils.escape(uo+ue), -- ) -- -- row = tmpl % dict( -- tid = tid, -- Class = (n == 0 and 'hiddenRow' or 'none'), -- style = n == 2 and 'errorCase' or (n == 1 and 'failCase' or 'none'), -- desc = desc, -- script = script, -- status = self.STATUS[n], -- ) -- rows.append(row) -- if not has_output: -- return -- -- def _generate_ending(self): -- return self.ENDING_TMPL -- -- --############################################################################## --# Facilities for running tests from the command line --############################################################################## -- --# Note: Reuse unittest.TestProgram to launch test. In the future we may --# build our own launcher to support more specific command line --# parameters like test title, CSS, etc. --class TestProgram(unittest.TestProgram): -- """ -- A variation of the unittest.TestProgram. Please refer to the base -- class for command line parameters. -- """ -- def runTests(self): -- # Pick HTMLTestRunner as the default test runner. -- # base class's testRunner parameter is not useful because it means -- # we have to instantiate HTMLTestRunner before we know self.verbosity. -- if self.testRunner is None: -- self.testRunner = HTMLTestRunner(verbosity=self.verbosity) -- unittest.TestProgram.runTests(self) -- --main = TestProgram -- --############################################################################## --# Executing this module from the command line --############################################################################## -- --if __name__ == "__main__": -- main(module=None) diff --cc Tests/Makefile index 36d2b463,36d2b463..00000000 deleted file mode 100644,100644 --- a/Tests/Makefile +++ /dev/null @@@ -1,28 -1,28 +1,0 @@@ --all:elem elem7 comm comm9 comm7 ihm9 ihm ihm7 -- --elem: -- python run.py testelem --elem7: -- python run.py testelem7 -- --comm: -- python run.py testcomm --comm9: -- python run.py testcomm9 --comm7: -- python run.py testcomm7 -- --ihm9: -- python run.py testihm9/testihm1.py -- python run.py testihm9/testihm2.py -- python run.py testihm9/testihm3.py -- python run.py testihm9/testihm4.py --ihm: -- python run.py testihm/testihm1.py -- python run.py testihm/testihm2.py -- python run.py testihm/testihm3.py -- python run.py testihm/testihm4.py --ihm7: -- python run.py testihm7/testihm1.py -- python run.py testihm7/testihm2.py -- python run.py testihm7/testihm4.py diff --cc Tests/README index 3b28d765,3b28d765..00000000 deleted file mode 100644,100644 --- a/Tests/README +++ /dev/null @@@ -1,37 -1,37 +1,0 @@@ --Pour executer tous les tests faire:: -- -- python run.py -- --Pour executer seulement un module de test (testsimp1.py par exemple), faire:: -- -- python run.py testelem/testsimp1.py -- --Un test correspond à l'exécution d'une méthode dont le nom commence par test ou Test --d'une classe dont le nom commence par test ou Test dans un module dont le nom --commence par test ou Test éventuellement dans un répertoire dont le nom commence --par test ou Test. -- --Quelques tests dont le nom commence par futuretest ne sont pas exécutés. Ils identifient --des limites actuelles d'Accas. -- --Certains tests doivent etre exécutés séparément à cause d'un problème d'import de catalogue. --En particulier, les tests d'ihm (testihm*.py) entrent dans cette catégorie. -- --Par ordre de complexité : -- -- - testelem7 -- - testelem -- -- - testcomm7 -- - testcomm9 -- - testcomm -- -- - testastest -- - testastest9 -- -- - testihm9 -- - testihm -- - testihm7 -- --Les tests suffixés 7 ou 9 sont spécifiques d'une version d'ASTER -- diff --cc Tests/compare.py index f81a49e1,f81a49e1..00000000 deleted file mode 100644,100644 --- a/Tests/compare.py +++ /dev/null @@@ -1,68 -1,68 +1,0 @@@ --# -*- coding: iso-8859-1 -*- --import re -- --BLANKLINE_MARKER = '' --ELLIPSIS_MARKER = '...' --True=1 --False=0 -- --def check(want,got): -- if got == want: return True -- -- # Replace in want with a blank line. -- want = re.sub('(?m)^%s\s*?$' % re.escape(BLANKLINE_MARKER), -- '', want) -- # If a line in got contains only spaces, then remove the -- # spaces. -- got = re.sub('(?m)^\s*?$', '', got) -- if got == want: -- return True -- -- if _ellipsis_match(want, got): -- return True -- -- return False -- --def _ellipsis_match(want, got): -- if ELLIPSIS_MARKER not in want: -- return want == got -- -- # Find "the real" strings. -- ws = want.split(ELLIPSIS_MARKER) -- assert len(ws) >= 2 -- -- # Deal with exact matches possibly needed at one or both ends. -- startpos, endpos = 0, len(got) -- w = ws[0] -- if w: # starts with exact match -- if got.startswith(w): -- startpos = len(w) -- del ws[0] -- else: -- return False -- w = ws[-1] -- if w: # ends with exact match -- if got.endswith(w): -- endpos -= len(w) -- del ws[-1] -- else: -- return False -- -- if startpos > endpos: -- # Exact end matches required more characters than we have, as in -- # _ellipsis_match('aa...aa', 'aaa') -- return False -- -- # For the rest, we only need to find the leftmost non-overlapping -- # match for each piece. If there's no overall match that way alone, -- # there's no overall match period. -- for w in ws: -- # w may be '' at times, if there are consecutive ellipses, or -- # due to an ellipsis at the start or end of `want`. That's OK. -- # Search for an empty string succeeds, and doesn't change startpos. -- startp = got.find(w, startpos, endpos) -- if startp < 0: -- return False -- startpos = startp + len(w) -- -- return True diff --cc Tests/config.py index f6f6fb00,f6f6fb00..00000000 deleted file mode 100644,100644 --- a/Tests/config.py +++ /dev/null @@@ -1,8 -1,8 +1,0 @@@ --import sys --import prefs --ASTERDIR={ -- "v7":"/local/chris/ASTER/instals/STA7/astest", -- "v8":"/local/chris/ASTER/instals/STA8/astest", -- "v9":"/local/chris/ASTER/instals/NEW9/astest", -- } -- diff --cc Tests/editeur.ini index 55246c0f,55246c0f..00000000 deleted file mode 100644,100644 --- a/Tests/editeur.ini +++ /dev/null @@@ -1,57 -1,57 +1,0 @@@ --# CONFIGURATION 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 -- --import prefs -- --rep_cata = os.path.abspath(os.path.join(prefs.repIni,'../Aster/Cata')) --rep_Pmw = os.path.join(prefs.repIni,'../Pmw') -- --# Accès à la documentation Aster --path_doc = os.path.join(rep_cata,'..','Doc') --exec_acrobat = "acroread" --# Utilisateur/Développeur --isdeveloppeur = "NON" --path_cata_dev = "/tmp/cata" --# Répertoire temporaire --rep_travail = "/tmp" --# Répertoire initial --initialdir=os.curdir -- --# Choix des catalogues --#rep_mat=os.path.join(rep_cata,'..','materiau') --rep_mat_v7="/local/cchris/ASTER/instals/materiaux/STA7" --rep_mat_v8="/local/cchris/ASTER/instals/materiaux/STA8" --rep_mat_v9="/local/cchris/ASTER/instals/materiaux/NEW9" -- --catalogues = ( -- ('ASTER','petit',os.path.join(rep_cata,'petitcata'),'python'), -- ('ASTER','v5.9',os.path.join(rep_cata,'cataSTA5'),'asterv5'), -- ('ASTER','v6.8',os.path.join(rep_cata,'cataSTA6'),'python6'), -- ('ASTER','v6',os.path.join(rep_cata,'cataSTA6'),'python6'), -- ('ASTER','v7.7',os.path.join(rep_cata,'cataSTA7'),'python'), -- ('ASTER','v7',os.path.join(rep_cata,'cataSTA7'),'python'), -- ('ASTER','v8.4',os.path.join(rep_cata,'cataSTA8'),'python'), -- ('ASTER','v8',os.path.join(rep_cata,'cataSTA8'),'python'), -- ('ASTER','v9.1',os.path.join(rep_cata,'cataSTA9'),'python'), -- ('ASTER','v9',os.path.join(rep_cata,'cataSTA9'),'python','defaut'), -- ) -- diff --cc Tests/eficas_aster.py index deaa5455,4cc3b2fe..00000000 deleted file mode 100755,100755 --- a/Tests/eficas_aster.py +++ /dev/null @@@ -1,32 -1,32 +1,0 @@@ --#!/usr/bin/env python --# -*- coding: utf-8 -*- - # CONFIGURATION MANAGEMENT OF EDF VERSION -# 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. --# --# --# ====================================================================== -- --""" -- Ce module sert à lancer EFICAS configuré pour Code_Aster --""" --# Modules Python -- --# Modules Eficas --import prefs --from InterfaceTK import eficas_go -- - eficas_go.lance_eficas() -eficas_go.lanceEficas() diff --cc Tests/prefs.py index 7c3ebd00,c2f346ab..00000000 deleted file mode 100644,100644 --- a/Tests/prefs.py +++ /dev/null @@@ -1,115 -1,115 +1,0 @@@ --# -*- coding: utf-8 -*- - # CONFIGURATION MANAGEMENT OF EDF VERSION -# 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 à localiser le fichier editeur.ini --# Obligatoire --repIni=os.path.dirname(os.path.abspath(__file__)) -- --# INSTALLDIR sert à localiser l'installation d'Eficas --# Obligatoire --INSTALLDIR=os.path.join(repIni,'..') -- --# CODE_PATH sert à localiser Noyau et Validation éventuellement --# non contenus dans la distribution EFICAS --# Par défaut on utilise les modules de INSTALLDIR --# Peut valoir None (defaut) --CODE_PATH = None -- --# la variable code donne le nom du code a selectionner --code="ASTER" -- --# lang indique la langue utilisée 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' -- -- --EditeurDir=INSTALLDIR+"/Editeur" --sys.path[:0]=[INSTALLDIR] --sys.path[:0]=[INSTALLDIR+"/Aster"] -- --ICONDIR=os.path.join(INSTALLDIR,'Editeur','icons') -- --# Preference --if os.name == 'nt': -- userprefs = os.sep.join( [ os.environ['HOMEDRIVE'], os.environ['HOMEPATH'], 'Eficas_install', 'prefs.py' ]) --else : -- userprefs=os.path.expanduser("~/.Eficas_install/prefs.py") -- --if os.path.isfile(userprefs): -- try: -- execfile(userprefs) -- except: -- pass -- -- --#------------------------------------------------------------------- --# Partie pour TK --#------------------------------------------------------------------- -- --labels= ('Fichier','Edition','Jeu de commandes', -- 'Options', -- 'Aide', -- 'Traduction', -- ) -- --appli_composants=['readercata','bureau', -- 'options', -- ] -- --menu_defs={ 'bureau': [ -- ('Fichier',[ -- ('Nouveau','newJDC','','Ctrl+N'), -- ('Nouvel INCLUDE','newJDC_include'), -- ('Ouvrir','openJDC','','Ctrl+O'), -- ('Enregistrer','saveJDC','','Ctrl+S'), -- ('Enregistrer sous','saveasJDC','','Ctrl+E'), -- None, -- ('Fermer','closeJDC','','Ctrl+W'), -- ('Quitter','exitEFICAS','','Ctrl+Q'), -- ] -- ), -- ('Edition',[ -- ('Copier','copy','','Ctrl+C'), -- ('Couper','cut','','Ctrl+X'), -- ('Coller','paste','','Ctrl+V'), -- ] -- ), -- ('Jeu de commandes',[ -- ('Rapport de validation','visuCRJDC','','Ctrl+R'), -- ('Fichier source','visu_txt_brut_JDC','','Ctrl+B'), -- #('Paramètres Eficas','affichage_fichier_ini'), -- ] -- ), -- ('Traduction',[ -- ('Traduction v7 en v8','TraduitFichier7'), -- ('Traduction v8 en v9','TraduitFichier8','','Ctrl+T'), -- ] -- ), -- ('Aide',[ -- ('Aide EFICAS','aideEFICAS','','Ctrl+A'), -- ] -- ), -- ] -- } diff --cc Tests/properties.py index c174e28e,24a159bd..00000000 deleted file mode 100644,100644 --- a/Tests/properties.py +++ /dev/null @@@ -1,25 -1,25 +1,0 @@@ --#@ MODIF properties Accas DATE 26/10/2005 AUTEUR gcbhhhh M.ADMINISTRATEUR - # CONFIGURATION MANAGEMENT OF EDF VERSION -# maConfiguration MANAGEMENT OF EDF VERSION --# RESPONSABLE D6BHHHH J-P.LEFEBVRE --# ====================================================================== --# COPYRIGHT (C) 1991 - 2001 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. --# ====================================================================== --# IDENTIFICATION DU GESTIONNAIRE DE COMMANDE ACCAS A PARTIR --# DE LA VERSION DU CODE_ASTER ASSOCIE --#---------------------------------------------------------------------- --version = "8.2.24" --date = "O1/06/2006" --exploit = False diff --cc Tests/run.py index 36e548ad,072e41fa..00000000 deleted file mode 100644,100644 --- a/Tests/run.py +++ /dev/null @@@ -1,201 -1,201 +1,0 @@@ --""" --This program executes all unitest tests that are found in -- - directories with name test* or Test* -- - files with name test* or Test* -- --unitest tests are : -- - functions and class with names test* or Test* -- - methods with name test* or Test* from classes with name test* or Test* -- --Typical uses are : -- -- - execute all tests with text output : python2.4 run.py -- - execute all tests with html output : python2.4 run.py --html -- - execute some tests with text output : python2.4 run.py testelem -- - execute one test with text output : python2.4 run.py testelem/testsimp1.py -- - execute all tests with verbosity and html output : python2.4 run.py -v --html --""" -- --import sys,types,os --import sre --import unittest - from optparse import OptionParser -from optparse import Optionparser -- --import config -- --testMatch = sre.compile(r'^[Tt]est') -- --class TestSuite(unittest.TestSuite): -- ignore=[] -- loader = unittest.defaultTestLoader -- -- def __init__(self, names=[]): -- self.names=names -- super(TestSuite,self).__init__() -- tests=self.collectTests() -- self.addTests(tests) -- -- def _import(self,name): -- mod = __import__(name,{},{}) -- components = name.split('.') -- for comp in components[1:]: -- mod = getattr(mod,comp) -- return mod -- -- def importdir(self,rep,path): -- init = os.path.abspath(os.path.join(path,'__init__.py')) -- if os.path.isfile(init): -- package=self._import(rep) -- if package: -- return TestPackageSuite(package) -- else: -- return TestDirectorySuite(path) -- -- def importfile(self,item,path): -- root, ext = os.path.splitext(item) -- if ext != '.py': -- return -- if root.find('/') >= 0: -- dirname, file = os.path.split(path) -- root, ext = os.path.splitext(file) -- sys.path.insert(0,dirname) -- mod=self._import(root) -- sys.path.remove(dirname) -- else: -- mod=self._import(root) -- return ModuleTestSuite(mod) -- -- def collectTests(self): -- if self.names: -- entries=self.names -- else: -- entries = [ item for item in os.listdir(os.getcwd()) -- if item.lower().find('test') >= 0 ] -- self.path=os.getcwd() -- return self._collectTests(entries) -- -- def _collectTests(self,entries): -- tests=[] -- for item in entries: -- if (item[0] == '.' -- or item in self.ignore -- or not testMatch.search(item)): -- continue -- path=os.path.abspath(os.path.join(self.path,item)) -- if os.path.isfile(path): -- t=self.importfile(item,path) -- if t:tests.append(t) -- elif os.path.isdir(path): -- tests.append(self.importdir(item,path)) -- return tests -- --class TestDirectorySuite(TestSuite): -- def __init__(self,path): -- self.path=path -- super(TestDirectorySuite,self).__init__() -- -- def collectTests(self): -- tests=[] -- if self.path: -- sys.path.insert(0,self.path) -- entries = os.listdir(self.path) -- entries.sort() -- tests=self._collectTests(entries) -- sys.path.remove(self.path) -- return tests -- --class TestPackageSuite(TestDirectorySuite): -- def __init__(self,package): -- self.package=package -- path=os.path.abspath(os.path.dirname(self.package.__file__)) -- super(TestPackageSuite,self).__init__(path) -- -- def importdir(self,item,path): -- init = os.path.abspath(os.path.join(path,'__init__.py')) -- if os.path.isfile(init): -- name="%s.%s" % (self.package.__name__,item) -- package=self._import(name) -- if package: -- return TestPackageSuite(package) -- else: -- return TestDirectorySuite(path) -- -- def importfile(self,item,path): -- root, ext = os.path.splitext(item) -- if ext != '.py': -- return -- name="%s.%s" % (self.package.__name__,root) -- mod=self._import(name) -- return ModuleTestSuite(mod) -- --class ModuleTestSuite(TestSuite): -- -- def __init__(self, module): -- self.module = module -- super(ModuleTestSuite,self).__init__() -- -- def collectTests(self): -- def cmpLineNo(a,b): -- a_ln = a.func_code.co_firstlineno -- b_ln = b.func_code.co_firstlineno -- return cmp(a_ln,b_ln) -- -- entries = dir(self.module) -- tests = [] -- func_tests = [] -- for item in entries: -- test = getattr(self.module,item) -- if (isinstance(test, (type, types.ClassType)) -- and issubclass(test,unittest.TestCase)): -- if testMatch.search(item): -- [ tests.append(case) for case in -- self.loader.loadTestsFromTestCase(test)._tests ] -- elif callable(test) and testMatch.search(item): -- # simple functional test -- func_tests.append(test) -- -- # run functional tests in the order in which they are defined -- func_tests.sort(cmpLineNo) -- [ tests.append(unittest.FunctionTestCase(test)) -- for test in func_tests ] -- return tests -- -- --class TestProgram(unittest.TestProgram): -- USAGE=""" --""" -- def __init__(self): -- self.testRunner = None -- self.verbosity = 1 -- self.html=0 -- self.parseArgs(sys.argv) -- if self.html: -- import HTMLTestRunner -- self.testRunner = HTMLTestRunner.HTMLTestRunner(verbosity=self.verbosity) -- self.createTests() -- self.runTests() -- -- def parseArgs(self,argv): - parser = OptionParser(usage=self.USAGE) - parser = Optionparser(usage=self.USAGE) -- parser.add_option("-v","--verbose",action="count", -- dest="verbosity",default=1, -- help="Be more verbose. ") -- parser.add_option("--html",action="store_true", -- dest="html",default=0, -- help="Produce HTML output ") -- -- options, args = parser.parse_args(argv) -- self.verbosity = options.verbosity -- self.html=options.html -- -- if args: -- self.names = list(args) -- if self.names[0] == 'run.py': -- self.names = self.names[1:] -- -- def createTests(self): -- self.test = TestSuite(self.names) -- --if __name__ == "__main__": -- TestProgram() -- diff --cc Tests/style.py index 0d387727,0d387727..00000000 deleted file mode 100644,100644 --- a/Tests/style.py +++ /dev/null @@@ -1,63 -1,63 +1,0 @@@ --# -*- coding: utf-8 -*- --""" --Pour modifier le style d'EFICAS il faut ajouter un fichier style.py qui contiendra les --informations sur le style voulu dans son repertoire Eficas_install. -- --La methode la plus simple consiste à modifier directement les attributs de l'objet style dans le --fichier style.py d'Eficas_install. Exemple:: -- -- style.background='yellow' -- --pour modifier la couleur du background. -- --Il existe une autre méthode qui peut être utilisée quand on veut modifier plusieurs propriétés à la fois. -- --Le fichier style.py doit définir une nouvelle classe qui dérive de la classe de base STYLE avec des attributs --de classe qui définiront le nouveau style (par exemple, si on veut modifier le background):: -- -- class STYLE(STYLE): -- background='yellow' -- --Il faut ensuite instancier cette classe, dans ce meme fichier, en donnant le nom style à l'objet cree:: -- -- style=STYLE() -- --Tous les attributs de classe possibles sont visibles dans le module Editeur/basestyle.py:: -- -- background='gray90' -- foreground='black' -- entry_background='white' -- list_background='white' -- list_select_background='#00008b' -- list_select_foreground='grey' -- tooltip_background="yellow" -- -- standard = ("Helvetica",12) -- standard_italique = ("Helvetica",12,'italic') -- standard_gras = ("Helvetica",12,'bold') -- standard_gras_souligne = ("Helvetica",12,'bold','underline') -- -- canvas = ('Helvetica',10) -- canvas_italique = ('Helvetica',10,'italic') -- canvas_gras = ("Helvetica",10,'bold') -- canvas_gras_italique = ("Helvetica",12,'bold','italic') -- -- standard12 = ("Helvetica",14) -- standard12_gras = ("Helvetica",14,'bold') -- standard12_gras_italique = ( "Helvetica",14,'bold','italic') -- -- --Le fichier style.py contenu dans le répertoire Aster permet de spécifier des propriétés globales pour une installation. --Les modifications de style contenues dans ce fichier et dans le fichier style.py d'Eficas_install --sont prises en compte dans cet ordre. --""" -- -- --style.background='gray90' --style.foreground='black' --style.standard = ("Helvetica",10) --style.standard_italique = ("Helvetica",10,'italic') --style.standard_gras = ("Helvetica",10,'bold') --style.canvas_italique = ('Helvetica',10,'italic') --style.canvas_gras = ("Helvetica",10,'bold') --style.statusfont = ("Helvetica",14) diff --cc Tests/testastest/basetest.py index 97280757,4bdda44f..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/basetest.py +++ /dev/null @@@ -1,69 -1,69 +1,0 @@@ --import os,glob,sys --import unittest --import difflib -- --from InterfaceTK import appli -- --from config import ASTERDIR -- --version="v8" -- --def cdiff(text1,text2): -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- --def make_tests(files): -- class TestCase(unittest.TestCase): -- app=None -- -- def setUp(self): -- if self.app == None: -- self.app=appli.STANDALONE(version=version) -- pass -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- -- i=0 -- for f in glob.glob(os.path.join(ASTERDIR[version],files)): -- ff=open(f) -- text=ff.read() -- ff.close() -- if text.find("VISU_EFICAS='NON'") != -1:continue -- for o in ('3','2','1','0','m'): -- f=f[:-1]+o -- if os.path.isfile(f):break -- i=i+1 -- name=os.path.splitext(os.path.basename(f))[0] -- -- exec """def test_%s(self,file="%s"): -- "fichier:%s" -- self.commtest(file) --""" % (name,f,f) -- del i,f,ff,text,o,name -- -- def commtest(self,file): -- """ Test generique""" -- name=os.path.splitext(os.path.basename(file))[0] -- errfile=os.path.join(os.path.dirname(__file__),name+".err") -- err="" -- if os.path.isfile(errfile): -- f=open(errfile) -- err=f.read() -- f.close() -- try: -- j=self.app.openJDC(file=file) -- if err == "": - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- else: -- txt=str(j.report()) -- assert txt == err,cdiff(err,txt) -- j.supprime() -- assert sys.getrefcount(j) == 2,sys.getrefcount(j) -- except ValueError,e: -- txt=str(e) -- if err == "": -- raise -- else: -- assert txt == err,cdiff(err,txt) -- -- return TestCase diff --cc Tests/testastest/erreu01a.err index 7bdc2e9b,7bdc2e9b..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/erreu01a.err +++ /dev/null @@@ -1,4 -1,4 +1,0 @@@ --Compilation impossible : File "erreu01a.comm", line 44 -- UELAS=MECA_STATIQUE(MODELE=MOD, -- ^ -- SyntaxError: invalid syntax diff --cc Tests/testastest/testaster1.py index 7aa1d9ed,7aa1d9ed..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/testaster1.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="[a-l]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest/testaster10.py index febe8cab,febe8cab..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/testaster10.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="z*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest/testaster2.py index 72c6892f,72c6892f..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/testaster2.py +++ /dev/null @@@ -1,6 -1,6 +1,0 @@@ --import basetest -- --files="[m-r]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass -- diff --cc Tests/testastest/testaster3.py index 230a79c1,230a79c1..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/testaster3.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="s[a-d]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest/testaster4.py index c3217c72,c3217c72..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/testaster4.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="s[e-r]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest/testaster5.py index 26851b9b,26851b9b..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/testaster5.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="ssl[a-l]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest/testaster6.py index c779a122,c779a122..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/testaster6.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="ssl[m-z]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest/testaster7.py index 99f426c1,99f426c1..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/testaster7.py +++ /dev/null @@@ -1,6 -1,6 +1,0 @@@ --import basetest -- --files="ss[m-z]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass -- diff --cc Tests/testastest/testaster8.py index 04f45616,04f45616..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/testaster8.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="s[t-z]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest/testaster9.py index 4c561729,4c561729..00000000 deleted file mode 100644,100644 --- a/Tests/testastest/testaster9.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="[t-y]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest9/basetest.py index 253edf54,ebab68d1..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/basetest.py +++ /dev/null @@@ -1,69 -1,69 +1,0 @@@ --import os,glob,sys --import unittest --import difflib -- --from InterfaceTK import appli -- --from config import ASTERDIR -- --version="v9" -- --def cdiff(text1,text2): -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- --def make_tests(files): -- class TestCase(unittest.TestCase): -- app=None -- -- def setUp(self): -- if self.app == None: -- self.app=appli.STANDALONE(version=version) -- pass -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- -- i=0 -- for f in glob.glob(os.path.join(ASTERDIR[version],files)): -- ff=open(f) -- text=ff.read() -- ff.close() -- if text.find("VISU_EFICAS='NON'") != -1:continue -- for o in ('3','2','1','0','m'): -- f=f[:-1]+o -- if os.path.isfile(f):break -- i=i+1 -- name=os.path.splitext(os.path.basename(f))[0] -- -- exec """def test_%s(self,file="%s"): -- "fichier:%s" -- self.commtest(file) --""" % (name,f,f) -- del i,f,ff,text,o,name -- -- def commtest(self,file): -- """ Test generique""" -- name=os.path.splitext(os.path.basename(file))[0] -- errfile=os.path.join(os.path.dirname(__file__),name+".err") -- err="" -- if os.path.isfile(errfile): -- f=open(errfile) -- err=f.read() -- f.close() -- try: -- j=self.app.openJDC(file=file) -- if err == "": - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- else: -- txt=str(j.report()) -- assert txt == err,cdiff(err,txt) -- j.supprime() -- assert sys.getrefcount(j) == 2,sys.getrefcount(j) -- except ValueError,e: -- txt=str(e) -- if err == "": -- raise -- else: -- assert txt == err,cdiff(err,txt) -- -- return TestCase diff --cc Tests/testastest9/erreu01a.err index 7bdc2e9b,7bdc2e9b..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/erreu01a.err +++ /dev/null @@@ -1,4 -1,4 +1,0 @@@ --Compilation impossible : File "erreu01a.comm", line 44 -- UELAS=MECA_STATIQUE(MODELE=MOD, -- ^ -- SyntaxError: invalid syntax diff --cc Tests/testastest9/testaster1.py index 7aa1d9ed,7aa1d9ed..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/testaster1.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="[a-l]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest9/testaster10.py index febe8cab,febe8cab..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/testaster10.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="z*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest9/testaster2.py index 72c6892f,72c6892f..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/testaster2.py +++ /dev/null @@@ -1,6 -1,6 +1,0 @@@ --import basetest -- --files="[m-r]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass -- diff --cc Tests/testastest9/testaster3.py index 230a79c1,230a79c1..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/testaster3.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="s[a-d]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest9/testaster4.py index c3217c72,c3217c72..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/testaster4.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="s[e-r]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest9/testaster5.py index 26851b9b,26851b9b..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/testaster5.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="ssl[a-l]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest9/testaster6.py index c779a122,c779a122..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/testaster6.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="ssl[m-z]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest9/testaster7.py index 99f426c1,99f426c1..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/testaster7.py +++ /dev/null @@@ -1,6 -1,6 +1,0 @@@ --import basetest -- --files="ss[m-z]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass -- diff --cc Tests/testastest9/testaster8.py index 04f45616,04f45616..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/testaster8.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="s[t-z]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testastest9/testaster9.py index 4c561729,4c561729..00000000 deleted file mode 100644,100644 --- a/Tests/testastest9/testaster9.py +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --import basetest -- --files="[t-y]*.comm" --TestCase=basetest.make_tests(files) --class TestCase(TestCase):pass diff --cc Tests/testcomm/a.11 index 1723fcb9,1723fcb9..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/a.11 +++ /dev/null @@@ -1,1 -1,1 +1,0 @@@ --MM=LIRE_MAILLAGE() diff --cc Tests/testcomm/a.com0 index 04d1cc20,04d1cc20..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/a.com0 +++ /dev/null @@@ -1,3 -1,3 +1,0 @@@ --POURSUITE() --MA=LIRE_MAILLAGE(INFO=inf) --FIN() diff --cc Tests/testcomm/a.comm index 665f63fe,665f63fe..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/a.comm +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --DEBUT() --inf=1 --p2=inf+1 --p3=sin(p2) --FIN() diff --cc Tests/testcomm/aa.comm index 124141b4,124141b4..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/aa.comm +++ /dev/null @@@ -1,8 -1,8 +1,0 @@@ --DEBUT() --inf1=1 --MA=LIRE_MAILLAGE(INFO=inf1) --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) -- --FIN() diff --cc Tests/testcomm/b.comm index 478973df,478973df..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/b.comm +++ /dev/null @@@ -1,9 -1,9 +1,0 @@@ --DEBUT() --a=1 --fmt_raison='-'*80+""" -- -- Exception erreur_Fatale interceptee -- Raison : %s -- --"""+'-'*80+'\n' --FIN() diff --cc Tests/testcomm/c.comm index 26c16b36,26c16b36..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/c.comm +++ /dev/null @@@ -1,49 -1,49 +1,0 @@@ --from Numeric import cos --DEBUT() --RAYCRA=1. --EPCRA=0.1 --S_CR=3.1415*(RAYCRA**2-(RAYCRA-EPCRA)**2) --T_CR=3.1415 --NOMF="nomfichier" --n=2 -- --MA=LIRE_MAILLAGE( ) -- --MO=AFFE_MODELE( MAILLAGE=MA, -- #test de validateur GEOM (typ=grma) avec grma derive de GEOM -- AFFE=(_F(GROUP_MA = ('LI1'), -- PHENOMENE = 'MECANIQUE', -- MODELISATION = 'DIS_TR'), -- ), -- INFO=2,); -- --carel=[0.]*78 -- --CAREG=AFFE_CARA_ELEM(MODELE=MO, -- DISCRET=_F(GROUP_MA=('LI1'), -- CARA = 'K_TR_L', -- VALE = carel, -- REPERE='LOCAL' , ), -- ORIENTATION=(_F(GROUP_MA=('LI1',), -- CARA='VECT_Y', -- VALE=(0.,0.,1.),),), -- AFFE_FIBRE =( _F(GROUP_MA='CRAYON', COOR_AXE_POUTRE = (0.,0.,), CARA='SURFACE', VALE=( 0.,S_CR/4,)), -- _F(GROUP_MA='CRAYON', COOR_AXE_POUTRE = (0.,0.,), CARA='SURFACE', VALE=( 0.,T_CR,)), -- _F(GROUP_MA='CRAYON', COOR_AXE_POUTRE = (0.,sin(n*22.5*pi/180),), CARA='SURFACE', VALE=( 0.,T_CR/4,)), -- _F(GROUP_MA='CRAYON', COOR_AXE_POUTRE = (0.,(cos(n*22.5*pi/180)),), CARA='SURFACE', VALE=( 0.,T_CR/4,)), -- ), -- ); -- --DEFI_FICHIER(UNITE=50, FICHIER='./REPE_OUT/zzzz206a_resu.mail') --#test de validateur LongStr avec parametre instance de PARAMETRE --DEFI_FICHIER(UNITE=50, FICHIER=NOMF) --#test de validateur LongStr avec parametre instance de Formula --u=DEFI_FICHIER( FICHIER=NOMF*2) --DEFI_FICHIER (ACTION='LIBERER',UNITE=50) --#test de validateur d'objet entier (typ='I'), instance de la classe entier --DEFI_FICHIER (ACTION='LIBERER',UNITE=u) -- --# test de validateur qui accepte tout (typ=assd) --IMPR_CO(CONCEPT=_F(NOM=MA)) -- --FIN() diff --cc Tests/testcomm/cabri02a.comm index 4c858c6f,4c858c6f..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm/cabri02a.comm +++ /dev/null @@@ -1,78 -1,78 +1,0 @@@ --# MODIF DATE 07/03/2005 AUTEUR CIBHHLV L.VIVAN --# RESPONSABLE MABBAS M.ABBAS --# --# TITRE TEST DE REFERENCE POUR LA MACRO DE CALCUL DE BRIDES CABRI --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2003 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. --# ====================================================================== -- --DEBUT(CODE=_F( NOM = 'CABRI02A',NIV_PUB_WEB='INTRANET')); -- --# DEFINITION DES DONNEES MATERIAUX -- --# Temperature initiale, assemblage libre de contraintes --TEMP_INI=25.0; -- --# Temperature moyenne du transitoire pour calcul de lambda et rhoCp --TEMP_MOY = 170.0; -- --INCLUDE_MATERIAU(NOM_AFNOR='Z2CN1810', -- TYPE_MODELE='REF', -- VARIANTE='A', -- TYPE_VALE='NOMI', -- NOM_MATER='MA_BRI', -- EXTRACTION=_F(COMPOR='THER', -- TEMP_EVAL= TEMP_MOY,), -- UNITE_LONGUEUR='MM'); -- --INCLUDE_MATERIAU(NOM_AFNOR='Z12CN13', -- TYPE_MODELE='REF', -- VARIANTE='A', -- TYPE_VALE='NOMI', -- NOM_MATER='MA_ECR', -- EXTRACTION=_F(COMPOR='THER', -- TEMP_EVAL= TEMP_MOY,), -- UNITE_LONGUEUR='MM',); -- --INCLUDE_MATERIAU(NOM_AFNOR='Z12CN13', -- TYPE_MODELE='REF', -- VARIANTE='A', -- TYPE_VALE='NOMI', -- NOM_MATER='MA_RON', -- EXTRACTION=_F(COMPOR='THER', -- TEMP_EVAL= TEMP_MOY,), -- UNITE_LONGUEUR='MM',); -- --INCLUDE_MATERIAU(NOM_AFNOR='Z2CN1810', -- TYPE_MODELE='REF', -- VARIANTE='A', -- TYPE_VALE='NOMI', -- NOM_MATER='MA_GOU', -- EXTRACTION=_F(COMPOR='THER', -- TEMP_EVAL= TEMP_MOY,), -- UNITE_LONGUEUR='MM',); -- --INCLUDE_MATERIAU(NOM_AFNOR='Z6CND1712', -- TYPE_MODELE='REF', -- VARIANTE='A', -- TYPE_VALE='NOMI', -- NOM_MATER='MA_LIM', -- EXTRACTION=_F(COMPOR='THER', -- TEMP_EVAL= TEMP_MOY,), -- UNITE_LONGUEUR='MM',); -- --FIN(); diff --cc Tests/testcomm/d.comm index 06bd2405,06bd2405..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/d.comm +++ /dev/null @@@ -1,4 -1,4 +1,0 @@@ --DEBUT() --a=1 --MA=LIRE_MAILLAGE() --FIN() diff --cc Tests/testcomm/e.comm index 15bf3261,15bf3261..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/e.comm +++ /dev/null @@@ -1,70 -1,70 +1,0 @@@ --DEBUT() --MAYA=LIRE_MAILLAGE() -- --MAYA=DEFI_GROUP( reuse=MAYA, MAILLAGE=MAYA, -- CREA_GROUP_MA=_F( NOM = 'TOUT', TOUT = 'OUI')) -- --BARRE1=AFFE_MODELE( MAILLAGE=MAYA, -- AFFE=_F( GROUP_MA='SS1', -- MODELISATION = 'POU_D_E', -- PHENOMENE = 'MECANIQUE')) --# --MATERIO1=DEFI_MATERIAU( ELAS=_F( RHO = 1.E08, NU = 0.3, E = 1.E10)) -- --MATERIO2=DEFI_MATERIAU( ELAS=_F( RHO = 0., NU = 0., E = 1.E15)) --# --CHMAT=AFFE_MATERIAU( MAILLAGE=MAYA,AFFE=( -- #_F( TOUT = 'OUI', MATER = MATERIO1), -- _F( GROUP_MA = 'SS1', MATER = MATERIO1), -- _F( GROUP_MA = 'SS2', MATER = MATERIO1), -- _F( GROUP_MA = 'SS3', MATER = MATERIO1), -- _F( GROUP_MA = 'RIGIDE', MATER = MATERIO2), --)) # commentaire test -- --CARA1=AFFE_CARA_ELEM( MODELE=BARRE1, -- POUTRE=_F( -- GROUP_MA = 'TOUT', -- SECTION = 'CERCLE', -- CARA = ('R', 'EP',), -- VALE = (0.1, 0.01,))) -- --GUIDAGE1=AFFE_CHAR_MECA( MODELE=BARRE1,DDL_IMPO=( -- _F( GROUP_MA='SS1', -- DX = 0., DZ = 0., DRX = 0., DRY = 0.), -- _F( GROUP_NO = 'L1', DY = 0., DRZ = 0.), -- )) -- --K_ELEM1=CALC_MATR_ELEM( MODELE=BARRE1, -- CARA_ELEM=CARA1, -- CHAM_MATER=CHMAT, -- OPTION='RIGI_MECA', -- CHARGE=GUIDAGE1) -- --NUM1=NUME_DDL( MATR_RIGI=K_ELEM1) -- --# --K_ASSE1=ASSE_MATRICE( MATR_ELEM=K_ELEM1, -- NUME_DDL=NUM1) -- --MODESTA1=MODE_STATIQUE( MATR_RIGI=K_ASSE1, -- MODE_STAT=_F( -- GROUP_NO=('L12'), -- AVEC_CMP = ('DY','DRZ'), -- )) -- --# parse: -affectation -- --DS1=[None]*5 --DS2=[None]*5 --DS3=[None]*5 --DS4=[None]*5 --CHS1=[None]*5 --CHS2=[None]*5 -- --# parse: +affectation -- --#for k in range(1,5): --# DS1[k] = CREA_CHAMP( OPERATION='EXTR', TYPE_CHAM='NOEU_DEPL_R', --# RESULTAT= MODESTA1, NUME_ORDRE=k, NOM_CHAM = 'DEPL'); -- --FIN() diff --cc Tests/testcomm/efica01a.11 index bec37b5b,bec37b5b..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/efica01a.11 +++ /dev/null @@@ -1,19 -1,19 +1,0 @@@ --DEPL2 = FORMULE(NOM_PARA='INST',VALE='sin(OMEGAA*INST)/(OMEGAA**xx)') --DEPLACE2=CALC_FONC_INTERP( FONCTION=DEPL2, -- LIST_PARA=L_INST, -- NOM_PARA='INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE', -- NOM_RESU='DEPL' ) -- --MONO_X=CALC_CHAR_SEISME( MATR_MASS=MASSE, -- DIRECTION=( 1., 0., 0.,), -- MONO_APPUI='OUI' ) -- -- --MACRO_PROJ_BASE(BASE=MODE_MEC,MATR_ASSE_GENE=( -- _F( MATRICE = CO("MASS_GEN"), MATR_ASSE = MASSE), -- _F( MATRICE = CO("RIGI_GEN"), MATR_ASSE = RIGIDITE)), -- VECT_ASSE_GENE=_F( VECTEUR = CO("VECT_X"), VECT_ASSE = MONO_X) -- ) -- diff --cc Tests/testcomm/efica01a.com0 index 25134e98,25134e98..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm/efica01a.com0 +++ /dev/null @@@ -1,49 -1,49 +1,0 @@@ --POURSUITE(CODE=_F( NOM = 'EFICA01A')) -- --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) -- --CHMAT3=AFFE_MATERIAU( MAILLAGE=MAILLA3, -- AFFE=_F( TOUT='OUI', MATER = MAT3, TEMP_REF = 20.)) -- --riginor = 2.88E7 -- --TRAN_GE2=DYNA_TRAN_MODAL( MASS_GENE=MGEN_BIC, RIGI_GENE=RGEN_BIC, -- METHODE='EULER', -- AMOR_REDUIT=( 0.07, 0.07, ), -- MODE_STAT=MSTA_BIC,EXCIT=( -- _F( VECT_GENE = VECT_X1, ACCE = ACCELER1, -- MULT_APPUI = 'OUI', -- DIRECTION = ( 1., 0., 0.,), NOEUD = 'NO1', -- VITE = VITESSE1, DEPL = DEPLACE1), -- _F( VECT_GENE = VECT_X2, ACCE = ACCELER2, -- MULT_APPUI = 'OUI', -- DIRECTION = ( 1., 0., 0.,), NOEUD = 'NO11', -- VITE = VITESSE2, DEPL = DEPLACE2)), -- CHOC=_F( GROUP_NO_1 = 'MASSES1', -- GROUP_NO_2 = 'MASSES2', -- OBSTACLE = GRILLE, -- INTITULE = 'NO2/NO12', -- NORM_OBST = (0., 0., 1.,), -- DIST_1 = 0.4495, -- DIST_2 = 0.4495, -- RIGI_NOR = riginor, -- AMOR_NOR = 0., -- RIGI_TAN = 0., -- COULOMB = 0.), -- INCREMENT=_F( INST_INIT = 0., INST_FIN = 1., PAS = 0.00025), -- ARCHIVAGE=_F( PAS_ARCH = 8) -- ) -- --LISTIMP=DEFI_LIST_REEL( DEBUT=0., -- INTERVALLE=_F( JUSQU_A = 1., NOMBRE = 500)) -- --RESUA1=REST_BASE_PHYS( RESU_GENE=TRAN_GE1, -- LIST_INST=LISTIMP, -- INTERPOL='LIN', -- NOM_CHAM='DEPL', -- MULT_APPUI='OUI' -- ) -- --FIN() diff --cc Tests/testcomm/efica01a.comm index 20eea866,20eea866..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm/efica01a.comm +++ /dev/null @@@ -1,275 -1,275 +1,0 @@@ --# MODIF DATE 20/09/2004 AUTEUR DURAND C.DURAND --# TITRE TEST DE NON REGRESSION DE L IHM EFICAS - DERIVE DE SDND102A --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2001 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. --# ====================================================================== --# Ce cas test est gere en configuration dans la base ASTER, il sert de --# modele pour prononcer la recette de l IHM d EFICAS : l objectif est de --# pouvoir recreer ce test a l identique dans EFICAS a partir d une page --# blanche. --# On a donc essaye d y placer toutes les commandes un peu particulieres --# du langage de commandes d ASTER --# --# Il s agit en fait du test SDND102A auquel on a ajoute : --# la definition d un parametre (VAL) --# l inclusion d un fichier (INCLUDE) --# une poursuite (POURSUITE) --# Il contient ainsi : --# des parametres, des formules, des macros, des mots cles facteurs repetes --# (y compris conditionnes par des regles : calc_fonction / COMB), --# des blocs (mode_iter_simult,calc_char_seisme), un defi_valeur, un parametre. --# --# --# Il faudra y associer quelques recommandations pour la recette : --# - verifier qu en ouvrant le .com0, il demande bien a browser le .comm puis, en cascade, le .11 --# - verifier qu on peut bien supprimer une commande, un mot cle simple et facteur --# - verifier les acces a la doc --# --# -- -- --DEBUT(CODE=_F(NOM='EFICA01A',NIV_PUB_WEB='INTERNET',VISU_EFICAS='NON'),) -- --MAILLAGE=LIRE_MAILLAGE() -- --MAILLAGE=DEFI_GROUP(reuse=MAILLAGE, -- MAILLAGE=MAILLAGE, -- CREA_GROUP_NO=(_F(NOEUD='NO2', -- NOM='MASSES',), -- _F(NOEUD='NO1', -- NOM='ENCASTRE',),),) -- --MAILLA2=LIRE_MAILLAGE(UNITE=21,) -- --MODELE=AFFE_MODELE(MAILLAGE=MAILLAGE, -- AFFE=(_F(GROUP_MA='RESSORT', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO='MASSES', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) -- --BICHOC=AFFE_MODELE(MAILLAGE=MAILLA2, -- AFFE=(_F(GROUP_MA='RESSORTS', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) --VAL = 98696.0 -- -- --CARA_ELE=AFFE_CARA_ELEM(MODELE=MODELE, -- DISCRET=(_F(GROUP_MA='RESSORT', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CARA_BIC=AFFE_CARA_ELEM(MODELE=BICHOC, -- DISCRET=(_F(GROUP_MA='RESSORTS', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES1', -- CARA='M_T_D_N', -- VALE=25.0,), -- _F(GROUP_NO='MASSES2', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CON_LIM=AFFE_CHAR_MECA(MODELE=MODELE, -- DDL_IMPO=(_F(GROUP_NO='ENCASTRE', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO='MASSES', -- DY=0.0, -- DZ=0.0,),),) -- --CL_BICHO=AFFE_CHAR_MECA(MODELE=BICHOC, -- DDL_IMPO=(_F(GROUP_NO='ENCBICHO', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- DY=0.0, -- DZ=0.0,),),) -- --MACRO_MATR_ASSE(MODELE=MODELE, -- CARA_ELEM=CARA_ELE, -- CHARGE=CON_LIM, -- NUME_DDL=CO('NUMEDDL'), -- MATR_ASSE=(_F(MATRICE=CO('RIGIDITE'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASSE'), -- OPTION='MASS_MECA',),),) -- --MACRO_MATR_ASSE(MODELE=BICHOC, -- CARA_ELEM=CARA_BIC, -- CHARGE=CL_BICHO, -- NUME_DDL=CO('NUMDDLC'), -- MATR_ASSE=(_F(MATRICE=CO('RIGI_BIC'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASS_BIC'), -- OPTION='MASS_MECA',),),) -- --MODE_MEC=MODE_ITER_SIMULT(MATR_A=RIGIDITE, -- MATR_B=MASSE,) -- --MODE_MEC=NORM_MODE(reuse =MODE_MEC, -- MODE=MODE_MEC, -- NORME='MASS_GENE',) -- --MODE_BIC=MODE_ITER_SIMULT(MATR_A=RIGI_BIC, -- MATR_B=MASS_BIC, -- METHODE='JACOBI', -- OPTION='SANS', -- CALC_FREQ=_F(OPTION='BANDE', -- FREQ=(1.0,10.0,),),) -- --MODE_BIC=NORM_MODE(reuse =MODE_BIC, -- MODE=MODE_BIC, -- NORME='MASS_GENE',) -- --MODE_STA=MODE_STATIQUE(MATR_RIGI=RIGIDITE, -- MATR_MASS=MASSE, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --MSTA_BIC=MODE_STATIQUE(MATR_RIGI=RIGI_BIC, -- MATR_MASS=MASS_BIC, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --L_INST=DEFI_LIST_REEL(DEBUT=0.0, -- INTERVALLE=_F(JUSQU_A=1.0, -- PAS=1.E-4,),) -- --OMEGAA=2.*pi*10. -- --ACCE1 = FORMULE(VALE = 'sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER1=CALC_FONC_INTERP(FONCTION=ACCE1, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --ACCE2 = FORMULE(VALE = '-sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER2=CALC_FONC_INTERP(FONCTION=ACCE2, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE1 = FORMULE(VALE = '-cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE1=CALC_FONC_INTERP(FONCTION=VITE1, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --DEPL1 = FORMULE(VALE = '-sin(OMEGAA*INST)/(OMEGAA**2)', -- NOM_PARA='INST') -- --DEPLACE1=CALC_FONC_INTERP(FONCTION=DEPL1, -- NOM_RESU='DEPL', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE2 = FORMULE(VALE = 'cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE2=CALC_FONC_INTERP(FONCTION=VITE2, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --xx=2 -- --INCLUDE(UNITE=11, -- INFO=1,) -- --MUR=DEFI_OBSTACLE(TYPE='PLAN_Z',) -- --TRAN_GE1=DYNA_TRAN_MODAL(METHODE='EULER', -- MASS_GENE=MASS_GEN, -- RIGI_GENE=RIGI_GEN, -- AMOR_REDUIT=0.07, -- MODE_STAT=MODE_STA, -- INCREMENT=_F(INST_INIT=0.0, -- INST_FIN=1.0, -- PAS=2.0E-4,), -- ARCHIVAGE=_F(PAS_ARCH=8,), -- EXCIT=_F(VECT_GENE=VECT_X, -- ACCE=ACCELER1, -- VITE=VITESSE1, -- DEPL=DEPLACE1, -- MULT_APPUI='OUI', -- DIRECTION=(1.0,0.0,0.0,), -- NOEUD='NO1',), -- CHOC=_F(INTITULE='NO2/MUR', -- GROUP_NO_1='MASSES', -- OBSTACLE=MUR, -- ORIG_OBST=(-1.0,0.0,0.0,), -- NORM_OBST=(0.0,0.0,1.0,), -- JEU=1.1005, -- RIGI_NOR=5.76E7, -- AMOR_NOR=0.0, -- RIGI_TAN=0.0, -- COULOMB=0.0,),) -- --MULT_X1=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO1',) -- --MULT_X2=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO11',) -- --MACRO_PROJ_BASE(BASE=MODE_BIC, -- MATR_ASSE_GENE=(_F(MATRICE=CO('MGEN_BIC'), -- MATR_ASSE=MASS_BIC,), -- _F(MATRICE=CO('RGEN_BIC'), -- MATR_ASSE=RIGI_BIC,),), -- VECT_ASSE_GENE=(_F(VECTEUR=CO('VECT_X1'), -- VECT_ASSE=MULT_X1,), -- _F(VECTEUR=CO('VECT_X2'), -- VECT_ASSE=MULT_X2,),),) -- --GRILLE=DEFI_OBSTACLE(TYPE='BI_PLAN_Z',) -- --MAILLA3=LIRE_MAILLAGE(UNITE=22,) -- --FIN() diff --cc Tests/testcomm/efica01b.11 index bec37b5b,bec37b5b..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/efica01b.11 +++ /dev/null @@@ -1,19 -1,19 +1,0 @@@ --DEPL2 = FORMULE(NOM_PARA='INST',VALE='sin(OMEGAA*INST)/(OMEGAA**xx)') --DEPLACE2=CALC_FONC_INTERP( FONCTION=DEPL2, -- LIST_PARA=L_INST, -- NOM_PARA='INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE', -- NOM_RESU='DEPL' ) -- --MONO_X=CALC_CHAR_SEISME( MATR_MASS=MASSE, -- DIRECTION=( 1., 0., 0.,), -- MONO_APPUI='OUI' ) -- -- --MACRO_PROJ_BASE(BASE=MODE_MEC,MATR_ASSE_GENE=( -- _F( MATRICE = CO("MASS_GEN"), MATR_ASSE = MASSE), -- _F( MATRICE = CO("RIGI_GEN"), MATR_ASSE = RIGIDITE)), -- VECT_ASSE_GENE=_F( VECTEUR = CO("VECT_X"), VECT_ASSE = MONO_X) -- ) -- diff --cc Tests/testcomm/efica01b.comm index 20eea866,20eea866..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm/efica01b.comm +++ /dev/null @@@ -1,275 -1,275 +1,0 @@@ --# MODIF DATE 20/09/2004 AUTEUR DURAND C.DURAND --# TITRE TEST DE NON REGRESSION DE L IHM EFICAS - DERIVE DE SDND102A --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2001 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. --# ====================================================================== --# Ce cas test est gere en configuration dans la base ASTER, il sert de --# modele pour prononcer la recette de l IHM d EFICAS : l objectif est de --# pouvoir recreer ce test a l identique dans EFICAS a partir d une page --# blanche. --# On a donc essaye d y placer toutes les commandes un peu particulieres --# du langage de commandes d ASTER --# --# Il s agit en fait du test SDND102A auquel on a ajoute : --# la definition d un parametre (VAL) --# l inclusion d un fichier (INCLUDE) --# une poursuite (POURSUITE) --# Il contient ainsi : --# des parametres, des formules, des macros, des mots cles facteurs repetes --# (y compris conditionnes par des regles : calc_fonction / COMB), --# des blocs (mode_iter_simult,calc_char_seisme), un defi_valeur, un parametre. --# --# --# Il faudra y associer quelques recommandations pour la recette : --# - verifier qu en ouvrant le .com0, il demande bien a browser le .comm puis, en cascade, le .11 --# - verifier qu on peut bien supprimer une commande, un mot cle simple et facteur --# - verifier les acces a la doc --# --# -- -- --DEBUT(CODE=_F(NOM='EFICA01A',NIV_PUB_WEB='INTERNET',VISU_EFICAS='NON'),) -- --MAILLAGE=LIRE_MAILLAGE() -- --MAILLAGE=DEFI_GROUP(reuse=MAILLAGE, -- MAILLAGE=MAILLAGE, -- CREA_GROUP_NO=(_F(NOEUD='NO2', -- NOM='MASSES',), -- _F(NOEUD='NO1', -- NOM='ENCASTRE',),),) -- --MAILLA2=LIRE_MAILLAGE(UNITE=21,) -- --MODELE=AFFE_MODELE(MAILLAGE=MAILLAGE, -- AFFE=(_F(GROUP_MA='RESSORT', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO='MASSES', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) -- --BICHOC=AFFE_MODELE(MAILLAGE=MAILLA2, -- AFFE=(_F(GROUP_MA='RESSORTS', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) --VAL = 98696.0 -- -- --CARA_ELE=AFFE_CARA_ELEM(MODELE=MODELE, -- DISCRET=(_F(GROUP_MA='RESSORT', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CARA_BIC=AFFE_CARA_ELEM(MODELE=BICHOC, -- DISCRET=(_F(GROUP_MA='RESSORTS', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES1', -- CARA='M_T_D_N', -- VALE=25.0,), -- _F(GROUP_NO='MASSES2', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CON_LIM=AFFE_CHAR_MECA(MODELE=MODELE, -- DDL_IMPO=(_F(GROUP_NO='ENCASTRE', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO='MASSES', -- DY=0.0, -- DZ=0.0,),),) -- --CL_BICHO=AFFE_CHAR_MECA(MODELE=BICHOC, -- DDL_IMPO=(_F(GROUP_NO='ENCBICHO', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- DY=0.0, -- DZ=0.0,),),) -- --MACRO_MATR_ASSE(MODELE=MODELE, -- CARA_ELEM=CARA_ELE, -- CHARGE=CON_LIM, -- NUME_DDL=CO('NUMEDDL'), -- MATR_ASSE=(_F(MATRICE=CO('RIGIDITE'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASSE'), -- OPTION='MASS_MECA',),),) -- --MACRO_MATR_ASSE(MODELE=BICHOC, -- CARA_ELEM=CARA_BIC, -- CHARGE=CL_BICHO, -- NUME_DDL=CO('NUMDDLC'), -- MATR_ASSE=(_F(MATRICE=CO('RIGI_BIC'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASS_BIC'), -- OPTION='MASS_MECA',),),) -- --MODE_MEC=MODE_ITER_SIMULT(MATR_A=RIGIDITE, -- MATR_B=MASSE,) -- --MODE_MEC=NORM_MODE(reuse =MODE_MEC, -- MODE=MODE_MEC, -- NORME='MASS_GENE',) -- --MODE_BIC=MODE_ITER_SIMULT(MATR_A=RIGI_BIC, -- MATR_B=MASS_BIC, -- METHODE='JACOBI', -- OPTION='SANS', -- CALC_FREQ=_F(OPTION='BANDE', -- FREQ=(1.0,10.0,),),) -- --MODE_BIC=NORM_MODE(reuse =MODE_BIC, -- MODE=MODE_BIC, -- NORME='MASS_GENE',) -- --MODE_STA=MODE_STATIQUE(MATR_RIGI=RIGIDITE, -- MATR_MASS=MASSE, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --MSTA_BIC=MODE_STATIQUE(MATR_RIGI=RIGI_BIC, -- MATR_MASS=MASS_BIC, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --L_INST=DEFI_LIST_REEL(DEBUT=0.0, -- INTERVALLE=_F(JUSQU_A=1.0, -- PAS=1.E-4,),) -- --OMEGAA=2.*pi*10. -- --ACCE1 = FORMULE(VALE = 'sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER1=CALC_FONC_INTERP(FONCTION=ACCE1, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --ACCE2 = FORMULE(VALE = '-sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER2=CALC_FONC_INTERP(FONCTION=ACCE2, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE1 = FORMULE(VALE = '-cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE1=CALC_FONC_INTERP(FONCTION=VITE1, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --DEPL1 = FORMULE(VALE = '-sin(OMEGAA*INST)/(OMEGAA**2)', -- NOM_PARA='INST') -- --DEPLACE1=CALC_FONC_INTERP(FONCTION=DEPL1, -- NOM_RESU='DEPL', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE2 = FORMULE(VALE = 'cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE2=CALC_FONC_INTERP(FONCTION=VITE2, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --xx=2 -- --INCLUDE(UNITE=11, -- INFO=1,) -- --MUR=DEFI_OBSTACLE(TYPE='PLAN_Z',) -- --TRAN_GE1=DYNA_TRAN_MODAL(METHODE='EULER', -- MASS_GENE=MASS_GEN, -- RIGI_GENE=RIGI_GEN, -- AMOR_REDUIT=0.07, -- MODE_STAT=MODE_STA, -- INCREMENT=_F(INST_INIT=0.0, -- INST_FIN=1.0, -- PAS=2.0E-4,), -- ARCHIVAGE=_F(PAS_ARCH=8,), -- EXCIT=_F(VECT_GENE=VECT_X, -- ACCE=ACCELER1, -- VITE=VITESSE1, -- DEPL=DEPLACE1, -- MULT_APPUI='OUI', -- DIRECTION=(1.0,0.0,0.0,), -- NOEUD='NO1',), -- CHOC=_F(INTITULE='NO2/MUR', -- GROUP_NO_1='MASSES', -- OBSTACLE=MUR, -- ORIG_OBST=(-1.0,0.0,0.0,), -- NORM_OBST=(0.0,0.0,1.0,), -- JEU=1.1005, -- RIGI_NOR=5.76E7, -- AMOR_NOR=0.0, -- RIGI_TAN=0.0, -- COULOMB=0.0,),) -- --MULT_X1=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO1',) -- --MULT_X2=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO11',) -- --MACRO_PROJ_BASE(BASE=MODE_BIC, -- MATR_ASSE_GENE=(_F(MATRICE=CO('MGEN_BIC'), -- MATR_ASSE=MASS_BIC,), -- _F(MATRICE=CO('RGEN_BIC'), -- MATR_ASSE=RIGI_BIC,),), -- VECT_ASSE_GENE=(_F(VECTEUR=CO('VECT_X1'), -- VECT_ASSE=MULT_X1,), -- _F(VECTEUR=CO('VECT_X2'), -- VECT_ASSE=MULT_X2,),),) -- --GRILLE=DEFI_OBSTACLE(TYPE='BI_PLAN_Z',) -- --MAILLA3=LIRE_MAILLAGE(UNITE=22,) -- --FIN() diff --cc Tests/testcomm/f.comm index d15a6179,d15a6179..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/f.comm +++ /dev/null @@@ -1,18 -1,18 +1,0 @@@ --from Numeric import size -- --DEBUT() -- --# Definition des parametres de l'excitation sinusoidale --freq=1500.0 --periode=1.0/freq --pas=periode/100.0 -- --LISTTM=DEFI_LIST_REEL(DEBUT=0.0*periode, -- INTERVALLE=_F(JUSQU_A=100.0*periode, -- PAS=pas,),); -- --LISTRD=DEFI_LIST_REEL(DEBUT=(98.0)*periode+pas, -- INTERVALLE=_F(JUSQU_A=(100.0)*periode, -- PAS=pas,),); -- --FIN() diff --cc Tests/testcomm/forma12c.22 index 1452b8f2,1452b8f2..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm/forma12c.22 +++ /dev/null @@@ -1,5616 -1,5616 +1,0 @@@ --ACCELH1=DEFI_FONCTION(NOM_PARA='INST', -- VALE= -- ( -- 0.0 , 0.0 , -- 5.000000000000000E-03 , 1.384945820672120E-02 , -- 1.000000000000000E-02 , 1.382919843991470E-02 , -- 1.500000000000000E-02 , 1.382973754982250E-02 , -- 2.000000000000000E-02 , 1.383338152282280E-02 , -- 2.500000000000000E-02 , 1.393648950771420E-02 , -- 3.000000000000000E-02 , 1.434779984741860E-02 , -- 3.500000000000000E-02 , 1.512950713231800E-02 , -- 4.000000000000000E-02 , 1.614535272002630E-02 , -- 4.500000000000000E-02 , 1.731995083544010E-02 , -- 5.000000000000000E-02 , 1.859624623558040E-02 , -- 5.500000000000000E-02 , 1.953967672923960E-02 , -- 6.000000000000000E-02 , 1.941781110418540E-02 , -- 6.500000000000000E-02 , 1.786343830924350E-02 , -- 7.000000000000001E-02 , 1.516191250319950E-02 , -- 7.500000000000000E-02 , 1.188464893531830E-02 , -- 8.000000000000000E-02 , 8.604671706807470E-03 , -- 8.500000000000001E-02 , 5.843238016204390E-03 , -- 9.000000000000000E-02 , 3.844393537029640E-03 , -- 9.500000000000000E-02 , 2.578831760615030E-03 , -- 0.1 , 2.285337760842440E-03 , -- 0.105 , 3.429647164261850E-03 , -- 0.11 , 5.693975593542530E-03 , -- 0.115 , 8.059677068797949E-03 , -- 0.12 , 1.074690536157120E-02 , -- 0.125 , 1.570430547663250E-02 , -- 0.13 , 2.370085802024690E-02 , -- 0.135 , 3.228248728765840E-02 , -- 0.14 , 3.854420890726100E-02 , -- 0.145 , 4.255105840524570E-02 , -- 0.15 , 4.542487497977820E-02 , -- 0.155 , 4.522394778102340E-02 , -- 0.16 , 3.829095514459380E-02 , -- 0.165 , 2.483633029107950E-02 , -- 0.17 , 9.962011825963081E-03 , -- 0.175 , -1.690338763720670E-03 , -- 0.18 , -9.628765294085771E-03 , -- 0.185 , -1.491533457160890E-02 , -- 0.19 , -1.675574249783150E-02 , -- 0.195 , -1.397302390604700E-02 , -- 0.2 , -8.394257392452909E-03 , -- 0.205 , -4.066198655663860E-03 , -- 0.21 , -2.824511823738000E-03 , -- 0.215 , -2.617183840945080E-03 , -- 0.22 , -1.417346427510000E-03 , -- 0.225 , -1.143002215953450E-03 , -- 0.23 , -5.114862179520550E-03 , -- 0.235 , -1.257393226409120E-02 , -- 0.24 , -2.009825306788950E-02 , -- 0.245 , -2.922606396367100E-02 , -- 0.25 , -4.681398923377460E-02 , -- 0.255 , -7.440515051138789E-02 , -- 0.26 , -0.10334790104033 , -- 0.265 , -0.12586697159281 , -- 0.27 , -0.14387794464775 , -- 0.275 , -0.15814759425273 , -- 0.28 , -0.15645166862504 , -- 0.285 , -0.12686021613717 , -- 0.29 , -7.870738657620450E-02 , -- 0.295 , -3.337529798013800E-02 , -- 0.3 , 4.960493246599410E-03 , -- 0.305 , 5.045559596258160E-02 , -- 0.31 , 0.105226085321393 , -- 0.315 , 0.149377859842677 , -- 0.32 , 0.169404090056596 , -- 0.325 , 0.175768658339062 , -- 0.33 , 0.179795570216475 , -- 0.335 , 0.172362231098084 , -- 0.34 , 0.14178782193451 , -- 0.345 , 9.600009720172401E-02 , -- 0.35 , 4.821844915823450E-02 , -- 0.355 , -4.337533256019430E-03 , -- 0.36 , -6.584719156367530E-02 , -- 0.365 , -0.11836425870338 , -- 0.37 , -0.13733576068719 , -- 0.375 , -0.12352979806305 , -- 0.38 , -9.647458189678811E-02 , -- 0.385 , -6.215705630868780E-02 , -- 0.39 , -1.230416228554950E-02 , -- 0.395 , 4.641921735700460E-02 , -- 0.4 , 8.859572962085120E-02 , -- 0.405 , 9.988862929152570E-02 , -- 0.41 , 9.014811266775360E-02 , -- 0.415 , 7.203047941527541E-02 , -- 0.42 , 4.502398610270280E-02 , -- 0.425 , 6.797639622722420E-03 , -- 0.43 , -3.515202910758360E-02 , -- 0.435 , -7.008994299356780E-02 , -- 0.44 , -9.184195885494270E-02 , -- 0.445 , -9.764578216442391E-02 , -- 0.45 , -8.980199943709211E-02 , -- 0.455 , -7.844678621890611E-02 , -- 0.46 , -7.092648374585479E-02 , -- 0.465 , -5.916134617989510E-02 , -- 0.47 , -2.956966177372460E-02 , -- 0.475 , 1.671374368998170E-02 , -- 0.48 , 6.681414337976969E-02 , -- 0.485 , 0.115921896874314 , -- 0.49 , 0.168522035427266 , -- 0.495 , 0.222448388891968 , -- 0.5 , 0.268501345352512 , -- 0.505 , 0.304492502191568 , -- 0.51 , 0.333201521434027 , -- 0.515 , 0.348912055073103 , -- 0.52 , 0.344336194210705 , -- 0.525 , 0.328357457992693 , -- 0.53 , 0.315639958020935 , -- 0.535 , 0.298753776631336 , -- 0.54 , 0.252828404979867 , -- 0.545 , 0.169993172714936 , -- 0.55 , 6.727059721322880E-02 , -- 0.555 , -4.209915010595060E-02 , -- 0.56 , -0.16027870746769 , -- 0.565 , -0.28051898189652 , -- 0.57 , -0.37473468426368 , -- 0.575 , -0.41761046311846 , -- 0.58 , -0.40704487960185 , -- 0.585 , -0.35317881167887 , -- 0.59 , -0.26473865427636 , -- 0.595 , -0.15439054042026 , -- 0.6 , -4.069603171914010E-02 , -- 0.605 , 6.408493301865420E-02 , -- 0.61 , 0.155029022019142 , -- 0.615 , 0.221244653075603 , -- 0.62 , 0.250448298949297 , -- 0.625 , 0.2498283906321 , -- 0.63 , 0.239493456134941 , -- 0.635 , 0.218886088833644 , -- 0.64 , 0.164337222785859 , -- 0.645 , 7.035013146739150E-02 , -- 0.65 , -3.065825126167990E-02 , -- 0.655 , -0.10313193025801 , -- 0.66 , -0.14127712726139 , -- 0.665 , -0.15425776005121 , -- 0.67 , -0.14167316851909 , -- 0.675 , -0.10137097186279 , -- 0.68 , -4.328536800004760E-02 , -- 0.685 , 2.048801937177380E-02 , -- 0.69 , 8.302000641121640E-02 , -- 0.695 , 0.129331142992423 , -- 0.7 , 0.139601455006784 , -- 0.705 , 0.121227983591054 , -- 0.71 , 0.113005236382458 , -- 0.715 , 0.1379818615802 , -- 0.72 , 0.176308826146499 , -- 0.725 , 0.205232483015008 , -- 0.73 , 0.236700670002903 , -- 0.735 , 0.28518726999873 , -- 0.74 , 0.325155532319882 , -- 0.745 , 0.319888795846513 , -- 0.75 , 0.275055725375209 , -- 0.755 , 0.223753796143942 , -- 0.76 , 0.172075077677344 , -- 0.765 , 0.102710116433296 , -- 0.77 , 2.458158105150330E-02 , -- 0.775 , -2.772090362464080E-02 , -- 0.78 , -4.579263759539020E-02 , -- 0.785 , -5.563702283874560E-02 , -- 0.79 , -6.754184615076410E-02 , -- 0.795 , -5.871706032442020E-02 , -- 0.8 , -1.692509300464670E-02 , -- 0.805 , 3.809918865159700E-02 , -- 0.81 , 9.363878798804159E-02 , -- 0.815 , 0.168712355371222 , -- 0.82 , 0.278043767236916 , -- 0.825 , 0.400260018759297 , -- 0.83 , 0.503549901131272 , -- 0.835 , 0.576593704222666 , -- 0.84 , 0.611464547720466 , -- 0.845 , 0.581774928421811 , -- 0.85 , 0.466685485187298 , -- 0.855 , 0.279469592461024 , -- 0.86 , 4.649599505060000E-02 , -- 0.865 , -0.22611474655397 , -- 0.87 , -0.53742100922433 , -- 0.875 , -0.85597468112981 , -- 0.88 , -1.12858445463436 , -- 0.885 , -1.31964097839003 , -- 0.89 , -1.41810357733099 , -- 0.895 , -1.4129005458435 , -- 0.9 , -1.29047173798494 , -- 0.905 , -1.05919909208997 , -- 0.91 , -0.75411881989804 , -- 0.915 , -0.41406737678731 , -- 0.92 , -7.194360976911091E-02 , -- 0.925 , 0.232932654611786 , -- 0.93 , 0.457448784206965 , -- 0.935 , 0.581369260987795 , -- 0.94 , 0.617884772522987 , -- 0.945 , 0.588638581913632 , -- 0.95 , 0.499594354895777 , -- 0.955 , 0.351854051263097 , -- 0.96 , 0.167285288529307 , -- 0.965 , -1.354817972678980E-02 , -- 0.97 , -0.16506107206104 , -- 0.975 , -0.30020976135865 , -- 0.98 , -0.44800006523462 , -- 0.985 , -0.60571664044792 , -- 0.99 , -0.72882650966723 , -- 0.995 , -0.78150351703968 , -- 1.0 , -0.78325351768449 , -- 1.005 , -0.7804638307994 , -- 1.01 , -0.77907901470961 , -- 1.015 , -0.74044922924701 , -- 1.02 , -0.64794816611668 , -- 1.025 , -0.53653982368824 , -- 1.03 , -0.43590944296704 , -- 1.035 , -0.32196595199848 , -- 1.04 , -0.15803623495676 , -- 1.045 , 4.418314484939760E-02 , -- 1.05 , 0.242865235492215 , -- 1.055 , 0.422391619487335 , -- 1.06 , 0.586878740356939 , -- 1.065 , 0.710461681206935 , -- 1.07 , 0.741340861669433 , -- 1.075 , 0.655713664787049 , -- 1.08 , 0.470616913700976 , -- 1.085 , 0.20656145315631 , -- 1.09 , -0.12112308548803 , -- 1.095 , -0.47118919290136 , -- 1.1 , -0.77786799146278 , -- 1.105 , -0.99394827732625 , -- 1.11 , -1.10304473601585 , -- 1.115 , -1.08949447190265 , -- 1.12 , -0.93583496154967 , -- 1.125 , -0.65727377808015 , -- 1.13 , -0.30107834922153 , -- 1.135 , 9.620828359443580E-02 , -- 1.14 , 0.514013416080853 , -- 1.145 , 0.90642132985077 , -- 1.15 , 1.20374217441116 , -- 1.155 , 1.37257710404611 , -- 1.16 , 1.43303286111545 , -- 1.165 , 1.40075730037501 , -- 1.17 , 1.25846296855354 , -- 1.175 , 1.00832137286648 , -- 1.18 , 0.706462116642059 , -- 1.185 , 0.413493607411118 , -- 1.19 , 0.148293682071222 , -- 1.195 , -8.190792579850280E-02 , -- 1.2 , -0.25000976533114 , -- 1.205 , -0.34497838239222 , -- 1.21 , -0.39991632301279 , -- 1.215 , -0.44361527764964 , -- 1.22 , -0.45948891812011 , -- 1.225 , -0.43276591909851 , -- 1.23 , -0.39819165775721 , -- 1.235 , -0.38929817650006 , -- 1.24 , -0.37545880341991 , -- 1.245 , -0.30998449197619 , -- 1.25 , -0.21624700688801 , -- 1.255 , -0.16343645166853 , -- 1.26 , -0.17391443905321 , -- 1.265 , -0.21919282258219 , -- 1.27 , -0.29688345097037 , -- 1.275 , -0.43984931085551 , -- 1.28 , -0.64071500818847 , -- 1.285 , -0.82875858278133 , -- 1.29 , -0.93796346189032 , -- 1.295 , -0.949512523725 , -- 1.3 , -0.857601537535 , -- 1.305 , -0.65014691427727 , -- 1.31 , -0.34930571456794 , -- 1.315 , -2.752743937664530E-02 , -- 1.32 , 0.246332435481473 , -- 1.325 , 0.45001279080827 , -- 1.33 , 0.58297681321004 , -- 1.335 , 0.636158064092188 , -- 1.34 , 0.611598530544366 , -- 1.345 , 0.543575003876384 , -- 1.35 , 0.472132760127251 , -- 1.355 , 0.4099056501601 , -- 1.36 , 0.349344621324927 , -- 1.365 , 0.282806527352702 , -- 1.37 , 0.200676817565078 , -- 1.375 , 9.097626989587490E-02 , -- 1.38 , -3.844874520206900E-02 , -- 1.385 , -0.1485730750104 , -- 1.39 , -0.19431957586841 , -- 1.395 , -0.15348271845224 , -- 1.4 , -2.614043201034680E-02 , -- 1.405 , 0.177537986918302 , -- 1.41 , 0.435115227256899 , -- 1.415 , 0.705841641151383 , -- 1.42 , 0.939450691097474 , -- 1.425 , 1.09606995057385 , -- 1.43 , 1.16508829271638 , -- 1.435 , 1.17152904343664 , -- 1.44 , 1.15677325221222 , -- 1.445 , 1.14474618562157 , -- 1.45 , 1.13563604509728 , -- 1.455 , 1.136131797716 , -- 1.46 , 1.17059034109195 , -- 1.465 , 1.24349566378999 , -- 1.47 , 1.31555125128714 , -- 1.475 , 1.34451073520553 , -- 1.48 , 1.32767985662737 , -- 1.485 , 1.27338631745007 , -- 1.49 , 1.15790168079473 , -- 1.495 , 0.956521791996786 , -- 1.5 , 0.698290997947875 , -- 1.505 , 0.438367846650034 , -- 1.51 , 0.189519144568428 , -- 1.515 , -6.309865148517370E-02 , -- 1.52 , -0.2907946493572 , -- 1.525 , -0.43414032419491 , -- 1.53 , -0.49035140435209 , -- 1.535 , -0.51769162343818 , -- 1.54 , -0.53944953961898 , -- 1.545 , -0.51762829963883 , -- 1.55 , -0.44905875024602 , -- 1.555 , -0.41047655284131 , -- 1.56 , -0.45801991852189 , -- 1.565 , -0.5452728301642 , -- 1.57 , -0.60180223196739 , -- 1.575 , -0.64090769354799 , -- 1.58 , -0.71776674993069 , -- 1.585 , -0.81770575898523 , -- 1.59 , -0.86693741584294 , -- 1.595 , -0.84067997754846 , -- 1.6 , -0.78353488744314 , -- 1.605 , -0.71744286940014 , -- 1.61 , -0.59774454986713 , -- 1.615 , -0.38171240617319 , -- 1.62 , -8.924731070437070E-02 , -- 1.625 , 0.229074480135456 , -- 1.63 , 0.542610098773165 , -- 1.635 , 0.829628497520742 , -- 1.64 , 1.04494574127203 , -- 1.645 , 1.13156269562082 , -- 1.65 , 1.05624249517991 , -- 1.655 , 0.819935992458342 , -- 1.66 , 0.449565343322086 , -- 1.665 , -2.180707598866940E-03 , -- 1.67 , -0.46040931126981 , -- 1.675 , -0.85138688793934 , -- 1.68 , -1.12388943755807 , -- 1.685 , -1.24657385888904 , -- 1.69 , -1.20179685962043 , -- 1.695 , -0.99981038351547 , -- 1.7 , -0.69163368557204 , -- 1.705 , -0.34742052586021 , -- 1.71 , -1.646326697056420E-02 , -- 1.715 , 0.283945578116849 , -- 1.72 , 0.543028107021654 , -- 1.725 , 0.737133979583192 , -- 1.73 , 0.84487160610996 , -- 1.735 , 0.870212972351319 , -- 1.74 , 0.834700198404195 , -- 1.745 , 0.747170431789498 , -- 1.75 , 0.594410232927394 , -- 1.755 , 0.367486332109475 , -- 1.76 , 8.962182967477010E-02 , -- 1.765 , -0.1883067260291 , -- 1.77 , -0.41613375697166 , -- 1.775 , -0.56543072263443 , -- 1.78 , -0.62930681455469 , -- 1.785 , -0.60967253780204 , -- 1.79 , -0.50702726496872 , -- 1.795 , -0.32533912503295 , -- 1.8 , -9.026946700126549E-02 , -- 1.805 , 0.145429511003968 , -- 1.81 , 0.330819022676906 , -- 1.815 , 0.45222714352563 , -- 1.82 , 0.524252434401283 , -- 1.825 , 0.544685292311812 , -- 1.83 , 0.482635967462947 , -- 1.835 , 0.323118603668567 , -- 1.84 , 9.999214308770410E-02 , -- 1.845 , -0.1356321129448 , -- 1.85 , -0.36128518628156 , -- 1.855 , -0.57322505412043 , -- 1.86 , -0.74566937227067 , -- 1.865 , -0.831111234663 , -- 1.87 , -0.79988891088422 , -- 1.875 , -0.65798317740384 , -- 1.88 , -0.42968513644553 , -- 1.885 , -0.14457167669537 , -- 1.89 , 0.161701689894838 , -- 1.895 , 0.456458659481019 , -- 1.9 , 0.720641473510481 , -- 1.905 , 0.93536449279502 , -- 1.91 , 1.06690148982661 , -- 1.915 , 1.08832474904443 , -- 1.92 , 1.00876475369484 , -- 1.925 , 0.854457298011041 , -- 1.93 , 0.628173977645005 , -- 1.935 , 0.322546940276438 , -- 1.94 , -2.596888473873320E-02 , -- 1.945 , -0.33525384338564 , -- 1.95 , -0.5416882826646 , -- 1.955 , -0.63460201942509 , -- 1.96 , -0.61577036509424 , -- 1.965 , -0.46445342826001 , -- 1.97 , -0.17427091738081 , -- 1.975 , 0.197608608481982 , -- 1.98 , 0.551300717211572 , -- 1.985 , 0.807313151449369 , -- 1.99 , 0.929291756112952 , -- 1.995 , 0.900203655372628 , -- 2.0 , 0.711960914602783 , -- 2.005 , 0.386125888668035 , -- 2.01 , -1.664845298933290E-02 , -- 2.015 , -0.42003837834356 , -- 2.02 , -0.75822166854004 , -- 2.025 , -0.97936810396973 , -- 2.03 , -1.0426579951744 , -- 2.035 , -0.93057240999803 , -- 2.04 , -0.66368034717177 , -- 2.045 , -0.29110991423144 , -- 2.05 , 0.119136312621438 , -- 2.055 , 0.505291402538494 , -- 2.06 , 0.880216899892637 , -- 2.065 , 1.20828770980265 , -- 2.07 , 1.46849325860208 , -- 2.075 , 1.67233522841001 , -- 2.08 , 1.84159238892188 , -- 2.085 , 1.97017314302929 , -- 2.09 , 2.02820005370812 , -- 2.095 , 2.00307389537606 , -- 2.1 , 1.90918679712901 , -- 2.105 , 1.7492164388665 , -- 2.11 , 1.49601732028444 , -- 2.115 , 1.13320644545655 , -- 2.12 , 0.691534368057989 , -- 2.125 , 0.222522846896641 , -- 2.13 , -0.2568718835065 , -- 2.135 , -0.73270869895797 , -- 2.14 , -1.16691560085841 , -- 2.145 , -1.52131308342383 , -- 2.15 , -1.77830659090987 , -- 2.155 , -1.94190868704924 , -- 2.16 , -2.01807428134882 , -- 2.165 , -2.01753841723068 , -- 2.17 , -1.96550102271951 , -- 2.175 , -1.88172547074643 , -- 2.18 , -1.76181108149962 , -- 2.185 , -1.60314470865115 , -- 2.19 , -1.43287068566641 , -- 2.195 , -1.27868078783724 , -- 2.2 , -1.12992856906385 , -- 2.205 , -0.96854903020236 , -- 2.21 , -0.82469988669093 , -- 2.215 , -0.75306712540506 , -- 2.22 , -0.75949831264927 , -- 2.225 , -0.80266627698916 , -- 2.23 , -0.86825465400046 , -- 2.235 , -0.98190873939491 , -- 2.24 , -1.13332846537187 , -- 2.245 , -1.24587809111606 , -- 2.25 , -1.25403636722243 , -- 2.255 , -1.16774949125882 , -- 2.26 , -1.02737996901608 , -- 2.265 , -0.83618584315821 , -- 2.27 , -0.58078051378866 , -- 2.275 , -0.28886675266917 , -- 2.28 , -1.584903466322660E-02 , -- 2.285 , 0.243494185775485 , -- 2.29 , 0.493747779128152 , -- 2.295 , 0.763367558765503 , -- 2.3 , 1.04659160151311 , -- 2.305 , 1.31787059651459 , -- 2.31 , 1.55330513693362 , -- 2.315 , 1.72708398800512 , -- 2.32 , 1.80403390270411 , -- 2.325 , 1.74474528448072 , -- 2.33 , 1.51781565889812 , -- 2.335 , 1.11765857002866 , -- 2.34 , 0.582482410154426 , -- 2.345 , -9.718428438488540E-03 , -- 2.35 , -0.57168637020167 , -- 2.355 , -1.03230607359137 , -- 2.36 , -1.33718623748091 , -- 2.365 , -1.44694517260007 , -- 2.37 , -1.35098612723151 , -- 2.375 , -1.07661964039704 , -- 2.38 , -0.67815732332436 , -- 2.385 , -0.22427774359532 , -- 2.39 , 0.206546911873295 , -- 2.395 , 0.541628296955107 , -- 2.4 , 0.739725635914114 , -- 2.405 , 0.792688071679571 , -- 2.41 , 0.699855261818748 , -- 2.415 , 0.460345996951087 , -- 2.42 , 9.825062680758330E-02 , -- 2.425 , -0.32686436332366 , -- 2.43 , -0.75151572607261 , -- 2.435 , -1.13800924040631 , -- 2.44 , -1.46265919709476 , -- 2.445 , -1.69312259897435 , -- 2.45 , -1.79655595938503 , -- 2.455 , -1.76112116582848 , -- 2.46 , -1.59504402395201 , -- 2.465 , -1.31375304224191 , -- 2.47 , -0.94339622712974 , -- 2.475 , -0.5311872307141 , -- 2.48 , -0.13652655158703 , -- 2.485 , 0.191652831784399 , -- 2.49 , 0.427316277261529 , -- 2.495 , 0.565105289247264 , -- 2.5 , 0.614388715344672 , -- 2.505 , 0.595214227948157 , -- 2.51 , 0.537482815214678 , -- 2.515 , 0.480599475426244 , -- 2.52 , 0.461418219827792 , -- 2.525 , 0.490351150400196 , -- 2.53 , 0.544926077525614 , -- 2.535 , 0.597359901626847 , -- 2.54 , 0.63915145270988 , -- 2.545 , 0.666359147512914 , -- 2.55 , 0.659549902572926 , -- 2.555 , 0.607653814797886 , -- 2.56 , 0.542274304956947 , -- 2.565 , 0.514978623780516 , -- 2.57 , 0.542507936778163 , -- 2.575 , 0.605343596447052 , -- 2.58 , 0.694971250554721 , -- 2.585 , 0.820564438850225 , -- 2.59 , 0.964525817889196 , -- 2.595 , 1.07728875105342 , -- 2.6 , 1.13416623229962 , -- 2.605 , 1.16046452303612 , -- 2.61 , 1.18333170206295 , -- 2.615 , 1.19818806982642 , -- 2.62 , 1.2055342011362 , -- 2.625 , 1.23921335799247 , -- 2.63 , 1.32082369230339 , -- 2.635 , 1.41353565810184 , -- 2.64 , 1.45647248242833 , -- 2.645 , 1.42296156176653 , -- 2.65 , 1.31247243180803 , -- 2.655 , 1.10982597617917 , -- 2.66 , 0.796193729509591 , -- 2.665 , 0.391525367264635 , -- 2.67 , -5.039209232008630E-02 , -- 2.675 , -0.48551296055089 , -- 2.68 , -0.89084690987514 , -- 2.685 , -1.24148991258587 , -- 2.69 , -1.50817716119153 , -- 2.695 , -1.67597297557138 , -- 2.7 , -1.74058611919401 , -- 2.705 , -1.69018703360535 , -- 2.71 , -1.51441737441596 , -- 2.715 , -1.22691360409733 , -- 2.72 , -0.85820811206465 , -- 2.725 , -0.43656402639097 , -- 2.73 , -1.877591162527850E-03 , -- 2.735 , 0.3722134714064 , -- 2.74 , 0.604368486493566 , -- 2.745 , 0.654206094948509 , -- 2.75 , 0.520823349815255 , -- 2.755 , 0.204565302761595 , -- 2.76 , -0.24284766157643 , -- 2.765 , -0.75311719985656 , -- 2.77 , -1.25324781337662 , -- 2.775 , -1.6520239944361 , -- 2.78 , -1.91175925323649 , -- 2.785 , -2.02042853839568 , -- 2.79 , -1.95654753001104 , -- 2.795 , -1.71189367332731 , -- 2.8 , -1.33217954914393 , -- 2.805 , -0.90169171320611 , -- 2.81 , -0.48741397679456 , -- 2.815 , -0.11957680209296 , -- 2.82 , 0.208180180447444 , -- 2.825 , 0.429754499753944 , -- 2.83 , 0.500373556893508 , -- 2.835 , 0.453923556202155 , -- 2.84 , 0.356589274872127 , -- 2.845 , 0.252756610751608 , -- 2.85 , 0.15368816142573 , -- 2.855 , 7.226479768245560E-02 , -- 2.86 , 3.888968358902120E-02 , -- 2.865 , 7.085947846528430E-02 , -- 2.87 , 0.145649387450817 , -- 2.875 , 0.221440328548596 , -- 2.88 , 0.271936154319643 , -- 2.885 , 0.285520971687156 , -- 2.89 , 0.244558483181686 , -- 2.895 , 0.131111505423643 , -- 2.9 , -4.976188706858230E-02 , -- 2.905 , -0.27342387270832 , -- 2.91 , -0.51955671330527 , -- 2.915 , -0.77083790776384 , -- 2.92 , -0.9909431240431 , -- 2.925 , -1.1326860598253 , -- 2.93 , -1.17530215375529 , -- 2.935 , -1.1315547074335 , -- 2.94 , -1.01461371409468 , -- 2.945 , -0.82697517656886 , -- 2.95 , -0.5923950948081 , -- 2.955 , -0.367250148284 , -- 2.96 , -0.19748847576212 , -- 2.965 , -8.287483750208639E-02 , -- 2.97 , 1.205615998459890E-03 , -- 2.975 , 6.700285876984650E-02 , -- 2.98 , 0.142475719272639 , -- 2.985 , 0.272732688275581 , -- 2.99 , 0.498473860216776 , -- 2.995 , 0.815246300242191 , -- 3.0 , 1.17850966940332 , -- 3.005 , 1.5365879707165 , -- 3.01 , 1.83696246846193 , -- 3.015 , 2.01683359177992 , -- 3.02 , 2.02473029766593 , -- 3.025 , 1.85763991176815 , -- 3.03 , 1.55996114842794 , -- 3.035 , 1.19160270003895 , -- 3.04 , 0.817034460759104 , -- 3.045 , 0.512897988315463 , -- 3.05 , 0.347660769303193 , -- 3.055 , 0.341161122643262 , -- 3.06 , 0.460638539442427 , -- 3.065 , 0.655193651694964 , -- 3.07 , 0.871495085561553 , -- 3.075 , 1.04025886670637 , -- 3.08 , 1.0866972125822 , -- 3.085 , 0.97592646156581 , -- 3.09 , 0.732149789609832 , -- 3.095 , 0.404350262104711 , -- 3.1 , 3.450811147404410E-02 , -- 3.105 , -0.3574143716153 , -- 3.11 , -0.67593382755679 , -- 3.115 , -0.85741138771834 , -- 3.12 , -0.88812837843921 , -- 3.125 , -0.79137979090702 , -- 3.13 , -0.59262327029812 , -- 3.135 , -0.31629865744548 , -- 3.14 , -7.233283133936310E-03 , -- 3.145 , 0.273183439196407 , -- 3.15 , 0.478066409829062 , -- 3.155 , 0.58805365224197 , -- 3.16 , 0.593648649534557 , -- 3.165 , 0.483000051126779 , -- 3.17 , 0.254384438681656 , -- 3.175 , -6.624305965878829E-02 , -- 3.18 , -0.4267275966133 , -- 3.185 , -0.81396009231636 , -- 3.19 , -1.1955849391981 , -- 3.195 , -1.53431204255614 , -- 3.2 , -1.79550741772338 , -- 3.205 , -1.95961471169112 , -- 3.21 , -2.02193224868472 , -- 3.215 , -1.98153140879109 , -- 3.22 , -1.83692731893728 , -- 3.225 , -1.59274123405354 , -- 3.23 , -1.26186737186096 , -- 3.235 , -0.85475661028155 , -- 3.24 , -0.37101324608578 , -- 3.245 , 0.104191797011254 , -- 3.25 , 0.444402436394787 , -- 3.255 , 0.80270823947836 , -- 3.26 , 1.15997110726162 , -- 3.265 , 1.495182836989 , -- 3.27 , 1.77744468860316 , -- 3.275 , 1.96545418255327 , -- 3.28 , 2.0238275806165 , -- 3.285 , 1.94070094966571 , -- 3.29 , 1.72718398222401 , -- 3.295 , 1.40473739766314 , -- 3.3 , 1.00200904728279 , -- 3.305 , 0.563540200278601 , -- 3.31 , 0.149874332156587 , -- 3.315 , -0.36080714644631 , -- 3.32 , -0.78705501088032 , -- 3.325 , -0.96779259671266 , -- 3.33 , -0.92388383903371 , -- 3.335 , -0.70129187312547 , -- 3.34 , -0.37633413832281 , -- 3.345 , -4.983212937679970E-02 , -- 3.35 , 0.182525585093038 , -- 3.355 , 0.262197946276188 , -- 3.36 , 0.176793782229557 , -- 3.365 , -5.176420413944920E-02 , -- 3.37 , -0.37933630972585 , -- 3.375 , -0.74271351288949 , -- 3.38 , -1.06375084817712 , -- 3.385 , -1.26478653529069 , -- 3.39 , -1.29047203891782 , -- 3.395 , -1.12256167350094 , -- 3.4 , -0.78075489126115 , -- 3.405 , -0.31359677016703 , -- 3.41 , 0.21274034122224 , -- 3.415 , 0.723339413347021 , -- 3.42 , 1.14216320992711 , -- 3.425 , 1.40285852862188 , -- 3.43 , 1.46353765010519 , -- 3.435 , 1.31751508169454 , -- 3.44 , 0.990610982524745 , -- 3.445 , 0.528518300724784 , -- 3.45 , -1.201464116995880E-02 , -- 3.455 , -0.56495490805526 , -- 3.46 , -1.06256507808036 , -- 3.465 , -1.45449004401942 , -- 3.47 , -1.72216993561753 , -- 3.475 , -1.87372425489139 , -- 3.48 , -1.93012616321294 , -- 3.485 , -1.92125770401275 , -- 3.49 , -1.88683182264746 , -- 3.495 , -1.86489427093378 , -- 3.5 , -1.87314769209702 , -- 3.505 , -1.90576881574645 , -- 3.51 , -1.947112317286 , -- 3.515 , -1.97949862409975 , -- 3.52 , -1.97797423254897 , -- 3.525 , -1.91218852417812 , -- 3.53 , -1.76423764925703 , -- 3.535 , -1.54024679422456 , -- 3.54 , -1.25875344890035 , -- 3.545 , -0.9338632056843 , -- 3.55 , -0.57694094749828 , -- 3.555 , -0.20814045746558 , -- 3.56 , 0.146206363036127 , -- 3.565 , 0.468653953534567 , -- 3.57 , 0.754631835985132 , -- 3.575 , 0.999185044322006 , -- 3.58 , 1.18633789810153 , -- 3.585 , 1.29531712809396 , -- 3.59 , 1.31308664187438 , -- 3.595 , 1.23731524907479 , -- 3.6 , 1.07118836166498 , -- 3.605 , 0.822464072088323 , -- 3.61 , 0.509927368235254 , -- 3.615 , 0.167608567620092 , -- 3.62 , -0.16136132010127 , -- 3.625 , -0.43756626339828 , -- 3.63 , -0.63523583164368 , -- 3.635 , -0.74542737572521 , -- 3.64 , -0.7756133968174 , -- 3.645 , -0.74811092815284 , -- 3.65 , -0.69606885610044 , -- 3.655 , -0.6565734770812 , -- 3.66 , -0.66248883313473 , -- 3.665 , -0.7327889886856 , -- 3.67 , -0.86178796221599 , -- 3.675 , -1.01484775035497 , -- 3.68 , -1.13874812866412 , -- 3.685 , -1.18063976569405 , -- 3.69 , -1.10015331426255 , -- 3.695 , -0.87258642642403 , -- 3.7 , -0.49606882241743 , -- 3.705 , -3.859866915145810E-03 , -- 3.71 , 0.536274174652005 , -- 3.715 , 1.04296495682297 , -- 3.72 , 1.44309287260192 , -- 3.725 , 1.67861157963259 , -- 3.73 , 1.7100067792938 , -- 3.735 , 1.52993945453465 , -- 3.74 , 1.17332394495836 , -- 3.745 , 0.705456146258253 , -- 3.75 , 0.19881090381289 , -- 3.755 , -0.27919234543845 , -- 3.76 , -0.66960551503829 , -- 3.765 , -0.93205155196248 , -- 3.77 , -1.05626273217395 , -- 3.775 , -1.05832450991158 , -- 3.78 , -0.96616376411692 , -- 3.785 , -0.81175596966687 , -- 3.79 , -0.6282915868819 , -- 3.795 , -0.43985996859902 , -- 3.8 , -0.25160708755689 , -- 3.805 , -5.670095344855360E-02 , -- 3.81 , 0.149245250303935 , -- 3.815 , 0.367246556878583 , -- 3.82 , 0.6001728423305 , -- 3.825 , 0.842651059699404 , -- 3.83 , 1.06576976559939 , -- 3.835 , 1.22584984073272 , -- 3.84 , 1.29118905603104 , -- 3.845 , 1.25131649498925 , -- 3.85 , 1.10483834283469 , -- 3.855 , 0.858719957928343 , -- 3.86 , 0.546596899968826 , -- 3.865 , 0.232913780073415 , -- 3.87 , -1.178392373167330E-02 , -- 3.875 , -0.13503158427521 , -- 3.88 , -0.10474649816556 , -- 3.885 , 8.615352677596511E-02 , -- 3.89 , 0.410679548743155 , -- 3.895 , 0.826698146053687 , -- 3.9 , 1.26554832994177 , -- 3.905 , 1.65499072160026 , -- 3.91 , 1.92591491458393 , -- 3.915 , 2.02174681879988 , -- 3.92 , 1.91690039738994 , -- 3.925 , 1.62485068724173 , -- 3.93 , 1.1855690119834 , -- 3.935 , 0.653037378513217 , -- 3.94 , 9.668746640223920E-02 , -- 3.945 , -0.4301741972333 , -- 3.95 , -0.83059880381395 , -- 3.955 , -1.06253651005356 , -- 3.96 , -1.12343783668418 , -- 3.965 , -1.02905594887957 , -- 3.97 , -0.81438063696053 , -- 3.975 , -0.53887343061785 , -- 3.98 , -0.27199822870815 , -- 3.985 , -6.791154597367660E-02 , -- 3.99 , 4.530742217552380E-02 , -- 3.995 , 6.262857784368379E-02 , -- 4.0 , 2.441344328897610E-03 , -- 4.005 , -9.190475922367920E-02 , -- 4.01 , -0.16297517487801 , -- 4.015 , -0.15723894800794 , -- 4.02 , -3.537253515270430E-02 , -- 4.025 , 0.193043922562747 , -- 4.03 , 0.526357119583793 , -- 4.035 , 0.929427363269694 , -- 4.04 , 1.34182501632519 , -- 4.045 , 1.69896106062951 , -- 4.05 , 1.94147299764395 , -- 4.055 , 2.02131168938189 , -- 4.06 , 1.91405493567929 , -- 4.065 , 1.62895808406502 , -- 4.07 , 1.20381890102136 , -- 4.075 , 0.692151048809337 , -- 4.08 , 0.156757509395021 , -- 4.085 , -0.38604102584051 , -- 4.09 , -0.84133083525009 , -- 4.095 , -1.156233699226 , -- 4.1 , -1.33230861444598 , -- 4.105 , -1.38570779035153 , -- 4.11 , -1.34124970345719 , -- 4.115 , -1.23546550701648 , -- 4.12 , -1.10801235519435 , -- 4.125 , -0.98248955079667 , -- 4.13 , -0.86003296814087 , -- 4.135 , -0.73178734822649 , -- 4.14 , -0.59090783838188 , -- 4.145 , -0.43318234968906 , -- 4.15 , -0.25684880447788 , -- 4.155 , -6.856986064204031E-02 , -- 4.16 , 0.113175698843399 , -- 4.165 , 0.263255109728613 , -- 4.17 , 0.35752664561249 , -- 4.175 , 0.378805103678297 , -- 4.18 , 0.323547996037049 , -- 4.185 , 0.206516861655614 , -- 4.19 , 5.649526699216110E-02 , -- 4.195 , -9.378626227851780E-02 , -- 4.2 , -0.21317600878937 , -- 4.205 , -0.27287940125587 , -- 4.21 , -0.25114165876958 , -- 4.215 , -0.14168231890677 , -- 4.22 , 4.361065500048250E-02 , -- 4.225 , 0.279918937448746 , -- 4.23 , 0.535273378579502 , -- 4.235 , 0.773588682574221 , -- 4.24 , 0.958219914615338 , -- 4.245 , 1.05647251768057 , -- 4.25 , 1.0429998608356 , -- 4.255 , 0.904048723430757 , -- 4.26 , 0.64342045751792 , -- 4.265 , 0.283827852947311 , -- 4.27 , -0.13946358577039 , -- 4.275 , -0.58422822501242 , -- 4.28 , -1.00040723456331 , -- 4.285 , -1.33261766567896 , -- 4.29 , -1.53443838788264 , -- 4.295 , -1.58333249912622 , -- 4.3 , -1.48186835325815 , -- 4.305 , -1.25134227914383 , -- 4.31 , -0.93134131663624 , -- 4.315 , -0.58023320392854 , -- 4.32 , -0.263068523183 , -- 4.325 , -3.234875382342560E-02 , -- 4.33 , 8.104457813070970E-02 , -- 4.335 , 6.646358030000100E-02 , -- 4.34 , -6.520527065940920E-02 , -- 4.345 , -0.27865084678943 , -- 4.35 , -0.52301393304868 , -- 4.355 , -0.75029273588902 , -- 4.36 , -0.92586132464525 , -- 4.365 , -1.02745479977821 , -- 4.37 , -1.045887182644 , -- 4.375 , -0.98998208526761 , -- 4.38 , -0.88247620098788 , -- 4.385 , -0.74513807964771 , -- 4.39 , -0.589693305748 , -- 4.395 , -0.4218623825717 , -- 4.4 , -0.24559350524832 , -- 4.405 , -5.960463612956680E-02 , -- 4.41 , 0.142717207535869 , -- 4.415 , 0.362879306116347 , -- 4.42 , 0.588751862423607 , -- 4.425 , 0.799650310566393 , -- 4.43 , 0.976747652586761 , -- 4.435 , 1.1062713323933 , -- 4.44 , 1.17888982115871 , -- 4.445 , 1.19440253536595 , -- 4.45 , 1.16760308413961 , -- 4.455 , 1.12503563953872 , -- 4.46 , 1.09428815021162 , -- 4.465 , 1.09605242115199 , -- 4.47 , 1.141397648121 , -- 4.475 , 1.22879693707608 , -- 4.48 , 1.34085300252377 , -- 4.485 , 1.44734590197994 , -- 4.49 , 1.51600244532524 , -- 4.495 , 1.52347176965462 , -- 4.5 , 1.4600805519962 , -- 4.505 , 1.32990917025988 , -- 4.51 , 1.15031027736352 , -- 4.515 , 0.950259774927611 , -- 4.52 , 0.764000212508228 , -- 4.525 , 0.620467212343643 , -- 4.53 , 0.53443313966959 , -- 4.535 , 0.504324479922065 , -- 4.54 , 0.515518988342075 , -- 4.545 , 0.5449123033391 , -- 4.55 , 0.565643760216133 , -- 4.555 , 0.553361701085439 , -- 4.56 , 0.492730481489852 , -- 4.565 , 0.380543114015636 , -- 4.57 , 0.224809165664267 , -- 4.575 , 4.198032082290820E-02 , -- 4.58 , -0.14747370012324 , -- 4.585 , -0.32583933056166 , -- 4.59 , -0.48349824002692 , -- 4.595 , -0.61801754775951 , -- 4.6 , -0.72971208292477 , -- 4.605 , -0.82083468227042 , -- 4.61 , -0.89775066250987 , -- 4.615 , -0.96888908984926 , -- 4.62 , -1.0384220049282 , -- 4.625 , -1.10412227179889 , -- 4.63 , -1.16142632685637 , -- 4.635 , -1.20605223114456 , -- 4.64 , -1.23228150965333 , -- 4.645 , -1.2330625103562 , -- 4.65 , -1.20312802686153 , -- 4.655 , -1.13793589958523 , -- 4.66 , -1.0287141764878 , -- 4.665 , -0.8641100498206 , -- 4.67 , -0.63938852378214 , -- 4.675 , -0.35979779312165 , -- 4.68 , -3.418457890781780E-02 , -- 4.685 , 0.32663500010105 , -- 4.69 , 0.70029027164172 , -- 4.695 , 1.04848934874391 , -- 4.7 , 1.32926995685333 , -- 4.705 , 1.5103149027497 , -- 4.71 , 1.56674966292037 , -- 4.715 , 1.47490809529175 , -- 4.72 , 1.22042977817102 , -- 4.725 , 0.812026061087399 , -- 4.73 , 0.280340511193259 , -- 4.735 , -0.25291232049697 , -- 4.74 , -0.74295446485739 , -- 4.745 , -1.21402870653543 , -- 4.75 , -1.61401924449385 , -- 4.755 , -1.89622337299338 , -- 4.76 , -2.02674956179211 , -- 4.765 , -1.98422913056168 , -- 4.77 , -1.76288837183623 , -- 4.775 , -1.38094808362694 , -- 4.78 , -0.88180280078288 , -- 4.785 , -0.32340693878301 , -- 4.79 , 0.309775095794083 , -- 4.795 , 0.96398882181726 , -- 4.8 , 1.46521480566007 , -- 4.805 , 1.77054065361263 , -- 4.81 , 1.87515908448363 , -- 4.815 , 1.80763374123846 , -- 4.82 , 1.61871625340312 , -- 4.825 , 1.37383254873989 , -- 4.83 , 1.14323155673988 , -- 4.835 , 0.984115330306988 , -- 4.84 , 0.925398091665492 , -- 4.845 , 0.966346779872473 , -- 4.85 , 1.08319151549769 , -- 4.855 , 1.23351422222229 , -- 4.86 , 1.36203968864373 , -- 4.865 , 1.41500821627328 , -- 4.87 , 1.35632626255014 , -- 4.875 , 1.17338649661648 , -- 4.88 , 0.873766424591019 , -- 4.885 , 0.482332773802851 , -- 4.89 , 3.923546396876550E-02 , -- 4.895 , -0.22463035892901 , -- 4.9 , -0.44775774321397 , -- 4.905 , -0.63337252960387 , -- 4.91 , -0.77214474283379 , -- 4.915 , -0.86139644715887 , -- 4.92 , -0.90539713757332 , -- 4.925 , -0.91457475953945 , -- 4.93 , -0.90292943826226 , -- 4.935 , -0.88570153051275 , -- 4.94 , -0.87839307255918 , -- 4.945 , -0.89582516241653 , -- 4.95 , -0.95014576706764 , -- 4.955 , -1.0485044185337 , -- 4.96 , -1.1912694657772 , -- 4.965 , -1.3708025639651 , -- 4.97 , -1.57077187288448 , -- 4.975 , -1.76663217835511 , -- 4.98 , -1.92803570312605 , -- 4.985 , -2.02359808191781 , -- 4.99 , -2.0273751484136 , -- 4.995 , -1.9250033514058 , -- 5.0 , -1.71741034508892 , -- 5.005 , -1.42182210128631 , -- 5.01 , -1.07072647445332 , -- 5.015 , -0.70800393596021 , -- 5.02 , -0.38102872779966 , -- 5.025 , -0.13042197488723 , -- 5.03 , 3.718076749748670E-02 , -- 5.035 , 0.111181074997115 , -- 5.04 , 1.189110285104030E-02 , -- 5.045 , -0.20207868848779 , -- 5.05 , -0.44910010485315 , -- 5.055 , -0.64276640560255 , -- 5.06 , -0.71152270492906 , -- 5.065 , -0.61247600528197 , -- 5.07 , -0.33784697642092 , -- 5.075 , 8.416359716705800E-02 , -- 5.08 , 0.593871386434318 , -- 5.085 , 1.11066790591664 , -- 5.09 , 1.547857061782 , -- 5.095 , 1.82798847499016 , -- 5.1 , 1.89521989018272 , -- 5.105 , 1.72255076224409 , -- 5.11 , 1.31357650362981 , -- 5.115 , 0.700681089848237 , -- 5.12 , -3.944101274735180E-02 , -- 5.125 , -0.57538253938727 , -- 5.13 , -1.09801528037525 , -- 5.135 , -1.54898464132246 , -- 5.14 , -1.87419746618154 , -- 5.145 , -2.02778376701628 , -- 5.15 , -1.97724411607912 , -- 5.155 , -1.70971194891691 , -- 5.16 , -1.23638258073101 , -- 5.165 , -0.59315494390597 , -- 5.17 , 0.111368648891046 , -- 5.175 , 0.663169389460638 , -- 5.18 , 1.18144631611042 , -- 5.185 , 1.60890018466206 , -- 5.19 , 1.8979822410482 , -- 5.195 , 2.01808652053979 , -- 5.2 , 1.96085818554624 , -- 5.205 , 1.74218321821589 , -- 5.21 , 1.39935953655912 , -- 5.215 , 0.984200755295425 , -- 5.22 , 0.55469135825056 , -- 5.225 , 0.166760087786826 , -- 5.23 , -0.29010383111112 , -- 5.235 , -0.69805571505204 , -- 5.24 , -0.82852798007756 , -- 5.245 , -0.70078564730017 , -- 5.25 , -0.3628421318389 , -- 5.255 , 7.584234896818380E-02 , -- 5.26 , 0.43610921884854 , -- 5.265 , 0.80338816570313 , -- 5.27 , 1.14583363535399 , -- 5.275 , 1.44233546379898 , -- 5.28 , 1.68096745166101 , -- 5.285 , 1.85664177773435 , -- 5.29 , 1.96856248638458 , -- 5.295 , 2.01783075579683 , -- 5.3 , 2.00659270193592 , -- 5.305 , 1.93938767266716 , -- 5.31 , 1.82500672559004 , -- 5.315 , 1.67686130322037 , -- 5.32 , 1.5118566159347 , -- 5.325 , 1.34860724410237 , -- 5.33 , 1.20475926474899 , -- 5.335 , 1.09288033252557 , -- 5.34 , 1.01607186043109 , -- 5.345 , 0.965585517364128 , -- 5.35 , 0.921875442510843 , -- 5.355 , 0.858856383267098 , -- 5.36 , 0.750174073799282 , -- 5.365 , 0.575950824274314 , -- 5.37 , 0.328597045194569 , -- 5.375 , 1.652082973209100E-02 , -- 5.38 , -0.50276970745072 , -- 5.385 , -1.03563631031452 , -- 5.39 , -1.50490953601753 , -- 5.395 , -1.84994677847168 , -- 5.4 , -2.02843329407602 , -- 5.405 , -2.02545789978173 , -- 5.41 , -1.85714442697612 , -- 5.415 , -1.56774223620682 , -- 5.42 , -1.22052435654413 , -- 5.425 , -0.88506969766425 , -- 5.43 , -0.62375651367727 , -- 5.435 , -0.47941781141452 , -- 5.44 , -0.46672787176114 , -- 5.445 , -0.57069258501391 , -- 5.45 , -0.75256544897363 , -- 5.455 , -0.95943306586182 , -- 5.46 , -1.13415327472143 , -- 5.465 , -1.22591171353667 , -- 5.47 , -1.2008821223853 , -- 5.475 , -1.04867466773548 , -- 5.48 , -0.7816480899877 , -- 5.485 , -0.43025221187204 , -- 5.49 , -3.849293308865140E-02 , -- 5.495 , 0.351248620973817 , -- 5.5 , 0.678851223955433 , -- 5.505 , 0.903561274568929 , -- 5.51 , 1.000825087451 , -- 5.515 , 0.960934560706297 , -- 5.52 , 0.78992867723245 , -- 5.525 , 0.511317876998132 , -- 5.53 , 0.162760320816359 , -- 5.535 , -0.15233717951736 , -- 5.54 , -0.408210240848 , -- 5.545 , -0.62888561745421 , -- 5.55 , -0.79619865273995 , -- 5.555 , -0.90334422649211 , -- 5.56 , -0.957273231721 , -- 5.565 , -0.97632112916908 , -- 5.57 , -0.98529324126005 , -- 5.575 , -1.01088001195299 , -- 5.58 , -1.07663632540647 , -- 5.585 , -1.1964450302827 , -- 5.59 , -1.36885544627383 , -- 5.595 , -1.57548223311668 , -- 5.6 , -1.78343920945552 , -- 5.605 , -1.94998845541488 , -- 5.61 , -2.02894698358654 , -- 5.615 , -1.97893684719994 , -- 5.62 , -1.77192812280346 , -- 5.625 , -1.39963819951885 , -- 5.63 , -0.87646499571534 , -- 5.635 , -0.23861147042705 , -- 5.64 , 0.336218007155657 , -- 5.645 , 0.847327478768983 , -- 5.65 , 1.30857622082849 , -- 5.655 , 1.67664606685409 , -- 5.66 , 1.91879317489308 , -- 5.665 , 2.01692172130926 , -- 5.67 , 1.96853013034153 , -- 5.675 , 1.78510825075991 , -- 5.68 , 1.4896405295593 , -- 5.685 , 1.11350916384325 , -- 5.69 , 0.692073407024996 , -- 5.695 , 0.259804585073245 , -- 5.7 , -0.24312332096602 , -- 5.705 , -0.83740028991543 , -- 5.71 , -1.32862161402076 , -- 5.715 , -1.69669262414581 , -- 5.72 , -1.93128745142237 , -- 5.725 , -2.02921997287969 , -- 5.73 , -1.99337280480397 , -- 5.735 , -1.83373410433008 , -- 5.74 , -1.56747293050187 , -- 5.745 , -1.21724094498849 , -- 5.75 , -0.81052148648056 , -- 5.755 , -0.38038326455022 , -- 5.76 , 4.429619989889450E-02 , -- 5.765 , 0.482041333875258 , -- 5.77 , 0.827113852485307 , -- 5.775 , 1.05562255275457 , -- 5.78 , 1.15574510229285 , -- 5.785 , 1.13102185729002 , -- 5.79 , 1.00111402711585 , -- 5.795 , 0.796402227894675 , -- 5.8 , 0.550299036643284 , -- 5.805 , 0.294746376632263 , -- 5.81 , 5.779627739619110E-02 , -- 5.815 , -0.14033970324891 , -- 5.82 , -0.29057904479289 , -- 5.825 , -0.39279585396293 , -- 5.83 , -0.4494482504971 , -- 5.835 , -0.46100119177358 , -- 5.84 , -0.42521937611264 , -- 5.845 , -0.3375317644422 , -- 5.85 , -0.19158847654649 , -- 5.855 , 1.752214546441880E-02 , -- 5.86 , 0.287160001209617 , -- 5.865 , 0.602028255467961 , -- 5.87 , 0.933254236049531 , -- 5.875 , 1.24149905843902 , -- 5.88 , 1.48303299176761 , -- 5.885 , 1.61843953382086 , -- 5.89 , 1.62241665153411 , -- 5.895 , 1.49156853196882 , -- 5.9 , 1.24765942303674 , -- 5.905 , 0.935345755846739 , -- 5.91 , 0.614175990416646 , -- 5.915 , 0.345931028275661 , -- 5.92 , 0.180659960734569 , -- 5.925 , 0.145383600846828 , -- 5.93 , 0.237765412366942 , -- 5.935 , 0.425793201109318 , -- 5.94 , 0.654468234473261 , -- 5.945 , 0.858677159866798 , -- 5.95 , 0.978207334350809 , -- 5.955 , 0.970329031591707 , -- 5.96 , 0.818026030367143 , -- 5.965 , 0.533251338659083 , -- 5.97 , 0.15356868640373 , -- 5.975 , -0.26839144886352 , -- 5.98 , -0.67878215135657 , -- 5.985 , -1.03400683986537 , -- 5.99 , -1.3073585979251 , -- 5.995 , -1.49178002375022 , -- 6.0 , -1.59881218617846 , -- 6.005 , -1.65263612785215 , -- 6.01 , -1.68040775595467 , -- 6.015 , -1.70326118069031 , -- 6.02 , -1.73147514087517 , -- 6.025 , -1.76409391726272 , -- 6.03 , -1.79154678107851 , -- 6.035 , -1.80004486312369 , -- 6.04 , -1.77657113231061 , -- 6.045 , -1.71309083748955 , -- 6.05 , -1.60890845106533 , -- 6.055 , -1.47045377157793 , -- 6.06 , -1.30823176663841 , -- 6.065 , -1.13218678075657 , -- 6.07 , -0.94831725641373 , -- 6.075 , -0.7582938943429 , -- 6.08 , -0.56105916215743 , -- 6.085 , -0.35465660035081 , -- 6.09 , -0.1384716720616 , -- 6.095 , 8.181401775998960E-02 , -- 6.1 , 0.295120583821675 , -- 6.105 , 0.488813785339096 , -- 6.11 , 0.645978019217284 , -- 6.115 , 0.751956445909178 , -- 6.12 , 0.797070178696218 , -- 6.125 , 0.778938415578525 , -- 6.13 , 0.703933126539259 , -- 6.135 , 0.586193282063444 , -- 6.14 , 0.444346814137257 , -- 6.145 , 0.29825595848257 , -- 6.15 , 0.16716086262001 , -- 6.155 , 6.845201123569530E-02 , -- 6.16 , 1.638790200297000E-02 , -- 6.165 , 2.138979757918980E-02 , -- 6.17 , 9.013446340544370E-02 , -- 6.175 , 0.225364316943996 , -- 6.18 , 0.424627726925139 , -- 6.185 , 0.678666340108451 , -- 6.19 , 0.970459569802561 , -- 6.195 , 1.27533903222018 , -- 6.2 , 1.56265390764561 , -- 6.205 , 1.79967884086063 , -- 6.21 , 1.95730777614782 , -- 6.215 , 2.01568092318868 , -- 6.22 , 1.9680798901563 , -- 6.225 , 1.82260275300508 , -- 6.23 , 1.6012628707179 , -- 6.235 , 1.33584067303513 , -- 6.24 , 1.06088096670087 , -- 6.245 , 0.806020651973241 , -- 6.25 , 0.590240383625112 , -- 6.255 , 0.419170058894404 , -- 6.26 , 0.285567810216695 , -- 6.265 , 0.172882474189092 , -- 6.27 , 6.141521693570270E-02 , -- 6.275 , -4.100655746000240E-02 , -- 6.28 , -0.12748144658853 , -- 6.285 , -0.22402606929835 , -- 6.29 , -0.32266457931099 , -- 6.295 , -0.41245768954213 , -- 6.3 , -0.48300494677694 , -- 6.305 , -0.5281469572368 , -- 6.31 , -0.54867239852271 , -- 6.315 , -0.55291028225442 , -- 6.32 , -0.55498836852966 , -- 6.325 , -0.57168033795742 , -- 6.33 , -0.61890124937392 , -- 6.335 , -0.70832720330432 , -- 6.34 , -0.8444688842815 , -- 6.345 , -1.02312789012362 , -- 6.35 , -1.23201420479741 , -- 6.355 , -1.45302869056683 , -- 6.36 , -1.66483750094807 , -- 6.365 , -1.84512502578643 , -- 6.37 , -1.97287391729285 , -- 6.375 , -2.03065548439675 , -- 6.38 , -2.00620454087577 , -- 6.385 , -1.89315139172675 , -- 6.39 , -1.69175663119939 , -- 6.395 , -1.40995495579992 , -- 6.4 , -1.06376441111769 , -- 6.405 , -0.67620069765757 , -- 6.41 , -0.27510795942141 , -- 6.415 , 0.196812130002227 , -- 6.42 , 0.789662759769171 , -- 6.425 , 1.26662960840841 , -- 6.43 , 1.6072638071671 , -- 6.435 , 1.81182394487741 , -- 6.44 , 1.89972228643561 , -- 6.445 , 1.9047619217593 , -- 6.45 , 1.86751034078394 , -- 6.455 , 1.8254292028055 , -- 6.46 , 1.80357147143536 , -- 6.465 , 1.80953648503866 , -- 6.47 , 1.83384689586528 , -- 6.475 , 1.8545291406415 , -- 6.48 , 1.84468010904891 , -- 6.485 , 1.78185447755559 , -- 6.49 , 1.65634384795161 , -- 6.495 , 1.47475850013982 , -- 6.5 , 1.25778784095604 , -- 6.505 , 1.03382280148781 , -- 6.51 , 0.830377669084782 , -- 6.515 , 0.664847688813952 , -- 6.52 , 0.537441337312092 , -- 6.525 , 0.429805314578715 , -- 6.53 , 0.31046587513464 , -- 6.535 , 0.1447657890999 , -- 6.54 , -9.382243026102850E-02 , -- 6.545 , -0.41334712070585 , -- 6.55 , -0.79651775006838 , -- 6.555 , -1.20028045361043 , -- 6.56 , -1.56291508214219 , -- 6.565 , -1.81661688690887 , -- 6.57 , -1.90206035531056 , -- 6.575 , -1.7817477770441 , -- 6.58 , -1.44921463753588 , -- 6.585 , -0.93148892423534 , -- 6.59 , -0.28406148521622 , -- 6.595 , 0.323315074176515 , -- 6.6 , 0.852343584238104 , -- 6.605 , 1.31274405752464 , -- 6.61 , 1.66746511449112 , -- 6.615 , 1.89908333611956 , -- 6.62 , 2.00928735485692 , -- 6.625 , 2.01484159347826 , -- 6.63 , 1.94157792559844 , -- 6.635 , 1.81783611017065 , -- 6.64 , 1.66894503437948 , -- 6.645 , 1.51424202651612 , -- 6.65 , 1.36676756429498 , -- 6.655 , 1.23440796614096 , -- 6.66 , 1.12141683734346 , -- 6.665 , 1.03005163859298 , -- 6.67 , 0.961856012808879 , -- 6.675 , 0.917594207115419 , -- 6.68 , 0.895802572654735 , -- 6.685 , 0.891399934871178 , -- 6.69 , 0.895639060058472 , -- 6.695 , 0.897175457172006 , -- 6.7 , 0.883661601343515 , -- 6.705 , 0.844008961722013 , -- 6.71 , 0.77132601406367 , -- 6.715 , 0.665213447750178 , -- 6.72 , 0.531957875807601 , -- 6.725 , 0.382692370009228 , -- 6.73 , 0.230704777961798 , -- 6.735 , 8.848409780228460E-02 , -- 6.74 , -4.320967298403890E-02 , -- 6.745 , -0.1762892860789 , -- 6.75 , -0.28784586821218 , -- 6.755 , -0.38905860495499 , -- 6.76 , -0.49291382383649 , -- 6.765 , -0.61009214038178 , -- 6.77 , -0.74528548081034 , -- 6.775 , -0.89462751554703 , -- 6.78 , -1.04544755808821 , -- 6.785 , -1.17892732569852 , -- 6.79 , -1.27460153013389 , -- 6.795 , -1.31507899117539 , -- 6.8 , -1.28996744751844 , -- 6.805 , -1.19853880216558 , -- 6.81 , -1.0504463612584 , -- 6.815 , -0.86390673664632 , -- 6.82 , -0.66172430237656 , -- 6.825 , -0.46650461944826 , -- 6.83 , -0.29641016005237 , -- 6.835 , -0.16215486668974 , -- 6.84 , -6.552041776213589E-02 , -- 6.845 , 2.987151640449150E-04 , -- 6.85 , 4.839493719297370E-02 , -- 6.855 , 9.446598470843660E-02 , -- 6.86 , 0.152946671436979 , -- 6.865 , 0.234067255310907 , -- 6.87 , 0.342244784612781 , -- 6.875 , 0.475796904621799 , -- 6.88 , 0.627950076248601 , -- 6.885 , 0.788973056491094 , -- 6.89 , 0.948691666991149 , -- 6.895 , 1.09834384227231 , -- 6.9 , 1.23115050816982 , -- 6.905 , 1.34171557597024 , -- 6.91 , 1.42465179927775 , -- 6.915 , 1.47287601846948 , -- 6.92 , 1.47626092610496 , -- 6.925 , 1.42154296744535 , -- 6.93 , 1.29406455566583 , -- 6.935 , 1.08117541948277 , -- 6.94 , 0.776554035067551 , -- 6.945 , 0.384383520531035 , -- 6.95 , -7.294167926560280E-02 , -- 6.955 , -0.53864400514197 , -- 6.96 , -1.00153859379899 , -- 6.965 , -1.41800783516812 , -- 6.97 , -1.7468581519585 , -- 6.975 , -1.95670089086248 , -- 6.98 , -2.03182599021495 , -- 6.985 , -1.97504743961906 , -- 6.99 , -1.80676558399137 , -- 6.995 , -1.5604834986916 , -- 7.0 , -1.27576644446333 , -- 7.005 , -0.9903221748174 , -- 7.01 , -0.73330353810734 , -- 7.015 , -0.52160326879535 , -- 7.02 , -0.35985223488993 , -- 7.025 , -0.24369954400838 , -- 7.03 , -0.16525998770838 , -- 7.035 , -0.11901231195031 , -- 7.04 , -0.10598389561423 , -- 7.045 , -0.13446900972305 , -- 7.05 , -0.21699230917524 , -- 7.055 , -0.36458839091288 , -- 7.06 , -0.58005276943233 , -- 7.065 , -0.85208512054878 , -- 7.07 , -1.15259800704237 , -- 7.075 , -1.43896995914881 , -- 7.08 , -1.66118309359685 , -- 7.085 , -1.771927531099 , -- 7.09 , -1.73721975477998 , -- 7.095 , -1.54526433804976 , -- 7.1 , -1.21113953262348 , -- 7.105 , -0.7752249017621 , -- 7.11 , -0.29527299039846 , -- 7.115 , 0.173294693493191 , -- 7.12 , 0.57635137765972 , -- 7.125 , 0.862335395139578 , -- 7.13 , 1.01919271305477 , -- 7.135 , 1.06290746127159 , -- 7.14 , 1.03167712327493 , -- 7.145 , 0.975104812475545 , -- 7.15 , 0.94186991196106 , -- 7.155 , 0.968697291206275 , -- 7.16 , 1.07242991307441 , -- 7.165 , 1.24693307983413 , -- 7.17 , 1.46588613539846 , -- 7.175 , 1.69040391004537 , -- 7.18 , 1.87856926470802 , -- 7.185 , 1.9942412785979 , -- 7.19 , 2.01380495894182 , -- 7.195 , 1.93002933646123 , -- 7.2 , 1.75219708416187 , -- 7.205 , 1.50259348018555 , -- 7.21 , 1.21097997176944 , -- 7.215 , 0.908929916225265 , -- 7.22 , 0.624987318443838 , -- 7.225 , 0.380818385977012 , -- 7.23 , 0.188682790341481 , -- 7.235 , 5.054908150564660E-02 , -- 7.24 , -4.224733175465410E-02 , -- 7.245 , -0.10533217769884 , -- 7.25 , -0.15872049577028 , -- 7.255 , -0.22626933934594 , -- 7.26 , -0.32933473878503 , -- 7.265 , -0.48196141281812 , -- 7.27 , -0.68656470353389 , -- 7.275 , -0.93107691321487 , -- 7.28 , -1.18865855652987 , -- 7.285 , -1.420854392386 , -- 7.29 , -1.58410377773137 , -- 7.295 , -1.63852514448294 , -- 7.3 , -1.55725203777855 , -- 7.305 , -1.33440140393595 , -- 7.31 , -0.98961414150744 , -- 7.315 , -0.56741260276393 , -- 7.32 , -0.13082880911958 , -- 7.325 , 0.249583666745638 , -- 7.33 , 0.508940072170202 , -- 7.335 , 0.600662717049061 , -- 7.34 , 0.5059779991769 , -- 7.345 , 0.238142376340394 , -- 7.35 , -0.15979854274957 , -- 7.355 , -0.62330642360817 , -- 7.36 , -1.07861985315351 , -- 7.365 , -1.45613573961171 , -- 7.37 , -1.70221047327019 , -- 7.375 , -1.78733777799186 , -- 7.38 , -1.70935128300863 , -- 7.385 , -1.49139661468471 , -- 7.39 , -1.17576612947581 , -- 7.395 , -0.81553092872387 , -- 7.4 , -0.46579815462372 , -- 7.405 , -0.17584397718572 , -- 7.41 , 1.695055532407140E-02 , -- 7.415 , 9.080438530410280E-02 , -- 7.42 , 4.100203845188310E-02 , -- 7.425 , -0.12015714114647 , -- 7.43 , -0.36451642152235 , -- 7.435 , -0.65063615988914 , -- 7.44 , -0.92820901616803 , -- 7.445 , -1.14411024994249 , -- 7.45 , -1.2495457268474 , -- 7.455 , -1.20784941543681 , -- 7.46 , -1.00217372922289 , -- 7.465 , -0.64135799082343 , -- 7.47 , -0.16185956349448 , -- 7.475 , 0.375443341531982 , -- 7.48 , 0.893242359584305 , -- 7.485 , 1.30942170236106 , -- 7.49 , 1.55069511538195 , -- 7.495 , 1.56597687306026 , -- 7.5 , 1.33649434622083 , -- 7.505 , 0.880087983425295 , -- 7.51 , 0.248772549844589 , -- 7.515 , -0.36466467822546 , -- 7.52 , -0.91944206639744 , -- 7.525 , -1.41086648314942 , -- 7.53 , -1.78197182048109 , -- 7.535 , -1.99448021035504 , -- 7.54 , -2.03276742886028 , -- 7.545 , -1.9038540437772 , -- 7.55 , -1.63408290724591 , -- 7.555 , -1.26366851276266 , -- 7.56 , -0.84036300953546 , -- 7.565 , -0.41319072336647 , -- 7.57 , -2.695184824283270E-02 , -- 7.575 , 0.376706658165673 , -- 7.58 , 0.651108722060469 , -- 7.585 , 0.775943751253261 , -- 7.59 , 0.755597751751617 , -- 7.595 , 0.613374035034045 , -- 7.6 , 0.389100193892965 , -- 7.605 , 0.134140214335999 , -- 7.61 , -9.593512494436110E-02 , -- 7.615 , -0.25014262596395 , -- 7.62 , -0.29113724407252 , -- 7.625 , -0.20287737386171 , -- 7.63 , 5.024227092122790E-03 , -- 7.635 , 0.297903261089418 , -- 7.64 , 0.622107890736794 , -- 7.645 , 0.91558081793758 , -- 7.65 , 1.12076183929425 , -- 7.655 , 1.19700603742361 , -- 7.66 , 1.12967888152307 , -- 7.665 , 0.933743975370447 , -- 7.67 , 0.650793261469538 , -- 7.675 , 0.339973230252299 , -- 7.68 , 6.485809767286120E-02 , -- 7.685 , -0.12047151548951 , -- 7.69 , -0.18271341139574 , -- 7.695 , -0.11542038316497 , -- 7.7 , 6.117124311775080E-02 , -- 7.705 , 0.306221765396461 , -- 7.71 , 0.568625694223555 , -- 7.715 , 0.79886093305278 , -- 7.72 , 0.959184513633666 , -- 7.725 , 1.02975813458714 , -- 7.73 , 1.00975707269538 , -- 7.735 , 0.913870269761431 , -- 7.74 , 0.765608368548335 , -- 7.745 , 0.589594520216864 , -- 7.75 , 0.405299730586112 , -- 7.755 , 0.223985767660469 , -- 7.76 , 4.920974997763450E-02 , -- 7.765 , -0.11994024975627 , -- 7.77 , -0.28424112296356 , -- 7.775 , -0.43999294669787 , -- 7.78 , -0.57663798061898 , -- 7.785 , -0.67751213622858 , -- 7.79 , -0.72360079867587 , -- 7.795 , -0.69901457723046 , -- 7.8 , -0.59650776204881 , -- 7.805 , -0.42155886366402 , -- 7.81 , -0.19380300792328 , -- 7.815 , 5.489933475191600E-02 , -- 7.82 , 0.285466317840837 , -- 7.825 , 0.458377987772727 , -- 7.83 , 0.540543411689915 , -- 7.835 , 0.510857284716815 , -- 7.84 , 0.363486292918927 , -- 7.845 , 0.108336402431131 , -- 7.85 , -0.21209396424761 , -- 7.855 , -0.56957977141521 , -- 7.86 , -0.94077073678275 , -- 7.865 , -1.29262615047061 , -- 7.87 , -1.59622106208727 , -- 7.875 , -1.82918316989524 , -- 7.88 , -1.97699031089989 , -- 7.885 , -2.03327946447786 , -- 7.89 , -1.99933934346025 , -- 7.895 , -1.88300955675939 , -- 7.9 , -1.69721418310355 , -- 7.905 , -1.45829064978291 , -- 7.91 , -1.18410498022345 , -- 7.915 , -0.8919394708508 , -- 7.92 , -0.59649837620085 , -- 7.925 , -0.30856724453543 , -- 7.93 , -3.473084459177880E-02 , -- 7.935 , 0.243954038684612 , -- 7.94 , 0.505067577023267 , -- 7.945 , 0.74523171014185 , -- 7.95 , 0.961076322702563 , -- 7.955 , 1.14544017577101 , -- 7.96 , 1.28755260199966 , -- 7.965 , 1.37508301728453 , -- 7.97 , 1.39752728794968 , -- 7.975 , 1.35018389601987 , -- 7.98 , 1.23776787698572 , -- 7.985 , 1.07653932806098 , -- 7.99 , 0.893865005632781 , -- 7.995 , 0.724806073674302 , -- 8.0 , 0.606180934525952 , -- 8.005 , 0.569233587341791 , -- 8.01 , 0.632383043958699 , -- 8.015 , 0.795725327814524 , -- 8.02 , 1.03874194319127 , -- 8.025 , 1.32196705023762 , -- 8.03 , 1.59246805399968 , -- 8.035 , 1.79229440498998 , -- 8.04 , 1.86849022149291 , -- 8.045 , 1.78281948278322 , -- 8.05 , 1.51926230063055 , -- 8.055 , 1.08785213984058 , -- 8.06 , 0.524349594247236 , -- 8.065 , -0.1140897577962 , -- 8.07 , -0.75657207669552 , -- 8.075 , -1.32834364834345 , -- 8.08 , -1.76124306233852 , -- 8.085 , -2.00310207974856 , -- 8.09 , -2.02480910234302 , -- 8.095 , -1.82430118945956 , -- 8.1 , -1.42701906953591 , -- 8.105 , -0.88275056011672 , -- 8.11 , -0.25930710346958 , -- 8.115 , 0.36611395388268 , -- 8.12 , 0.916779579720004 , -- 8.125 , 1.32634332320688 , -- 8.13 , 1.54748990874522 , -- 8.135 , 1.55804957216978 , -- 8.14 , 1.36358979345776 , -- 8.145 , 0.996118542284482 , -- 8.15 , 0.509028622424576 , -- 8.155 , -3.108833671467930E-02 , -- 8.16 , -0.55458355458891 , -- 8.165 , -0.9992113406596 , -- 8.17 , -1.31909921378195 , -- 8.175 , -1.4907344205054 , -- 8.18 , -1.51500626604052 , -- 8.185 , -1.41506172917135 , -- 8.19 , -1.23045719608832 , -- 8.195 , -1.00875563741852 , -- 8.2 , -0.79618535909745 , -- 8.205 , -0.62910374181022 , -- 8.21 , -0.52781524086439 , -- 8.215 , -0.49375763302869 , -- 8.22 , -0.51036868088539 , -- 8.225 , -0.54721127046085 , -- 8.23 , -0.56640455149806 , -- 8.235 , -0.5300607346312 , -- 8.24 , -0.40739746710395 , -- 8.245 , -0.18031656379607 , -- 8.25 , 9.909295562647380E-02 , -- 8.255 , 0.384178096593259 , -- 8.26 , 0.711568797471058 , -- 8.265 , 1.05465985685733 , -- 8.27 , 1.38307322715161 , -- 8.275 , 1.66640133480447 , -- 8.28 , 1.87778042356214 , -- 8.285 , 1.99690726227749 , -- 8.29 , 2.01218574892656 , -- 8.295 , 1.9218468256107 , -- 8.3 , 1.73397654400921 , -- 8.305 , 1.4654715893691 , -- 8.31 , 1.14002097734659 , -- 8.315 , 0.785289540807961 , -- 8.32 , 0.429654714191936 , -- 8.325 , 9.887434390542030E-02 , -- 8.33 , -0.27373446466779 , -- 8.335 , -0.61453278823147 , -- 8.34 , -0.86361514651737 , -- 8.345 , -1.02764207046752 , -- 8.35 , -1.12312770730449 , -- 8.355 , -1.17242345160079 , -- 8.36 , -1.19890949112902 , -- 8.365 , -1.22231476786338 , -- 8.37 , -1.25506074091502 , -- 8.375 , -1.30037291926648 , -- 8.38 , -1.35246560106362 , -- 8.385 , -1.39867274893801 , -- 8.39 , -1.42300013455657 , -- 8.395 , -1.41027137760835 , -- 8.4 , -1.34988412628361 , -- 8.405 , -1.23833354826905 , -- 8.41 , -1.08003474781669 , -- 8.415 , -0.8863811686465 , -- 8.42 , -0.67334691448991 , -- 8.425 , -0.45824149658395 , -- 8.43 , -0.25648271091485 , -- 8.435 , -7.919497664086800E-02 , -- 8.44 , 6.790702566583660E-02 , -- 8.445 , 0.184336104551994 , -- 8.45 , 0.273607496426052 , -- 8.455 , 0.341427765954767 , -- 8.46 , 0.393859568348449 , -- 8.465 , 0.436054008314734 , -- 8.47 , 0.471822329873715 , -- 8.475 , 0.503940686983312 , -- 8.48 , 0.534766790770446 , -- 8.485 , 0.566720547413461 , -- 8.49 , 0.602204083610117 , -- 8.495 , 0.642759211345947 , -- 8.5 , 0.687546596661957 , -- 8.505 , 0.73161370540631 , -- 8.51 , 0.764633590722345 , -- 8.515 , 0.770779801924118 , -- 8.52 , 0.730226474533298 , -- 8.525 , 0.622364880535585 , -- 8.53 , 0.430299195926097 , -- 8.535 , 0.145690142921501 , -- 8.54 , -0.1875029917819 , -- 8.545 , -0.54835468448798 , -- 8.55 , -0.93829077724458 , -- 8.555 , -1.32093112448324 , -- 8.56 , -1.65568314187632 , -- 8.565 , -1.90374313930578 , -- 8.57 , -2.03414217931564 , -- 8.575 , -2.02871594615485 , -- 8.58 , -1.88502979034511 , -- 8.585 , -1.61666670363564 , -- 8.59 , -1.25090542907548 , -- 8.595 , -0.82439719072454 , -- 8.6 , -0.3777961843308 , -- 8.605 , 5.997342456618780E-02 , -- 8.61 , 0.498580351025926 , -- 8.615 , 0.848666797179574 , -- 8.62 , 1.09518857615416 , -- 8.625 , 1.23554791479412 , -- 8.63 , 1.2781763580922 , -- 8.635 , 1.2403900007702 , -- 8.64 , 1.14586627728766 , -- 8.645 , 1.02207806372073 , -- 8.65 , 0.897804023904626 , -- 8.655 , 0.800618191332478 , -- 8.66 , 0.754133205007585 , -- 8.665 , 0.775081318262375 , -- 8.67 , 0.87060821275674 , -- 8.675 , 1.03627950859147 , -- 8.68 , 1.25531150972849 , -- 8.685 , 1.49959206680695 , -- 8.69 , 1.73283203030496 , -- 8.695 , 1.91564235877547 , -- 8.7 , 2.01171708813146 , -- 8.705 , 1.99404478322172 , -- 8.71 , 1.85004122617725 , -- 8.715 , 1.5844790314963 , -- 8.72 , 1.21937543098226 , -- 8.725 , 0.790685383472318 , -- 8.73 , 0.34253999395618 , -- 8.735 , -8.315108890721259E-02 , -- 8.74 , -0.45782997432698 , -- 8.745 , -0.73560630397696 , -- 8.75 , -0.90358121095544 , -- 8.755 , -0.96494822819405 , -- 8.76 , -0.93630744097796 , -- 8.765 , -0.84299937779174 , -- 8.77 , -0.71350666162014 , -- 8.775 , -0.57402043454602 , -- 8.78 , -0.44427168990607 , -- 8.785 , -0.33542713208977 , -- 8.79 , -0.2501116833682 , -- 8.795 , -0.18401361018569 , -- 8.8 , -0.12842784460002 , -- 8.805 , -7.314603730146210E-02 , -- 8.81 , -9.074234322190291E-03 , -- 8.815 , 7.000693452309770E-02 , -- 8.82 , 0.166710878734688 , -- 8.825 , 0.280110709519932 , -- 8.83 , 0.406273894637497 , -- 8.835 , 0.539123020255816 , -- 8.84 , 0.671480131538164 , -- 8.845 , 0.796107038123461 , -- 8.85 , 0.906615981394394 , -- 8.855 , 0.998324490593576 , -- 8.86 , 1.0690620538107 , -- 8.865 , 1.11975528767815 , -- 8.87 , 1.15453246345251 , -- 8.875 , 1.18023682665442 , -- 8.88 , 1.20532586633037 , -- 8.885 , 1.23820591293966 , -- 8.89 , 1.28520280175297 , -- 8.895 , 1.3486570631952 , -- 8.9 , 1.42571219461991 , -- 8.905 , 1.50820033663049 , -- 8.91 , 1.58374708347145 , -- 8.915 , 1.63800541668437 , -- 8.92 , 1.65764589236558 , -- 8.925 , 1.63341505537543 , -- 8.93 , 1.5624359419512 , -- 8.935 , 1.44906883520367 , -- 8.94 , 1.30406714173948 , -- 8.945 , 1.14214506133789 , -- 8.95 , 0.97845385721763 , -- 8.955 , 0.824773099970328 , -- 8.96 , 0.686415293227468 , -- 8.965 , 0.560675032421674 , -- 8.97 , 0.437346493634863 , -- 8.975 , 0.301223152764708 , -- 8.98 , 0.136102516376474 , -- 8.985 , -7.065849555314389E-02 , -- 8.99 , -0.32407738413447 , -- 8.995 , -0.61898581453294 , -- 9.0 , -0.93960037368359 , -- 9.005 , -1.26143943272218 , -- 9.01 , -1.55516650644025 , -- 9.015 , -1.79156612412015 , -- 9.02 , -1.94652674681638 , -- 9.025 , -2.00503791616427 , -- 9.03 , -1.96340298656283 , -- 9.035 , -1.82929859570769 , -- 9.04 , -1.61975611512981 , -- 9.045 , -1.35763976380722 , -- 9.05 , -1.06749188919142 , -- 9.055 , -0.77165747380896 , -- 9.06 , -0.48743715471134 , -- 9.065 , -0.22573691716227 , -- 9.07 , 8.680561556133970E-03 , -- 9.075 , 0.215640087376458 , -- 9.08 , 0.397259171267499 , -- 9.085 , 0.555581085303924 , -- 9.09 , 0.690729679309828 , -- 9.095 , 0.800029757983254 , -- 9.1 , 0.878247351202657 , -- 9.105 , 0.91878759810445 , -- 9.11 , 0.915444383097841 , -- 9.115 , 0.864214490635585 , -- 9.12 , 0.76472553582975 , -- 9.125 , 0.620899809131162 , -- 9.13 , 0.440670714935382 , -- 9.135 , 0.234785445409552 , -- 9.14 , 1.501866477042620E-02 , -- 9.145 , -0.16256660035877 , -- 9.15 , -0.33008216119127 , -- 9.155 , -0.49037224168296 , -- 9.16 , -0.64324845085619 , -- 9.165 , -0.79113983805113 , -- 9.17 , -0.93796449486453 , -- 9.175 , -1.0876496844508 , -- 9.18 , -1.24257624122444 , -- 9.185 , -1.40228132491324 , -- 9.19 , -1.56269378306469 , -- 9.195 , -1.71610185022193 , -- 9.2 , -1.85187081485719 , -- 9.205 , -1.95781829391389 , -- 9.21 , -2.02202032577224 , -- 9.215 , -2.03476784125131 , -- 9.22 , -1.99032018745331 , -- 9.225 , -1.88813289198619 , -- 9.23 , -1.73333557866961 , -- 9.235 , -1.53634649422576 , -- 9.24 , -1.31166062827625 , -- 9.245 , -1.075970419663 , -- 9.25 , -0.84593818781158 , -- 9.255 , -0.63597140868637 , -- 9.26 , -0.4563931782957 , -- 9.265 , -0.31231411198407 , -- 9.27 , -0.20343660584305 , -- 9.275 , -0.12481923225902 , -- 9.28 , -6.848370877973950E-02 , -- 9.285 , -2.555427519972480E-02 , -- 9.29 , 1.844706127350420E-02 , -- 9.295 , 6.430221576072399E-02 , -- 9.3 , 0.10743778394149 , -- 9.305 , 0.141299341041405 , -- 9.31 , 0.154447624403715 , -- 9.315 , 0.133048252401135 , -- 9.32 , 6.418690106369780E-02 , -- 9.325 , -6.064647417949840E-02 , -- 9.33 , -0.24265292279827 , -- 9.335 , -0.47405842905361 , -- 9.34 , -0.73810449789487 , -- 9.345 , -1.0108148464089 , -- 9.35 , -1.26431984266432 , -- 9.355 , -1.47118757622947 , -- 9.36 , -1.60894844812626 , -- 9.365 , -1.66394726283033 , -- 9.37 , -1.63377593114862 , -- 9.375 , -1.52779564631775 , -- 9.38 , -1.36560192630373 , -- 9.385 , -1.17367488772945 , -- 9.39 , -0.98085465048613 , -- 9.395 , -0.81346133563023 , -- 9.4 , -0.6909389063025 , -- 9.405 , -0.62276084953816 , -- 9.41 , -0.607149409463 , -- 9.415 , -0.63177724383888 , -- 9.42 , -0.67625991576389 , -- 9.425 , -0.71589163373072 , -- 9.43 , -0.72595664968346 , -- 9.435 , -0.68589387170155 , -- 9.44 , -0.58268627289106 , -- 9.445 , -0.412930213848 , -- 9.45 , -0.18338626940602 , -- 9.455 , 8.998844390524470E-02 , -- 9.46 , 0.384209486902062 , -- 9.465 , 0.672301526951598 , -- 9.47 , 0.926752158620487 , -- 9.475 , 1.12295373373336 , -- 9.48 , 1.24217806572443 , -- 9.485 , 1.27378905610875 , -- 9.49 , 1.21646747255966 , -- 9.495 , 1.07838936456105 , -- 9.5 , 0.876298148043991 , -- 9.505 , 0.633562127434793 , -- 9.51 , 0.377406516734523 , -- 9.515 , 0.135641869430563 , -- 9.52 , -6.672476216219871E-02 , -- 9.525 , -0.21056458019019 , -- 9.53 , -0.28496091918619 , -- 9.535 , -0.28841969553759 , -- 9.54 , -0.2287139810782 , -- 9.545 , -0.12132500570029 , -- 9.55 , 7.625888610971770E-03 , -- 9.555 , 0.116222883261377 , -- 9.56 , 0.213774951165706 , -- 9.565 , 0.289397517200485 , -- 9.57 , 0.338281477903747 , -- 9.575 , 0.362345137379695 , -- 9.58 , 0.369650428641696 , -- 9.585 , 0.372716892921114 , -- 9.59 , 0.386055603509022 , -- 9.595 , 0.423398634616031 , -- 9.6 , 0.495129281552051 , -- 9.605 , 0.60639781396735 , -- 9.61 , 0.756225797586165 , -- 9.615 , 0.937731164545477 , -- 9.62 , 1.13931299682061 , -- 9.625 , 1.34651259505288 , -- 9.63 , 1.54413547032879 , -- 9.635 , 1.71824818793864 , -- 9.64 , 1.85768676819293 , -- 9.645 , 1.95489941817505 , -- 9.65 , 2.00610002856624 , -- 9.655 , 2.01090936461916 , -- 9.66 , 1.97169865125757 , -- 9.665 , 1.89287748522473 , -- 9.67 , 1.78030387269109 , -- 9.675 , 1.64090911938383 , -- 9.68 , 1.48250660526215 , -- 9.685 , 1.31363233674109 , -- 9.69 , 1.14327915207579 , -- 9.695 , 0.980390644995991 , -- 9.7 , 0.833122502994828 , -- 9.705 , 0.707943691566063 , -- 9.71 , 0.608782533951479 , -- 9.715 , 0.536448337875884 , -- 9.72 , 0.488573445463521 , -- 9.725 , 0.46016643878741 , -- 9.73 , 0.444740766028055 , -- 9.735 , 0.435798656192539 , -- 9.74 , 0.428373605655483 , -- 9.745 , 0.420256963476142 , -- 9.75 , 0.412594868385096 , -- 9.755 , 0.409674164332935 , -- 9.76 , 0.417930829751558 , -- 9.765 , 0.444371250852317 , -- 9.77 , 0.494775704856077 , -- 9.775 , 0.572057120950962 , -- 9.78 , 0.675155981128035 , -- 9.785 , 0.798679222993941 , -- 9.79 , 0.933324321352313 , -- 9.795 , 1.06694698775423 , -- 9.8 , 1.18603236012388 , -- 9.805 , 1.27724967196587 , -- 9.81 , 1.32882747232424 , -- 9.815 , 1.33155990686688 , -- 9.82 , 1.27942417786924 , -- 9.825 , 1.16984949079063 , -- 9.83 , 1.00375336219652 , -- 9.835 , 0.78541101181126 , -- 9.84 , 0.522229879372249 , -- 9.845 , 0.224363288427596 , -- 9.85 , -7.544298823405959E-02 , -- 9.855 , -0.32414911077947 , -- 9.86 , -0.56925067043303 , -- 9.865 , -0.80153173249929 , -- 9.87 , -1.01385881998571 , -- 9.875 , -1.20197758458175 , -- 9.88 , -1.36481009682394 , -- 9.885 , -1.50413197543959 , -- 9.89 , -1.62360229940215 , -- 9.895 , -1.72737604935286 , -- 9.9 , -1.81858556613035 , -- 9.905 , -1.89811306323292 , -- 9.91 , -1.96399286416952 , -- 9.915 , -2.01169321437822 , -- 9.92 , -2.03524420540911 , -- 9.925 , -2.02897089319518 , -- 9.93 , -1.9893635845244 , -- 9.935 , -1.91657784009958 , -- 9.94 , -1.81508296294018 , -- 9.945 , -1.69320466339342 , -- 9.95 , -1.56159803137893 , -- 9.955 , -1.4309899156992 , -- 9.96 , -1.309755744458 , -- 9.965 , -1.20194945689331 , -- 9.97 , -1.10635858004562 , -- 9.975 , -1.01686709903203 , -- 9.98 , -0.92410491644605 , -- 9.985 , -0.81798616411117 , -- 9.99 , -0.69053338279253 , -- 9.995 , -0.53828091954851 , -- 10.0 , -0.36368359344091 , -- 10.005 , -0.17516204935777 , -- 10.01 , 3.283892190983560E-02 , -- 10.015 , 0.330694200317556 , -- 10.02 , 0.577629318788318 , -- 10.025 , 0.752762239562344 , -- 10.03 , 0.843359973197779 , -- 10.035 , 0.846296788144704 , -- 10.04 , 0.767736310318568 , -- 10.045 , 0.621457280597053 , -- 10.05 , 0.426437216065522 , -- 10.055 , 0.204358996732675 , -- 10.06 , -2.248438925201870E-02 , -- 10.065 , -0.23266656596899 , -- 10.07 , -0.40662586629101 , -- 10.075 , -0.52750200085185 , -- 10.08 , -0.58215648669077 , -- 10.085 , -0.56248497246021 , -- 10.09 , -0.4669190429802 , -- 10.095 , -0.30169803576621 , -- 10.1 , -8.141467321068210E-02 , -- 10.105 , 0.171736188042055 , -- 10.11 , 0.430255910671489 , -- 10.115 , 0.665052841920839 , -- 10.12 , 0.849933032813423 , -- 10.125 , 0.965995866692921 , -- 10.13 , 1.00493830188015 , -- 10.135 , 0.970469370709915 , -- 10.14 , 0.877402798238989 , -- 10.145 , 0.748601808713132 , -- 10.15 , 0.610481808617733 , -- 10.155 , 0.488130421487012 , -- 10.16 , 0.401133125757128 , -- 10.165 , 0.360990723458034 , -- 10.17 , 0.370538085006636 , -- 10.175 , 0.425250483406994 , -- 10.18 , 0.515772332268937 , -- 10.185 , 0.630771503752903 , -- 10.19 , 0.759255763887151 , -- 10.195 , 0.891778215264391 , -- 10.2 , 1.02038573505463 , -- 10.205 , 1.13765165967161 , -- 10.21 , 1.2354498601353 , -- 10.215 , 1.30423925529986 , -- 10.22 , 1.3333818353705 , -- 10.225 , 1.31262109496076 , -- 10.23 , 1.23439607687214 , -- 10.235 , 1.09630588839482 , -- 10.24 , 0.902881246184685 , -- 10.245 , 0.665930257015006 , -- 10.25 , 0.403145595569434 , -- 10.255 , 0.135167464543167 , -- 10.26 , -0.1181889683435 , -- 10.265 , -0.34158112353947 , -- 10.27 , -0.5266606974231 , -- 10.275 , -0.67279436439978 , -- 10.28 , -0.78577175818034 , -- 10.285 , -0.87491503414711 , -- 10.29 , -0.94943871678613 , -- 10.295 , -1.01514749755514 , -- 10.3 , -1.07240552249575 , -- 10.305 , -1.1159454664886 , -- 10.31 , -1.13652214942974 , -- 10.315 , -1.12387719989209 , -- 10.32 , -1.07009467236169 , -- 10.325 , -0.9723415710773 , -- 10.33 , -0.83421714797159 , -- 10.335 , -0.66537603566363 , -- 10.34 , -0.47961924019497 , -- 10.345 , -0.29207437055768 , -- 10.35 , -0.11633661841191 , -- 10.355 , 3.762456752764130E-02 , -- 10.36 , 0.164274796553055 , -- 10.365 , 0.262005149857291 , -- 10.37 , 0.331666422264028 , -- 10.375 , 0.374819782001995 , -- 10.38 , 0.392377294442122 , -- 10.385 , 0.384141260826285 , -- 10.39 , 0.34936414194296 , -- 10.395 , 0.288052561776111 , -- 10.4 , 0.20242178785536 , -- 10.405 , 9.785306567479871E-02 , -- 10.41 , -1.713557520971730E-02 , -- 10.415 , -0.13204374310037 , -- 10.42 , -0.23639873810073 , -- 10.425 , -0.32201635263159 , -- 10.43 , -0.38475152712529 , -- 10.435 , -0.4251245384254 , -- 10.44 , -0.44753546126283 , -- 10.445 , -0.45825628870499 , -- 10.45 , -0.46279334754373 , -- 10.455 , -0.46346276944743 , -- 10.46 , -0.45799981189361 , -- 10.465 , -0.43972280992741 , -- 10.47 , -0.39929302861398 , -- 10.475 , -0.32758719542718 , -- 10.48 , -0.21885278786041 , -- 10.485 , -7.315503161217039E-02 , -- 10.49 , 0.102651407152514 , -- 10.495 , 0.295816563735959 , -- 10.5 , 0.490226934148564 , -- 10.505 , 0.669891810457828 , -- 10.51 , 0.82237594525252 , -- 10.515 , 0.941216017829958 , -- 10.52 , 1.02661998674533 , -- 10.525 , 1.08430529858058 , -- 10.53 , 1.12286636573309 , -- 10.535 , 1.15051988582967 , -- 10.54 , 1.17222128266484 , -- 10.545 , 1.18801420247095 , -- 10.55 , 1.19307665922947 , -- 10.555 , 1.17938295001738 , -- 10.56 , 1.13840303313913 , -- 10.565 , 1.06394181580147 , -- 10.57 , 0.95422952397942 , -- 10.575 , 0.812611611237298 , -- 10.58 , 0.646677789199809 , -- 10.585 , 0.466152014272008 , -- 10.59 , 0.280289725059773 , -- 10.595 , 9.565146176778430E-02 , -- 10.6 , -8.499446193837400E-02 , -- 10.605 , -0.26230216706899 , -- 10.61 , -0.4386137767682 , -- 10.615 , -0.6154630451662 , -- 10.62 , -0.79113786663093 , -- 10.625 , -0.9591661750224 , -- 10.63 , -1.10826769502301 , -- 10.635 , -1.22391556601366 , -- 10.64 , -1.29112533315649 , -- 10.645 , -1.29775475114347 , -- 10.65 , -1.23742365152054 , -- 10.655 , -1.11129656465532 , -- 10.66 , -0.9282894842173 , -- 10.665 , -0.70371663339333 , -- 10.67 , -0.45680011277455 , -- 10.675 , -0.20771128037236 , -- 10.68 , 2.512459612945220E-02 , -- 10.685 , 0.226918245807304 , -- 10.69 , 0.387350552286146 , -- 10.695 , 0.500473670939197 , -- 10.7 , 0.564029266358019 , -- 10.705 , 0.578637288901258 , -- 10.71 , 0.547211894628189 , -- 10.715 , 0.474757060973486 , -- 10.72 , 0.368436624005821 , -- 10.725 , 0.237615830995378 , -- 10.73 , 9.352792827951401E-02 , -- 10.735 , -5.167273774008210E-02 , -- 10.74 , -0.18646809540466 , -- 10.745 , -0.30187135567744 , -- 10.75 , -0.39316916542135 , -- 10.755 , -0.46096802891446 , -- 10.76 , -0.51111268636195 , -- 10.765 , -0.55334646668629 , -- 10.77 , -0.59891300067983 , -- 10.775 , -0.65764678122702 , -- 10.78 , -0.73525453842381 , -- 10.785 , -0.83150017185443 , -- 10.79 , -0.93976747420304 , -- 10.795 , -1.04812248595262 , -- 10.8 , -1.14160318244191 , -- 10.805 , -1.2051488991501 , -- 10.81 , -1.22646384585139 , -- 10.815 , -1.19814339245798 , -- 10.82 , -1.11865520710004 , -- 10.825 , -0.9920714349609 , -- 10.83 , -0.82681485385664 , -- 10.835 , -0.63386505629908 , -- 10.84 , -0.42496268277971 , -- 10.845 , -0.21119376102165 , -- 10.85 , -2.191019852703480E-03 , -- 10.855 , 0.194127641793734 , -- 10.86 , 0.371466018382975 , -- 10.865 , 0.525035130835761 , -- 10.87 , 0.651602813791636 , -- 10.875 , 0.749803994860723 , -- 10.88 , 0.820544481310922 , -- 10.885 , 0.867273287648818 , -- 10.89 , 0.895807866624117 , -- 10.895 , 0.913572593095597 , -- 10.9 , 0.928236729298366 , -- 10.905 , 0.946014350836689 , -- 10.91 , 0.970040868532415 , -- 10.915 , 0.999311930164329 , -- 10.92 , 1.02854682988849 , -- 10.925 , 1.04913139979 , -- 10.93 , 1.05098941441043 , -- 10.935 , 1.02499491482512 , -- 10.94 , 0.965351048328359 , -- 10.945 , 0.871370473531725 , -- 10.95 , 0.748233229517312 , -- 10.955 , 0.606563895886194 , -- 10.96 , 0.460955473292802 , -- 10.965 , 0.327805324612049 , -- 10.97 , 0.222950093923078 , -- 10.975 , 0.159562148201255 , -- 10.98 , 0.146631988185719 , -- 10.985 , 0.188170103964573 , -- 10.99 , 0.283066815855546 , -- 10.995 , 0.425428418732869 , -- 11.0 , 0.605185596503197 , -- 11.005 , 0.808842841129001 , -- 11.01 , 1.0203252588096 , -- 11.015 , 1.22200011907392 , -- 11.02 , 1.39594474367148 , -- 11.025 , 1.52549944650203 , -- 11.03 , 1.59700049844879 , -- 11.035 , 1.60145576944865 , -- 11.04 , 1.53581761942562 , -- 11.045 , 1.4034930323483 , -- 11.05 , 1.2138831423925 , -- 11.055 , 0.980912371026411 , -- 11.06 , 0.720812505576093 , -- 11.065 , 0.449601892036102 , -- 11.07 , 0.180857582628542 , -- 11.075 , -7.573381698891210E-02 , -- 11.08 , -0.31470812975405 , -- 11.085 , -0.53405962087938 , -- 11.09 , -0.73364261678681 , -- 11.095 , -0.91330540113887 , -- 11.1 , -1.07132417643687 , -- 11.105 , -1.20365312210336 , -- 11.11 , -1.30419832213249 , -- 11.115 , -1.36604239161232 , -- 11.12 , -1.38321880818252 , -- 11.125 , -1.35249870150789 , -- 11.13 , -1.27462783831177 , -- 11.135 , -1.15465182792767 , -- 11.14 , -1.00123343402233 , -- 11.145 , -0.82518952456788 , -- 11.15 , -0.63769529339716 , -- 11.155 , -0.44866816516864 , -- 11.16 , -0.26576203055682 , -- 11.165 , -9.416463454136630E-02 , -- 11.17 , 6.287575092606090E-02 , -- 11.175 , 0.203141505865471 , -- 11.18 , 0.324579712695666 , -- 11.185 , 0.424889751727608 , -- 11.19 , 0.501750804315283 , -- 11.195 , 0.5536421159011 , -- 11.2 , 0.580921794960766 , -- 11.205 , 0.586704260853481 , -- 11.21 , 0.5770850470881 , -- 11.215 , 0.560449668733132 , -- 11.22 , 0.545887300846328 , -- 11.225 , 0.541047479949923 , -- 11.23 , 0.549990662947013 , -- 11.235 , 0.571663114185204 , -- 11.24 , 0.599500251771258 , -- 11.245 , 0.62236878054162 , -- 11.25 , 0.626713322562836 , -- 11.255 , 0.599434772191117 , -- 11.26 , 0.530838614269415 , -- 11.265 , 0.416951659398843 , -- 11.27 , 0.26068866151549 , -- 11.275 , 7.163385796821510E-02 , -- 11.28 , -0.13542954911164 , -- 11.285 , -0.34285006284799 , -- 11.29 , -0.53271798082564 , -- 11.295 , -0.68922055953639 , -- 11.3 , -0.80031992822441 , -- 11.305 , -0.85859556643174 , -- 11.31 , -0.86132208764303 , -- 11.315 , -0.81002406922002 , -- 11.32 , -0.70979684966059 , -- 11.325 , -0.56862676261062 , -- 11.33 , -0.39681435075012 , -- 11.335 , -0.20645292887016 , -- 11.34 , -1.082875708200500E-02 , -- 11.345 , 0.176412752549899 , -- 11.35 , 0.342376371445806 , -- 11.355 , 0.476235796330172 , -- 11.36 , 0.570527791788077 , -- 11.365 , 0.622137109693916 , -- 11.37 , 0.632674434445817 , -- 11.375 , 0.608089217990313 , -- 11.38 , 0.557537864431003 , -- 11.385 , 0.491727720373806 , -- 11.39 , 0.421100488617183 , -- 11.395 , 0.35424883871057 , -- 11.4 , 0.296898598214297 , -- 11.405 , 0.251615782949777 , -- 11.41 , 0.218205567537362 , -- 11.415 , 0.194575186033259 , -- 11.42 , 0.177750889222743 , -- 11.425 , 0.164739545969125 , -- 11.43 , 0.153046754059915 , -- 11.435 , 0.140795993214209 , -- 11.44 , 0.12656443411951 , -- 11.445 , 0.109119048772985 , -- 11.45 , 8.726746617413900E-02 , -- 11.455 , 5.991980120903190E-02 , -- 11.46 , 2.635460927914640E-02 , -- 11.465 , -1.345275150280380E-02 , -- 11.47 , -5.863610709200840E-02 , -- 11.475 , -0.10755044102404 , -- 11.48 , -0.15824658177879 , -- 11.485 , -0.20921212071436 , -- 11.49 , -0.26013226175091 , -- 11.495 , -0.31237245530863 , -- 11.5 , -0.36890715351072 , -- 11.505 , -0.43358437734804 , -- 11.51 , -0.50981957766845 , -- 11.515 , -0.59903776556946 , -- 11.52 , -0.69931194037806 , -- 11.525 , -0.80465691443919 , -- 11.53 , -0.90529166691289 , -- 11.535 , -0.98894889157901 , -- 11.54 , -1.0430005689334 , -- 11.545 , -1.05693388169808 , -- 11.55 , -1.0245796623575 , -- 11.555 , -0.94554374723514 , -- 11.56 , -0.82548253167239 , -- 11.565 , -0.67515951222416 , -- 11.57 , -0.50853411181021 , -- 11.575 , -0.34035152824456 , -- 11.58 , -0.18380744340702 , -- 11.585 , -4.877605466847740E-02 , -- 11.59 , 5.909608053637810E-02 , -- 11.595 , 0.138405652647701 , -- 11.6 , 0.191311518017365 , -- 11.605 , 0.222508949979136 , -- 11.61 , 0.238194003082017 , -- 11.615 , 0.245269919971124 , -- 11.62 , 0.250838712250952 , -- 11.625 , 0.261870016704265 , -- 11.63 , 0.284836510438269 , -- 11.635 , 0.325131372886616 , -- 11.64 , 0.386198740355232 , -- 11.645 , 0.468513501462264 , -- 11.65 , 0.568696341674455 , -- 11.655 , 0.679148315040223 , -- 11.66 , 0.788508513966795 , -- 11.665 , 0.883056182933764 , -- 11.67 , 0.948906416298242 , -- 11.675 , 0.974570797520427 , -- 11.68 , 0.953277599477234 , -- 11.685 , 0.884438058167201 , -- 11.69 , 0.77382364723826 , -- 11.695 , 0.632334566850428 , -- 11.7 , 0.473622939615698 , -- 11.705 , 0.311143111887763 , -- 11.71 , 0.15539149490874 , -- 11.715 , 1.204008787083370E-02 , -- 11.72 , -0.1185541756946 , -- 11.725 , -0.24038836981401 , -- 11.73 , -0.35969118541412 , -- 11.735 , -0.48228327823872 , -- 11.74 , -0.61114632720659 , -- 11.745 , -0.74488165421895 , -- 11.75 , -0.87742903375438 , -- 11.755 , -0.9990735442117 , -- 11.76 , -1.09838127444184 , -- 11.765 , -1.16449496867241 , -- 11.77 , -1.18914405096313 , -- 11.775 , -1.1678940579368 , -- 11.78 , -1.10040933370095 , -- 11.785 , -0.98984205208497 , -- 11.79 , -0.8417105178341 , -- 11.795 , -0.66273801588279 , -- 11.8 , -0.46007426875265 , -- 11.805 , -0.24109784101173 , -- 11.81 , -1.376424841735200E-02 , -- 11.815 , 0.212820798236347 , -- 11.82 , 0.428004774853851 , -- 11.825 , 0.61976809620263 , -- 11.83 , 0.775664732827253 , -- 11.835 , 0.884459785072971 , -- 11.84 , 0.938105319486098 , -- 11.845 , 0.933533376809836 , -- 11.85 , 0.873720830366818 , -- 11.855 , 0.767639484838718 , -- 11.86 , 0.628977669852066 , -- 11.865 , 0.4738539721813 , -- 11.87 , 0.31801589351757 , -- 11.875 , 0.174157204161953 , -- 11.88 , 4.995725310342680E-02 , -- 11.885 , -5.275216941488590E-02 , -- 11.89 , -0.13756423084181 , -- 11.895 , -0.2120196831066 , -- 11.9 , -0.28548456301669 , -- 11.905 , -0.36691840941378 , -- 11.91 , -0.46300320666114 , -- 11.915 , -0.57696070561373 , -- 11.92 , -0.70814553643099 , -- 11.925 , -0.85232717509853 , -- 11.93 , -1.00241060096662 , -- 11.935 , -1.14936568830572 , -- 11.94 , -1.28315120023664 , -- 11.945 , -1.39356260774938 , -- 11.95 , -1.47101607033074 , -- 11.955 , -1.5073448490242 , -- 11.96 , -1.4966490584904 , -- 11.965 , -1.43616086274327 , -- 11.97 , -1.32698077186283 , -- 11.975 , -1.17446433758603 , -- 11.98 , -0.98804059864846 , -- 11.985 , -0.78032474331784 , -- 11.99 , -0.56556840849598 , -- 11.995 , -0.35765933543277 , -- 12.0 , -0.16807550799874 , -- 12.005 , -4.227255766186140E-03 , -- 12.01 , 0.131383604645629 , -- 12.015 , 0.240987503608671 , -- 12.02 , 0.330348730788584 , -- 12.025 , 0.406826008170448 , -- 12.03 , 0.477144240124697 , -- 12.035 , 0.545422501700242 , -- 12.04 , 0.611915404843405 , -- 12.045 , 0.672755857445556 , -- 12.05 , 0.720723072194553 , -- 12.055 , 0.746832365003761 , -- 12.06 , 0.742346946489963 , -- 12.065 , 0.700760339032901 , -- 12.07 , 0.619339003519911 , -- 12.075 , 0.499959785870592 , -- 12.08 , 0.349159304278182 , -- 12.085 , 0.177470223182518 , -- 12.09 , -1.753350545225190E-03 , -- 12.095 , -0.17379950342875 , -- 12.1 , -0.32413511149758 , -- 12.105 , -0.43987021437218 , -- 12.11 , -0.51104917071923 , -- 12.115 , -0.53171143244092 , -- 12.12 , -0.50064639271511 , -- 12.125 , -0.42174741533336 , -- 12.13 , -0.30385287601246 , -- 12.135 , -0.1599770009419 , -- 12.14 , -5.916472086063350E-03 , -- 12.145 , 0.141672124157728 , -- 12.15 , 0.267467136745314 , -- 12.155 , 0.359599717485464 , -- 12.16 , 0.411271872916484 , -- 12.165 , 0.421529890421321 , -- 12.17 , 0.394986365391134 , -- 12.175 , 0.340522937951077 , -- 12.18 , 0.269238562662315 , -- 12.185 , 0.19209641315972 , -- 12.19 , 0.11779958413244 , -- 12.195 , 5.136625423508250E-02 , -- 12.2 , -6.300947873046220E-03 , -- 12.205 , -5.782223054975370E-02 , -- 12.21 , -0.10793985148095 , -- 12.215 , -0.16174127408618 , -- 12.22 , -0.22298866763169 , -- 12.225 , -0.2929886222154 , -- 12.23 , -0.37024238871399 , -- 12.235 , -0.45090142997871 , -- 12.24 , -0.52980992267136 , -- 12.245 , -0.60178949630599 , -- 12.25 , -0.66276746147737 , -- 12.255 , -0.71046604589472 , -- 12.26 , -0.74450641227213 , -- 12.265 , -0.76599806365513 , -- 12.27 , -0.77681628816103 , -- 12.275 , -0.77885826543421 , -- 12.28 , -0.77352755022123 , -- 12.285 , -0.76159237398235 , -- 12.29 , -0.74340951487468 , -- 12.295 , -0.7193684533261 , -- 12.3 , -0.69033859752466 , -- 12.305 , -0.65790529310338 , -- 12.31 , -0.62427337609045 , -- 12.315 , -0.59183465481714 , -- 12.32 , -0.5625391602505 , -- 12.325 , -0.53727609431785 , -- 12.33 , -0.51549939568466 , -- 12.335 , -0.49523027754421 , -- 12.34 , -0.47348196058407 , -- 12.345 , -0.44699386193397 , -- 12.35 , -0.41308162478787 , -- 12.355 , -0.37035623858392 , -- 12.36 , -0.31912406711736 , -- 12.365 , -0.26136188585533 , -- 12.37 , -0.20030871435109 , -- 12.375 , -0.13979053261561 , -- 12.38 , -8.348819445843680E-02 , -- 12.385 , -3.432412971860200E-02 , -- 12.39 , 5.898257672503130E-03 , -- 12.395 , 3.658675251617240E-02 , -- 12.4 , 5.823490831704580E-02 , -- 12.405 , 7.220973009677149E-02 , -- 12.41 , 8.054556791305920E-02 , -- 12.415 , 8.583652449551200E-02 , -- 12.42 , 9.119751190995400E-02 , -- 12.425 , 0.10022495276452 , -- 12.43 , 0.116830802684467 , -- 12.435 , 0.144865533553475 , -- 12.44 , 0.187496464655846 , -- 12.445 , 0.246429769927851 , -- 12.45 , 0.321134575890146 , -- 12.455 , 0.408310004218564 , -- 12.46 , 0.501792671730819 , -- 12.465 , 0.593049206029892 , -- 12.47 , 0.672237912914609 , -- 12.475 , 0.729699407315016 , -- 12.48 , 0.757595593934302 , -- 12.485 , 0.751370987649759 , -- 12.49 , 0.710716591717499 , -- 12.495 , 0.639832178015772 , -- 12.5 , 0.546914264636683 , -- 12.505 , 0.442962983193198 , -- 12.51 , 0.340141957400465 , -- 12.515 , 0.249991895482425 , -- 12.52 , 0.181816356681784 , -- 12.525 , 0.14149413564273 , -- 12.53 , 0.130883062190031 , -- 12.535 , 0.147852731887966 , -- 12.54 , 0.186894240935408 , -- 12.545 , 0.240161777063203 , -- 12.55 , 0.298772249040031 , -- 12.555 , 0.3541646202598 , -- 12.56 , 0.399336722395081 , -- 12.565 , 0.429803491932159 , -- 12.57 , 0.444142296553351 , -- 12.575 , 0.444055340271153 , -- 12.58 , 0.433919042501565 , -- 12.585 , 0.41987739717275 , -- 12.59 , 0.408602791719151 , -- 12.595 , 0.405932599777175 , -- 12.6 , 0.415626645287793 , -- 12.605 , 0.438500795189521 , -- 12.61 , 0.47213105784221 , -- 12.615 , 0.511225323925744 , -- 12.62 , 0.548612052766521 , -- 12.625 , 0.576660272126196 , -- 12.63 , 0.588829953918048 , -- 12.635 , 0.581021197761628 , -- 12.64 , 0.552418992096461 , -- 12.645 , 0.505653719521126 , -- 12.65 , 0.446259700593861 , -- 12.655 , 0.381569197808235 , -- 12.66 , 0.319325454510432 , -- 12.665 , 0.266332799357825 , -- 12.67 , 0.227442179455834 , -- 12.675 , 0.20505248099 , -- 12.68 , 0.199165657452942 , -- 12.685 , 0.207885677656546 , -- 12.69 , 0.228151213713856 , -- 12.695 , 0.256464303289308 , -- 12.7 , 0.289423464944378 , -- 12.705 , 0.323974105633788 , -- 12.71 , 0.357399971553342 , -- 12.715 , 0.387180213631022 , -- 12.72 , 0.410871216078733 , -- 12.725 , 0.426149440224674 , -- 12.73 , 0.431066724422046 , -- 12.735 , 0.424468610875424 , -- 12.74 , 0.40643852414304 , -- 12.745 , 0.378585136191504 , -- 12.75 , 0.344023630341179 , -- 12.755 , 0.306976904799534 , -- 12.76 , 0.272045167670388 , -- 12.765 , 0.243295410789869 , -- 12.77 , 0.223399948751481 , -- 12.775 , 0.213036444793139 , -- 12.78 , 0.210713889469279 , -- 12.785 , 0.213057227036913 , -- 12.79 , 0.21547276609123 , -- 12.795 , 0.213006795751766 , -- 12.8 , 0.201182178134479 , -- 12.805 , 0.176611102924828 , -- 12.81 , 0.137299208402565 , -- 12.815 , 8.261651333889580E-02 , -- 12.82 , 1.306254997938910E-02 , -- 12.825 , -7.003874532972119E-02 , -- 12.83 , -0.16475325893821 , -- 12.835 , -0.26859374971277 , -- 12.84 , -0.37841766630558 , -- 12.845 , -0.49027765178853 , -- 12.85 , -0.59935591527846 , -- 12.855 , -0.70013189417767 , -- 12.86 , -0.78683177941038 , -- 12.865 , -0.85412623949955 , -- 12.87 , -0.89792127381358 , -- 12.875 , -0.91603916182254 , -- 12.88 , -0.90857357773468 , -- 12.885 , -0.87778714750083 , -- 12.89 , -0.8275372966502 , -- 12.895 , -0.76235786224487 , -- 12.9 , -0.68643393291051 , -- 12.905 , -0.60274756840487 , -- 12.91 , -0.51264247885951 , -- 12.915 , -0.41593073711012 , -- 12.92 , -0.3115269410358 , -- 12.925 , -0.19842747985447 , -- 12.93 , -7.676760694603291E-02 , -- 12.935 , 5.135539420685220E-02 , -- 12.94 , 0.181528383908596 , -- 12.945 , 0.307260660414741 , -- 12.95 , 0.420769213103223 , -- 12.955 , 0.514139979660135 , -- 12.96 , 0.580592682156079 , -- 12.965 , 0.615578076246798 , -- 12.97 , 0.617476907926892 , -- 12.975 , 0.587799377315074 , -- 12.98 , 0.530889280436902 , -- 12.985 , 0.453243660311424 , -- 12.99 , 0.362622392194437 , -- 12.995 , 0.2671120583141 , -- 13.0 , 0.174286119779362 , -- 13.005 , 9.052797178882990E-02 , -- 13.01 , 2.054498441234870E-02 , -- 13.015 , -3.294702871288870E-02 , -- 13.02 , -6.937300005549160E-02 , -- 13.025 , -9.028206231971420E-02 , -- 13.03 , -9.913110412573760E-02 , -- 13.035 , -0.10083734030815 , -- 13.04 , -0.10108450259662 , -- 13.045 , -0.1054266897417 , -- 13.05 , -0.1182915683999 , -- 13.055 , -0.14205888957835 , -- 13.06 , -0.17640190935702 , -- 13.065 , -0.21806865581631 , -- 13.07 , -0.26120089347156 , -- 13.075 , -0.29817769418101 , -- 13.08 , -0.32085004389739 , -- 13.085 , -0.32193831070962 , -- 13.09 , -0.29631759697471 , -- 13.095 , -0.24193696858333 , -- 13.1 , -0.16019970762232 , -- 13.105 , -5.574993867029920E-02 , -- 13.11 , 6.425618048517991E-02 , -- 13.115 , 0.19122987419663 , -- 13.12 , 0.316346629224766 , -- 13.125 , 0.431653751489729 , -- 13.13 , 0.530914954469608 , -- 13.135 , 0.610121196882937 , -- 13.14 , 0.667657470309265 , -- 13.145 , 0.704186599565721 , -- 13.15 , 0.722325191446681 , -- 13.155 , 0.726186367330791 , -- 13.16 , 0.720836106520834 , -- 13.165 , 0.711688820321258 , -- 13.17 , 0.703862564199362 , -- 13.175 , 0.701524520420123 , -- 13.18 , 0.707294612263167 , -- 13.185 , 0.721797723723084 , -- 13.19 , 0.743474213000332 , -- 13.195 , 0.768726481461021 , -- 13.2 , 0.792431876186836 , -- 13.205 , 0.808764824723334 , -- 13.21 , 0.812196723822406 , -- 13.215 , 0.798471820125594 , -- 13.22 , 0.765360902698407 , -- 13.225 , 0.713020417223642 , -- 13.23 , 0.643892155196421 , -- 13.235 , 0.562167990243985 , -- 13.24 , 0.472970245560551 , -- 13.245 , 0.381438619514679 , -- 13.25 , 0.291951206368075 , -- 13.255 , 0.20762340636979 , -- 13.26 , 0.130166940321081 , -- 13.265 , 6.006289386634430E-02 , -- 13.27 , -3.060365982684810E-03 , -- 13.275 , -6.001488208941340E-02 , -- 13.28 , -0.11173380533579 , -- 13.285 , -0.15914104631288 , -- 13.29 , -0.20317809418618 , -- 13.295 , -0.24493336090531 , -- 13.3 , -0.28573011925772 , -- 13.305 , -0.32707569024184 , -- 13.31 , -0.37040876594875 , -- 13.315 , -0.41668833903021 , -- 13.32 , -0.46592656198441 , -- 13.325 , -0.51683388329442 , -- 13.33 , -0.56671530350641 , -- 13.335 , -0.61172427575717 , -- 13.34 , -0.64745289857378 , -- 13.345 , -0.66975635467017 , -- 13.35 , -0.67561421984368 , -- 13.355 , -0.66382212752523 , -- 13.36 , -0.63533221269618 , -- 13.365 , -0.59315990071751 , -- 13.37 , -0.54187928568118 , -- 13.375 , -0.48684683870894 , -- 13.38 , -0.43334458417513 , -- 13.385 , -0.38584852580448 , -- 13.39 , -0.34757223717143 , -- 13.395 , -0.32034609191295 , -- 13.4 , -0.30479305822331 , -- 13.405 , -0.30068667519817 , -- 13.41 , -0.30734431404504 , -- 13.415 , -0.32393187524719 , -- 13.42 , -0.3496124571983 , -- 13.425 , -0.38355062958007 , -- 13.43 , -0.42483772740574 , -- 13.435 , -0.47243959941852 , -- 13.44 , -0.52523698989138 , -- 13.445 , -0.58218855059142 , -- 13.45 , -0.64255715702482 , -- 13.455 , -0.70611547192509 , -- 13.46 , -0.77319959733532 , -- 13.465 , -0.84453581144061 , -- 13.47 , -0.9208154277502 , -- 13.475 , -1.00210330165744 , -- 13.48 , -1.08722318257344 , -- 13.485 , -1.17331384017982 , -- 13.49 , -1.25571905330723 , -- 13.495 , -1.32830569669314 , -- 13.5 , -1.38419198321401 , -- 13.505 , -1.41674939954092 , -- 13.51 , -1.42066916256513 , -- 13.515 , -1.39284912504276 , -- 13.52 , -1.33290856588875 , -- 13.525 , -1.24321481899912 , -- 13.53 , -1.12845482092199 , -- 13.535 , -0.994859301148 , -- 13.54 , -0.84929200472393 , -- 13.545 , -0.69840229944309 , -- 13.55 , -0.5480171915834 , -- 13.555 , -0.40283245150506 , -- 13.56 , -0.26639859300057 , -- 13.565 , -0.1412841699847 , -- 13.57 , -2.930752910284020E-02 , -- 13.575 , 6.831031669366761E-02 , -- 13.58 , 0.150909902638648 , -- 13.585 , 0.218485436556094 , -- 13.59 , 0.271817772885176 , -- 13.595 , 0.312563547048263 , -- 13.6 , 0.343197563758831 , -- 13.605 , 0.366784232668975 , -- 13.61 , 0.386577813348275 , -- 13.615 , 0.405567940703392 , -- 13.62 , 0.426060284638387 , -- 13.625 , 0.449416325446865 , -- 13.63 , 0.476003373865086 , -- 13.635 , 0.505362938780156 , -- 13.64 , 0.536518767578895 , -- 13.645 , 0.568328300506654 , -- 13.65 , 0.599754845087405 , -- 13.655 , 0.630000025300325 , -- 13.66 , 0.6584695973929 , -- 13.665 , 0.68462841460832 , -- 13.67 , 0.70782686172262 , -- 13.675 , 0.727203534668359 , -- 13.68 , 0.741722744375036 , -- 13.685 , 0.750362416108883 , -- 13.69 , 0.752392406085506 , -- 13.695 , 0.747650040601305 , -- 13.7 , 0.736696231685042 , -- 13.705 , 0.720777621636586 , -- 13.71 , 0.701571294344929 , -- 13.715 , 0.680769236869278 , -- 13.72 , 0.659613778989939 , -- 13.725 , 0.638519591968826 , -- 13.73 , 0.616905016742059 , -- 13.735 , 0.593283746255628 , -- 13.74 , 0.565603855337414 , -- 13.745 , 0.531733554716355 , -- 13.75 , 0.489962659748419 , -- 13.755 , 0.439375608243233 , -- 13.76 , 0.380009446404367 , -- 13.765 , 0.312773129830936 , -- 13.77 , 0.239195423372873 , -- 13.775 , 0.16110638214858 , -- 13.78 , 8.038995906805420E-02 , -- 13.785 , -1.102897232504770E-03 , -- 13.79 , -8.144778281704360E-02 , -- 13.795 , -0.15840843583426 , -- 13.8 , -0.22917659635052 , -- 13.805 , -0.29024518206889 , -- 13.81 , -0.33752175024298 , -- 13.815 , -0.36674198188098 , -- 13.82 , -0.37413071891857 , -- 13.825 , -0.35717935529397 , -- 13.83 , -0.31535074520267 , -- 13.835 , -0.25052105857336 , -- 13.84 , -0.16702284226815 , -- 13.845 , -7.124636094412699E-02 , -- 13.85 , 2.913353087510890E-02 , -- 13.855 , 0.126149325078345 , -- 13.86 , 0.212544685340441 , -- 13.865 , 0.282593826653342 , -- 13.87 , 0.33259342353236 , -- 13.875 , 0.360977014896564 , -- 13.88 , 0.368090497895831 , -- 13.885 , 0.355740094833499 , -- 13.89 , 0.326653538417733 , -- 13.895 , 0.283980395609887 , -- 13.9 , 0.230911938687721 , -- 13.905 , 0.170438689852821 , -- 13.91 , 0.105217955743757 , -- 13.915 , 3.748846121428490E-02 , -- 13.92 , -3.100811006762060E-02 , -- 13.925 , -9.912461677678459E-02 , -- 13.93 , -0.16638732593593 , -- 13.935 , -0.23301599989748 , -- 13.94 , -0.29981098203477 , -- 13.945 , -0.36788336374228 , -- 13.95 , -0.43823790831234 , -- 13.955 , -0.51128976367887 , -- 13.96 , -0.58642827752511 , -- 13.965 , -0.66176331535379 , -- 13.97 , -0.7341480161194 , -- 13.975 , -0.79952454249667 , -- 13.98 , -0.85353878258576 , -- 13.985 , -0.89230509468498 , -- 13.99 , -0.9131476514604 , -- 13.995 , -0.91514375354423 , -- 14.0 , -0.8993367487938 , -- 14.005 , -0.86856422332842 , -- 14.01 , -0.82694415950239 , -- 14.015 , -0.77913771351111 , -- 14.02 , -0.72955729658514 , -- 14.025 , -0.68168905647206 , -- 14.03 , -0.63766151216947 , -- 14.035 , -0.59811504505913 , -- 14.04 , -0.56235853309889 , -- 14.045 , -0.52872726325526 , -- 14.05 , -0.49503897771436 , -- 14.055 , -0.45902725746187 , -- 14.06 , -0.41868594009816 , -- 14.065 , -0.37248337306763 , -- 14.07 , -0.31947100513302 , -- 14.075 , -0.25931189817463 , -- 14.08 , -0.19228261646431 , -- 14.085 , -0.11925792681763 , -- 14.09 , -4.169532968283350E-02 , -- 14.095 , 3.843303316390890E-02 , -- 14.1 , 0.118775003838835 , -- 14.105 , 0.196837583343436 , -- 14.11 , 0.270307193173439 , -- 14.115 , 0.337420184008135 , -- 14.12 , 0.397291393971841 , -- 14.125 , 0.450126440210993 , -- 14.13 , 0.497226657276013 , -- 14.135 , 0.540774142842358 , -- 14.14 , 0.58340264798186 , -- 14.145 , 0.627643304621108 , -- 14.15 , 0.675349975738562 , -- 14.155 , 0.727241025622671 , -- 14.16 , 0.782651129746367 , -- 14.165 , 0.839560451090441 , -- 14.17 , 0.894881294455553 , -- 14.175 , 0.944955884798899 , -- 14.18 , 0.986144014351956 , -- 14.185 , 1.015390719979 , -- 14.19 , 1.0306572943892 , -- 14.195 , 1.03115234481902 , -- 14.2 , 1.01733343986871 , -- 14.205 , 0.990709541557108 , -- 14.21 , 0.953502790822332 , -- 14.215 , 0.908254264710393 , -- 14.22 , 0.857454756635746 , -- 14.225 , 0.803265224100822 , -- 14.23 , 0.74737385316121 , -- 14.235 , 0.690995601525318 , -- 14.24 , 0.635005073529152 , -- 14.245 , 0.580160133049894 , -- 14.25 , 0.527369694111442 , -- 14.255 , 0.477938039158216 , -- 14.26 , 0.433728338232803 , -- 14.265 , 0.397194149800069 , -- 14.27 , 0.371248511478309 , -- 14.275 , 0.358963505823744 , -- 14.28 , 0.363137797938165 , -- 14.285 , 0.385787231840523 , -- 14.29 , 0.427657749130475 , -- 14.295 , 0.487849697242734 , -- 14.3 , 0.563646552494242 , -- 14.305 , 0.650598748291401 , -- 14.31 , 0.742869615401765 , -- 14.315 , 0.833794067276776 , -- 14.32 , 0.916556460872168 , -- 14.325 , 0.984863842045941 , -- 14.33 , 1.0335040976667 , -- 14.335 , 1.05869041827564 , -- 14.34 , 1.05816644274048 , -- 14.345 , 1.03108361491544 , -- 14.35 , 0.977735351761127 , -- 14.355 , 0.899232930675646 , -- 14.36 , 0.797237214065439 , -- 14.365 , 0.673796884116058 , -- 14.37 , 0.531337867932015 , -- 14.375 , 0.372747573641774 , -- 14.38 , 0.20150981243218 , -- 14.385 , 2.178427411223690E-02 , -- 14.39 , -0.16161383529816 , -- 14.395 , -0.34339606863716 , -- 14.4 , -0.5181084642692 , -- 14.405 , -0.68053644448525 , -- 14.41 , -0.826088703855 , -- 14.415 , -0.95112570187104 , -- 14.42 , -1.05313423965707 , -- 14.425 , -1.13075625342751 , -- 14.43 , -1.18366851217429 , -- 14.435 , -1.21238579974723 , -- 14.44 , -1.21803310838506 , -- 14.445 , -1.20215241564511 , -- 14.45 , -1.16656016251128 , -- 14.455 , -1.113269900772 , -- 14.46 , -1.04444581397611 , -- 14.465 , -0.96236345544593 , -- 14.47 , -0.86935386142724 , -- 14.475 , -0.76773118679175 , -- 14.48 , -0.65972693552001 , -- 14.485 , -0.54746173019692 , -- 14.49 , -0.43299292085595 , -- 14.495 , -0.3184397215422 , -- 14.5 , -0.20616849862018 , -- 14.505 , -9.897318159698620E-02 , -- 14.51 , -1.803143023172810E-04 , -- 14.515 , 8.640194233650360E-02 , -- 14.52 , 0.156727372406871 , -- 14.525 , 0.206940131693837 , -- 14.53 , 0.233914703352716 , -- 14.535 , 0.235793875210402 , -- 14.54 , 0.212387260096523 , -- 14.545 , 0.165314426336394 , -- 14.55 , 9.783758697368690E-02 , -- 14.555 , 1.439534230634960E-02 , -- 14.56 , -8.005859022341789E-02 , -- 14.565 , -0.18076618261283 , -- 14.57 , -0.28374454180973 , -- 14.575 , -0.38610798365218 , -- 14.58 , -0.48605081190961 , -- 14.585 , -0.58252398542127 , -- 14.59 , -0.67470367132805 , -- 14.595 , -0.76142935693159 , -- 14.6 , -0.8407780560685 , -- 14.605 , -0.90992374040628 , -- 14.61 , -0.96532870247995 , -- 14.615 , -1.00324396367882 , -- 14.62 , -1.02038773635927 , -- 14.625 , -1.01463341589249 , -- 14.63 , -0.98552757460307 , -- 14.635 , -0.93450835223946 , -- 14.64 , -0.86477120783303 , -- 14.645 , -0.78081893710178 , -- 14.65 , -0.68781873202676 , -- 14.655 , -0.59091719649253 , -- 14.66 , -0.49467793607145 , -- 14.665 , -0.40274402274473 , -- 14.67 , -0.31777533615604 , -- 14.675 , -0.24161241000393 , -- 14.68 , -0.17557875216008 , -- 14.685 , -0.12078750746673 , -- 14.69 , -7.835224295217311E-02 , -- 14.695 , -4.942101977486440E-02 , -- 14.7 , -3.503749471905150E-02 , -- 14.705 , -3.587495731215070E-02 , -- 14.71 , -5.194398103175540E-02 , -- 14.715 , -8.236828155631780E-02 , -- 14.72 , -0.12531697112263 , -- 14.725 , -0.17812203875209 , -- 14.73 , -0.23756805254037 , -- 14.735 , -0.30028601265584 , -- 14.74 , -0.36316012018238 , -- 14.745 , -0.42365909583363 , -- 14.75 , -0.48002335079991 , -- 14.755 , -0.53128602795839 , -- 14.76 , -0.57714447879069 , -- 14.765 , -0.61773654874064 , -- 14.77 , -0.65338922947777 , -- 14.775 , -0.68440719071073 , -- 14.78 , -0.71094150841826 , -- 14.785 , -0.73295383213119 , -- 14.79 , -0.75025831938642 , -- 14.795 , -0.76260438890415 , -- 14.8 , -0.76975912976851 , -- 14.805 , -0.77155180131721 , -- 14.81 , -0.76787415141689 , -- 14.815 , -0.75863134459094 , -- 14.82 , -0.74368104295612 , -- 14.825 , -0.72278322433993 , -- 14.83 , -0.69560054902327 , -- 14.835 , -0.66175375591306 , -- 14.84 , -0.62093898535516 , -- 14.845 , -0.57306913773937 , -- 14.85 , -0.51841917741191 , -- 14.855 , -0.45771315164191 , -- 14.86 , -0.392137917305 , -- 14.865 , -0.3232532945768 , -- 14.87 , -0.25282156152333 , -- 14.875 , -0.18257072630809 , -- 14.88 , -0.11395570313114 , -- 14.885 , -4.795078990473090E-02 , -- 14.89 , 1.505030752196730E-02 , -- 14.895 , 7.523505899511330E-02 , -- 14.9 , 0.133241663209769 , -- 14.905 , 0.189946958395501 , -- 14.91 , 0.246204884243539 , -- 14.915 , 0.302617865301028 , -- 14.92 , 0.359383341937356 , -- 14.925 , 0.416272256914715 , -- 14.93 , 0.472730379837134 , -- 14.935 , 0.528097455638089 , -- 14.94 , 0.581866656852053 , -- 14.945 , 0.633923511292493 , -- 14.95 , 0.684671503159956 , -- 14.955 , 0.735006617044871 , -- 14.96 , 0.78610900707482 , -- 14.965 , 0.839096114213373 , -- 14.97 , 0.894592925855566 , -- 14.975 , 0.952340646800937 , -- 14.98 , 1.0109322862822 , -- 14.985 , 1.06776815099708 , -- 14.99 , 1.11925763952313 , -- 14.995 , 1.16125733848899 , -- 15.0 , 1.18965840938029 , -- 15.005 , 1.20101711803106 , -- 15.01 , 1.19309156203439 , -- 15.015 , 1.16518353563898 , -- 15.02 , 1.11821232455035 , -- 15.025 , 1.0545184865003 , -- 15.03 , 0.977448615628865 , -- 15.035 , 0.890815252481333 , -- 15.04 , 0.798354444510221 , -- 15.045 , 0.703279494461959 , -- 15.05 , 0.60801847543151 , -- 15.055 , 0.514150357593879 , -- 15.06 , 0.422530486995826 , -- 15.065 , 0.333543044544543 , -- 15.07 , 0.247413880227417 , -- 15.075 , 0.164505011560775 , -- 15.08 , 8.554502116652860E-02 , -- 15.085 , 1.176008397877900E-02 , -- 15.09 , -5.508991016794810E-02 , -- 15.095 , -0.11277329041032 , -- 15.1 , -0.15872202731611 , -- 15.105 , -0.19023769676271 , -- 15.11 , -0.20475543680883 , -- 15.115 , -0.20016459209247 , -- 15.12 , -0.17515953672649 , -- 15.125 , -0.1295909322101 , -- 15.13 , -6.475341455153370E-02 , -- 15.135 , 1.645644779243700E-02 , -- 15.14 , 0.109582085491203 , -- 15.145 , 0.208891920094615 , -- 15.15 , 0.307902347961824 , -- 15.155 , 0.400086953541137 , -- 15.16 , 0.479656312478387 , -- 15.165 , 0.54227026093024 , -- 15.17 , 0.585531391323096 , -- 15.175 , 0.60915577781107 , -- 15.18 , 0.614771789148716 , -- 15.185 , 0.605386403919845 , -- 15.19 , 0.584635659710548 , -- 15.195 , 0.555987240463961 , -- 15.2 , 0.522078576056577 , -- 15.205 , 0.484332615313383 , -- 15.21 , 0.44293940454718 , -- 15.215 , 0.397175120559912 , -- 15.22 , 0.345968006972672 , -- 15.225 , 0.288543030116857 , -- 15.23 , 0.224972791486283 , -- 15.235 , 0.156481408793171 , -- 15.24 , 8.542958350357370E-02 , -- 15.245 , 1.498370477529230E-02 , -- 15.25 , -5.142934425176120E-02 , -- 15.255 , -0.1107437937938 , -- 15.26 , -0.16078441017566 , -- 15.265 , -0.20057844669055 , -- 15.27 , -0.23037829970624 , -- 15.275 , -0.2514154045316 , -- 15.28 , -0.26546110414046 , -- 15.285 , -0.27433386226401 , -- 15.29 , -0.27947343680654 , -- 15.295 , -0.28170382574971 , -- 15.3 , -0.28121922535055 , -- 15.305 , -0.27778333156123 , -- 15.31 , -0.27106104276765 , -- 15.315 , -0.26098347288903 , -- 15.32 , -0.2480337104626 , -- 15.325 , -0.23338239832851 , -- 15.33 , -0.21883669131141 , -- 15.335 , -0.20662723365469 , -- 15.34 , -0.19908795725974 , -- 15.345 , -0.1983095632208 , -- 15.35 , -0.20583511356768 , -- 15.355 , -0.22245388077999 , -- 15.36 , -0.24810721805446 , -- 15.365 , -0.28190022979588 , -- 15.37 , -0.32218399867655 , -- 15.375 , -0.36668187000496 , -- 15.38 , -0.41262893144551 , -- 15.385 , -0.4569195252945 , -- 15.39 , -0.49626700745835 , -- 15.395 , -0.52739011070132 , -- 15.4 , -0.54723474350703 , -- 15.405 , -0.55322582044501 , -- 15.41 , -0.54352567312437 , -- 15.415 , -0.51725918301048 , -- 15.42 , -0.47466073347181 , -- 15.425 , -0.41710230560527 , -- 15.43 , -0.34698928139492 , -- 15.435 , -0.26752756403572 , -- 15.44 , -0.18240759770015 , -- 15.445 , -9.545429827632960E-02 , -- 15.45 , -1.031774321012660E-02 , -- 15.455 , 6.975569716684001E-02 , -- 15.46 , 0.142031815271298 , -- 15.465 , 0.204287600135245 , -- 15.47 , 0.254724524020873 , -- 15.475 , 0.291852234959508 , -- 15.48 , 0.314393966922164 , -- 15.485 , 0.321257693596354 , -- 15.49 , 0.311592647764159 , -- 15.495 , 0.284924209311069 , -- 15.5 , 0.241333574629117 , -- 15.505 , 0.181630984411648 , -- 15.51 , 0.107473789318163 , -- 15.515 , 2.138659993284420E-02 , -- 15.52 , -7.333294612818740E-02 , -- 15.525 , -0.17281819572361 , -- 15.53 , -0.2729111163528 , -- 15.535 , -0.36947452952708 , -- 15.54 , -0.45868092644508 , -- 15.545 , -0.53724054983261 , -- 15.55 , -0.60253835404275 , -- 15.555 , -0.65267651763316 , -- 15.56 , -0.6864354117723 , -- 15.565 , -0.70318229683703 , -- 15.57 , -0.70276183568102 , -- 15.575 , -0.68540176686393 , -- 15.58 , -0.6516520838685 , -- 15.585 , -0.60236502510189 , -- 15.59 , -0.538706492591 , -- 15.595 , -0.46217410897888 , -- 15.6 , -0.37460077533887 , -- 15.605 , -0.27810973417383 , -- 15.61 , -0.17502716813551 , -- 15.615 , -6.773228527287170E-02 , -- 15.62 , 4.151501433409210E-02 , -- 15.625 , 0.150751860185515 , -- 15.63 , 0.258442092002889 , -- 15.635 , 0.363538574930614 , -- 15.64 , 0.465442765332169 , -- 15.645 , 0.563876126508653 , -- 15.65 , 0.658665592231715 , -- 15.655 , 0.749509291460253 , -- 15.66 , 0.835755718589599 , -- 15.665 , 0.916264699152492 , -- 15.67 , 0.989375816925145 , -- 15.675 , 1.05301420158238 , -- 15.68 , 1.10490739292059 , -- 15.685 , 1.14288462647541 , -- 15.69 , 1.16518849553063 , -- 15.695 , 1.1707464912492 , -- 15.7 , 1.15934157640063 , -- 15.705 , 1.13165264409975 , -- 15.71 , 1.08916287801769 , -- 15.715 , 1.03396048449819 , -- 15.72 , 0.968480895649285 , -- 15.725 , 0.895239610317516 , -- 15.73 , 0.816614791244956 , -- 15.735 , 0.734699276030846 , -- 15.74 , 0.651241095374945 , -- 15.745 , 0.567649521370319 , -- 15.75 , 0.485049163207599 , -- 15.755 , 0.404335549986381 , -- 15.76 , 0.326219056425138 , -- 15.765 , 0.251231356865374 , -- 15.77 , 0.179720965294244 , -- 15.775 , 0.111831041730238 , -- 15.78 , 4.750476279777080E-02 , -- 15.785 , -1.347798247405040E-02 , -- 15.79 , -7.141356069694010E-02 , -- 15.795 , -0.12656450883031 , -- 15.8 , -0.1790372399842 , -- 15.805 , -0.2286955113047 , -- 15.81 , -0.27512243015728 , -- 15.815 , -0.31766447732324 , -- 15.82 , -0.3555388110919 , -- 15.825 , -0.38798921520158 , -- 15.83 , -0.41444221410296 , -- 15.835 , -0.43463094635962 , -- 15.84 , -0.44864369112348 , -- 15.845 , -0.4568931292131 , -- 15.85 , -0.46000160926806 , -- 15.855 , -0.45865250041628 , -- 15.86 , -0.45343877892519 , -- 15.865 , -0.44476504067162 , -- 15.87 , -0.43283082098116 , -- 15.875 , -0.41771237775514 , -- 15.88 , -0.3995214147592 , -- 15.885 , -0.37860415544342 , -- 15.89 , -0.35572212713179 , -- 15.895 , -0.33216132888134 , -- 15.9 , -0.30972572285948 , -- 15.905 , -0.29059799700979 , -- 15.91 , -0.27708096353175 , -- 15.915 , -0.27126155854412 , -- 15.92 , -0.2746590319597 , -- 15.925 , -0.28792675974919 , -- 15.93 , -0.31066689274262 , -- 15.935 , -0.34140077106906 , -- 15.94 , -0.3777039602476 , -- 15.945 , -0.41648665097944 , -- 15.95 , -0.45437291128764 , -- 15.955 , -0.48811381404708 , -- 15.96 , -0.51496612193939 , -- 15.965 , -0.5329765854495 , -- 15.97 , -0.54113053164364 , -- 15.975 , -0.53935053269995 , -- 15.98 , -0.52835825596445 , -- 15.985 , -0.50943591924887 , -- 15.99 , -0.48413923071434 , -- 15.995 , -0.45401661733085 , -- 16.0 , -0.42038541841803 , -- 16.005 , -0.38419449756936 , -- 16.01 , -0.34598883075877 , -- 16.015 , -0.30596135684737 , -- 16.02 , -0.26406862723475 , -- 16.025 , -0.22017134269813 , -- 16.03 , -0.17416871222392 , -- 16.035 , -0.12609398639317 , -- 16.04 , -7.616580091339020E-02 , -- 16.045 , -2.479105816937940E-02 , -- 16.05 , 2.745737110728120E-02 , -- 16.055 , 7.987861751112391E-02 , -- 16.06 , 0.131672708259285 , -- 16.065 , 0.181958505928516 , -- 16.07 , 0.229779175022502 , -- 16.075 , 0.274114727562895 , -- 16.08 , 0.313912537790184 , -- 16.085 , 0.348155259464482 , -- 16.09 , 0.375959714090624 , -- 16.095 , 0.396703409827832 , -- 16.1 , 0.410143539243666 , -- 16.105 , 0.416499539855543 , -- 16.11 , 0.416464899336383 , -- 16.115 , 0.411132431725026 , -- 16.12 , 0.401834694221056 , -- 16.125 , 0.389926331168038 , -- 16.13 , 0.376552509432684 , -- 16.135 , 0.362455371415181 , -- 16.14 , 0.347864663265341 , -- 16.145 , 0.332498409591647 , -- 16.15 , 0.315673926599289 , -- 16.155 , 0.296498803516978 , -- 16.16 , 0.274095775096738 , -- 16.165 , 0.247800859489553 , -- 16.17 , 0.217295286911219 , -- 16.175 , 0.182636701553898 , -- 16.18 , 0.144199700257594 , -- 16.185 , 0.102548913123023 , -- 16.19 , 5.829530297192130E-02 , -- 16.195 , 1.197592728082750E-02 , -- 16.2 , -3.600290534227300E-02 , -- 16.205 , -8.535615468618291E-02 , -- 16.21 , -0.13584918811621 , -- 16.215 , -0.18721153582539 , -- 16.22 , -0.23906457716721 , -- 16.225 , -0.29090350734869 , -- 16.23 , -0.34213587188623 , -- 16.235 , -0.392170780993 , -- 16.24 , -0.44051591221236 , -- 16.245 , -0.48684480865516 , -- 16.25 , -0.53098857668878 , -- 16.255 , -0.57284978382707 , -- 16.26 , -0.61224319073572 , -- 16.265 , -0.64871598685836 , -- 16.27 , -0.68140334352395 , -- 16.275 , -0.70898222576025 , -- 16.28 , -0.7297595947791 , -- 16.285 , -0.7418948815967 , -- 16.29 , -0.74371891027858 , -- 16.295 , -0.73407611710958 , -- 16.3 , -0.71260329024102 , -- 16.305 , -0.67986749030603 , -- 16.31 , -0.63732240300856 , -- 16.315 , -0.58707824160675 , -- 16.32 , -0.53154405116823 , -- 16.325 , -0.47301455154914 , -- 16.33 , -0.41331652122001 , -- 16.335 , -0.35357961212191 , -- 16.34 , -0.29419497300413 , -- 16.345 , -0.23495140181355 , -- 16.35 , -0.17531083484956 , -- 16.355 , -0.11473456907756 , -- 16.36 , -5.298091218194400E-02 , -- 16.365 , 9.709062607778981E-03 , -- 16.37 , 7.256409889259650E-02 , -- 16.375 , 0.134384503385863 , -- 16.38 , 0.193739454595389 , -- 16.385 , 0.24920525086789 , -- 16.39 , 0.299568602241651 , -- 16.395 , 0.343956956389216 , -- 16.4 , 0.381866908791684 , -- 16.405 , 0.413114650618461 , -- 16.41 , 0.437733369467239 , -- 16.415 , 0.455877974867213 , -- 16.42 , 0.46776384132681 , -- 16.425 , 0.473663922748246 , -- 16.43 , 0.47395074709205 , -- 16.435 , 0.469159269294089 , -- 16.44 , 0.460028874160481 , -- 16.445 , 0.447496145434672 , -- 16.45 , 0.43262324571891 , -- 16.455 , 0.416476298710912 , -- 16.46 , 0.39998487143001 , -- 16.465 , 0.383825594174033 , -- 16.47 , 0.368369873101624 , -- 16.475 , 0.353714574674185 , -- 16.48 , 0.339789306901935 , -- 16.485 , 0.326509782519242 , -- 16.49 , 0.313927074313828 , -- 16.495 , 0.302325131506492 , -- 16.5 , 0.292230126681682 , -- 16.505 , 0.284323481848275 , -- 16.51 , 0.279278430837744 , -- 16.515 , 0.277565991023392 , -- 16.52 , 0.27928378094795 , -- 16.525 , 0.284059216918989 , -- 16.53 , 0.291055442661278 , -- 16.535 , 0.299081158427955 , -- 16.54 , 0.306775986803293 , -- 16.545 , 0.312824550426672 , -- 16.55 , 0.316148133716397 , -- 16.555 , 0.316029035226392 , -- 16.56 , 0.31215069004257 , -- 16.565 , 0.304553318859 , -- 16.57 , 0.293538129439739 , -- 16.575 , 0.279551088336509 , -- 16.58 , 0.263087654869009 , -- 16.585 , 0.244637877428558 , -- 16.59 , 0.224678132698894 , -- 16.595 , 0.203690933512921 , -- 16.6 , 0.182189070638557 , -- 16.605 , 0.160712533967535 , -- 16.61 , 0.139788985048289 , -- 16.615 , 0.119849630257617 , -- 16.62 , 0.101127004531768 , -- 16.625 , 8.356184746823360E-02 , -- 16.63 , 6.675788773408831E-02 , -- 16.635 , 5.000422430522750E-02 , -- 16.64 , 3.237781788478290E-02 , -- 16.645 , 1.290492007865870E-02 , -- 16.65 , -9.242841522190411E-03 , -- 16.655 , -3.457307113926180E-02 , -- 16.66 , -6.315044794397080E-02 , -- 16.665 , -9.456431033805510E-02 , -- 16.67 , -0.12798945588883 , -- 16.675 , -0.16233338586658 , -- 16.68 , -0.19643231791386 , -- 16.685 , -0.22926030484873 , -- 16.69 , -0.26010137973961 , -- 16.695 , -0.28866176894499 , -- 16.7 , -0.31509595200913 , -- 16.705 , -0.33995273832631 , -- 16.71 , -0.36405095016433 , -- 16.715 , -0.38831357635509 , -- 16.72 , -0.41358504112542 , -- 16.725 , -0.44046253469103 , -- 16.73 , -0.46915752304 , -- 16.735 , -0.49941060932339 , -- 16.74 , -0.53046223395319 , -- 16.745 , -0.56108536534834 , -- 16.75 , -0.58967419378453 , -- 16.755 , -0.61438209498106 , -- 16.76 , -0.63329121107995 , -- 16.765 , -0.64459684400811 , -- 16.77 , -0.64678096256853 , -- 16.775 , -0.63875489537808 , -- 16.78 , -0.61995220147847 , -- 16.785 , -0.59036060295097 , -- 16.79 , -0.55049669392639 , -- 16.795 , -0.50133039140924 , -- 16.8 , -0.44418245956687 , -- 16.805 , -0.38061075875138 , -- 16.81 , -0.31231562731901 , -- 16.815 , -0.24106197922092 , -- 16.82 , -0.1686326543263 , -- 16.825 , -9.679598568714549E-02 , -- 16.83 , -2.728380092511400E-02 , -- 16.835 , 3.824293020108400E-02 , -- 16.84 , 9.824002683071940E-02 , -- 16.845 , 0.151346034414838 , -- 16.85 , 0.196448639221428 , -- 16.855 , 0.232748834021365 , -- 16.86 , 0.259798117288868 , -- 16.865 , 0.277506221603702 , -- 16.87 , 0.286111918797314 , -- 16.875 , 0.286131733842289 , -- 16.88 , 0.278296735618878 , -- 16.885 , 0.263498277115562 , -- 16.89 , 0.24274886174333 , -- 16.895 , 0.217166404345327 , -- 16.9 , 0.187968246853482 , -- 16.905 , 0.156461968787081 , -- 16.91 , 0.124015045694316 , -- 16.915 , 9.199139026589789E-02 , -- 16.92 , 6.165693925050090E-02 , -- 16.925 , 3.406870712543500E-02 , -- 16.93 , 9.974305988061479E-03 , -- 16.935 , -1.024803512308630E-02 , -- 16.94 , -2.658403019625520E-02 , -- 16.945 , -3.930334521456180E-02 , -- 16.95 , -4.881605741987730E-02 , -- 16.955 , -5.549717708582600E-02 , -- 16.96 , -5.952392534556360E-02 , -- 16.965 , -6.076975805147920E-02 , -- 16.97 , -5.879314030308780E-02 , -- 16.975 , -5.292859848425780E-02 , -- 16.98 , -4.246799585244240E-02 , -- 16.985 , -2.689000147691090E-02 , -- 16.99 , -6.084643377645750E-03 , -- 16.995 , 1.948494890135070E-02 , -- 17.0 , 4.872381188647930E-02 , -- 17.005 , 7.996838345792370E-02 , -- 17.01 , 0.111158477862087 , -- 17.015 , 0.140083752196672 , -- 17.02 , 0.164651035916986 , -- 17.025 , 0.18312224741681 , -- 17.03 , 0.194279612887888 , -- 17.035 , 0.197502657429334 , -- 17.04 , 0.192756670137177 , -- 17.045 , 0.180518699701142 , -- 17.05 , 0.161669903280425 , -- 17.055 , 0.137385815960322 , -- 17.06 , 0.109043393552795 , -- 17.065 , 7.814867623624100E-02 , -- 17.07 , 4.627753286711330E-02 , -- 17.075 , 1.501227171733180E-02 , -- 17.08 , -1.413775130832270E-02 , -- 17.085 , -3.983793711438840E-02 , -- 17.09 , -6.104036519750250E-02 , -- 17.095 , -7.708842285673501E-02 , -- 17.1 , -8.778382263463140E-02 , -- 17.105 , -9.339483606844121E-02 , -- 17.11 , -9.459269265106150E-02 , -- 17.115 , -9.232223501388739E-02 , -- 17.12 , -8.763025422153840E-02 , -- 17.125 , -8.148499770125020E-02 , -- 17.13 , -7.462775457220110E-02 , -- 17.135 , -6.748324353623050E-02 , -- 17.14 , -6.014609852966310E-02 , -- 17.145 , -5.243702915474610E-02 , -- 17.15 , -4.400785444844100E-02 , -- 17.155 , -3.446180958692290E-02 , -- 17.16 , -2.345792198001310E-02 , -- 17.165 , -1.077394978512690E-02 , -- 17.17 , 3.679128728274960E-03 , -- 17.175 , 1.988574043577430E-02 , -- 17.18 , 3.777667605297300E-02 , -- 17.185 , 5.727939847072780E-02 , -- 17.19 , 7.834501552629659E-02 , -- 17.195 , 0.100944016898245 , -- 17.2 , 0.125030824710985 , -- 17.205 , 0.150493723897266 , -- 17.21 , 0.177105725250697 , -- 17.215 , 0.204499198588219 , -- 17.22 , 0.232171627050269 , -- 17.225 , 0.259522952289019 , -- 17.23 , 0.28591162656688 , -- 17.235 , 0.310713017545991 , -- 17.24 , 0.333360202463241 , -- 17.245 , 0.353356491062333 , -- 17.25 , 0.370257070307643 , -- 17.255 , 0.383631410780558 , -- 17.26 , 0.393022771718625 , -- 17.265 , 0.397924531915073 , -- 17.27 , 0.397789484581034 , -- 17.275 , 0.392075448648513 , -- 17.28 , 0.380321842357972 , -- 17.285 , 0.362236624526743 , -- 17.29 , 0.337775799625786 , -- 17.295 , 0.307187618217491 , -- 17.3 , 0.271012952518342 , -- 17.305 , 0.230034748672592 , -- 17.31 , 0.185192192119736 , -- 17.315 , 0.1374724900416 , -- 17.32 , 8.781061932229070E-02 , -- 17.325 , 3.701123827098990E-02 , -- 17.33 , -1.428322820528750E-02 , -- 17.335 , -6.558572925239700E-02 , -- 17.34 , -0.11651660768663 , -- 17.345 , -0.16673628393002 , -- 17.35 , -0.21587015869355 , -- 17.355 , -0.26345095520442 , -- 17.36 , -0.30888431890374 , -- 17.365 , -0.35145163113226 , -- 17.37 , -0.39033885127352 , -- 17.375 , -0.42469770664605 , -- 17.38 , -0.45371821850159 , -- 17.385 , -0.4767087589838 , -- 17.39 , -0.49316630884791 , -- 17.395 , -0.50283205552792 , -- 17.4 , -0.50572081737774 , -- 17.405 , -0.50212196719028 , -- 17.41 , -0.49256808518885 , -- 17.415 , -0.47777707225688 , -- 17.42 , -0.45857357564831 , -- 17.425 , -0.43580164741667 , -- 17.43 , -0.41024501009179 , -- 17.435 , -0.3825675139441 , -- 17.44 , -0.35328788816102 , -- 17.445 , -0.32279085797443 , -- 17.45 , -0.29137731320226 , -- 17.455 , -0.25933449326509 , -- 17.46 , -0.2270143702293 , -- 17.465 , -0.19489381305459 , -- 17.47 , -0.16360264699467 , -- 17.475 , -0.1339028594142 , -- 17.48 , -0.1066224111889 , -- 17.485 , -8.254834652459410E-02 , -- 17.49 , -6.230534889079800E-02 , -- 17.495 , -4.623541755964700E-02 , -- 17.5 , -3.430878641434340E-02 , -- 17.505 , -2.607920373761460E-02 , -- 17.51 , -2.069570607448080E-02 , -- 17.515 , -1.696571448514850E-02 , -- 17.52 , -1.346258488402600E-02 , -- 17.525 , -8.657687814216761E-03 , -- 17.53 , -1.066706267368470E-03 , -- 17.535 , 1.061426833550790E-02 , -- 17.54 , 2.738663947692650E-02 , -- 17.545 , 4.985546977711610E-02 , -- 17.55 , 7.816411304470480E-02 , -- 17.555 , 0.111966131087412 , -- 17.56 , 0.150434055062022 , -- 17.565 , 0.19231308509617 , -- 17.57 , 0.236013378779133 , -- 17.575 , 0.279746002917216 , -- 17.58 , 0.321684272405146 , -- 17.585 , 0.360138883852544 , -- 17.59 , 0.393718048669997 , -- 17.595 , 0.421452589177563 , -- 17.6 , 0.442859042866297 , -- 17.605 , 0.457932285135102 , -- 17.61 , 0.467063199142238 , -- 17.615 , 0.470901203329776 , -- 17.62 , 0.470183933061112 , -- 17.625 , 0.465570499510758 , -- 17.63 , 0.457509881267887 , -- 17.635 , 0.446170505322342 , -- 17.64 , 0.431441044905879 , -- 17.645 , 0.412997059132728 , -- 17.65 , 0.390417907394592 , -- 17.655 , 0.363320032948617 , -- 17.66 , 0.331482683771369 , -- 17.665 , 0.294935652090983 , -- 17.67 , 0.254001046090184 , -- 17.675 , 0.209280977845859 , -- 17.68 , 0.161607754445718 , -- 17.685 , 0.111965960430188 , -- 17.69 , 6.141586922651330E-02 , -- 17.695 , 1.102093548815530E-02 , -- 17.7 , -3.820203658969610E-02 , -- 17.705 , -8.531704155098779E-02 , -- 17.71 , -0.1294862669167 , -- 17.715 , -0.16998594459785 , -- 17.72 , -0.20622064042651 , -- 17.725 , -0.23774591935919 , -- 17.73 , -0.26428840511531 , -- 17.735 , -0.28576606331927 , -- 17.74 , -0.30229286763517 , -- 17.745 , -0.31416772926296 , -- 17.75 , -0.3218406535065 , -- 17.755 , -0.3258645654062 , -- 17.76 , -0.32683843068621 , -- 17.765 , -0.32535588224289 , -- 17.77 , -0.32196457829868 , -- 17.775 , -0.31715006731732 , -- 17.78 , -0.31133941077337 , -- 17.785 , -0.30492235408688 , -- 17.79 , -0.29827929738639 , -- 17.795 , -0.29180571311681 , -- 17.8 , -0.2859227673159 , -- 17.805 , -0.2810686116836 , -- 17.81 , -0.27767024271612 , -- 17.815 , -0.27609995179852 , -- 17.82 , -0.27662600365925 , -- 17.825 , -0.27936632736658 , -- 17.83 , -0.28425416349301 , -- 17.835 , -0.29102164261339 , -- 17.84 , -0.29920350847177 , -- 17.845 , -0.30815897987418 , -- 17.85 , -0.31710995942421 , -- 17.855 , -0.32518836729579 , -- 17.86 , -0.33149006868417 , -- 17.865 , -0.33512980995752 , -- 17.87 , -0.33529555909469 , -- 17.875 , -0.3312973400369 , -- 17.88 , -0.32261024125577 , -- 17.885 , -0.30890529900639 , -- 17.89 , -0.290070720818 , -- 17.895 , -0.26621431048452 , -- 17.9 , -0.23765242692415 , -- 17.905 , -0.20488114286083 , -- 17.91 , -0.16853769940936 , -- 17.915 , -0.12935252659241 , -- 17.92 , -8.810348127193721E-02 , -- 17.925 , -4.557141302171240E-02 , -- 17.93 , -2.513356389291560E-03 , -- 17.935 , 4.035724323904150E-02 , -- 17.94 , 8.237249752346711E-02 , -- 17.945 , 0.122904827481364 , -- 17.95 , 0.16135335850423 , -- 17.955 , 0.197135089796928 , -- 17.96 , 0.229680590055412 , -- 17.965 , 0.258445542327015 , -- 17.97 , 0.282931564681535 , -- 17.975 , 0.3027256078172 , -- 17.98 , 0.317544225316334 , -- 17.985 , 0.327282981257925 , -- 17.99 , 0.332055566875123 , -- 17.995 , 0.332219078215985 , -- 18.0 , 0.328372664764279 , -- 18.005 , 0.321327968541342 , -- 18.01 , 0.312046315167661 , -- 18.015 , 0.301552393558308 , -- 18.02 , 0.29083015000257 , -- 18.025 , 0.280717140577436 , -- 18.03 , 0.271812862742294 , -- 18.035 , 0.264416834319869 , -- 18.04 , 0.258507921567912 , -- 18.045 , 0.25377043717894 , -- 18.05 , 0.249664740892512 , -- 18.055 , 0.245531784942376 , -- 18.06 , 0.240715666971269 , -- 18.065 , 0.234683989615924 , -- 18.07 , 0.227126896191005 , -- 18.075 , 0.218018915200585 , -- 18.08 , 0.207635259720329 , -- 18.085 , 0.196519817484055 , -- 18.09 , 0.185413864456323 , -- 18.095 , 0.175156074068905 , -- 18.1 , 0.166570903921847 , -- 18.105 , 0.160362276331594 , -- 18.11 , 0.157026715204937 , -- 18.115 , 0.156797444080986 , -- 18.12 , 0.159624455669982 , -- 18.125 , 0.16519187224497 , -- 18.13 , 0.172968089200864 , -- 18.135 , 0.1822813476427 , -- 18.14 , 0.192409206882619 , -- 18.145 , 0.202670276399768 , -- 18.15 , 0.212504752944377 , -- 18.155 , 0.221533110089593 , -- 18.16 , 0.229583054017435 , -- 18.165 , 0.236681693233947 , -- 18.17 , 0.24301317231324 , -- 18.175 , 0.248850323481097 , -- 18.18 , 0.254471744041749 , -- 18.185 , 0.260080804366178 , -- 18.19 , 0.265741889443548 , -- 18.195 , 0.27134643214208 , -- 18.2 , 0.276614811069614 , -- 18.205 , 0.281132591864889 , -- 18.21 , 0.284412543870369 , -- 18.215 , 0.285966261493111 , -- 18.22 , 0.28537109719781 , -- 18.225 , 0.282316011041418 , -- 18.23 , 0.276621372715182 , -- 18.235 , 0.268228573189369 , -- 18.24 , 0.257171332184819 , -- 18.245 , 0.243536231265936 , -- 18.25 , 0.227433656521336 , -- 18.255 , 0.208982058948683 , -- 18.26 , 0.188316971988387 , -- 18.265 , 0.165617801602736 , -- 18.27 , 0.141146408794358 , -- 18.275 , 0.115280086715596 , -- 18.28 , 8.852986599304000E-02 , -- 18.285 , 6.153122175946150E-02 , -- 18.29 , 3.501087677361560E-02 , -- 18.295 , 9.728375745511450E-03 , -- 18.3 , -1.358945599970610E-02 , -- 18.305 , -3.431372431462720E-02 , -- 18.31 , -5.195992570184670E-02 , -- 18.315 , -6.621459033346280E-02 , -- 18.32 , -7.693590669330690E-02 , -- 18.325 , -8.413813135115721E-02 , -- 18.33 , -8.796246104481401E-02 , -- 18.335 , -8.865026558137970E-02 , -- 18.34 , -8.651948855745679E-02 , -- 18.345 , -8.194991749053140E-02 , -- 18.35 , -7.537263942731640E-02 , -- 18.355 , -6.726122085666700E-02 , -- 18.36 , -5.811712688388060E-02 , -- 18.365 , -4.844978592925620E-02 , -- 18.37 , -3.874961154322750E-02 , -- 18.375 , -2.946321539637920E-02 , -- 18.38 , -2.097389378477130E-02 , -- 18.385 , -1.359774681728760E-02 , -- 18.39 , -7.592927023032140E-03 , -- 18.395 , -3.182771456432360E-03 , -- 18.4 , -5.797783397815400E-04 , -- 18.405 , -3.403899532317900E-06 , -- 18.41 , -1.673453644507240E-03 , -- 18.415 , -5.782448384807060E-03 , -- 18.42 , -1.244176672900140E-02 , -- 18.425 , -2.161800758848600E-02 , -- 18.43 , -3.307323100644420E-02 , -- 18.435 , -4.633260284878780E-02 , -- 18.44 , -6.069252068692880E-02 , -- 18.445 , -7.527964829315580E-02 , -- 18.45 , -8.915230216299309E-02 , -- 18.455 , -0.10143296879817 , -- 18.46 , -0.11144311748952 , -- 18.465 , -0.11881688272356 , -- 18.47 , -0.12356683521081 , -- 18.475 , -0.12609239258508 , -- 18.48 , -0.12712667509216 , -- 18.485 , -0.12763705192334 , -- 18.49 , -0.12869455777906 , -- 18.495 , -0.13134291006952 , -- 18.5 , -0.13648385782305 , -- 18.505 , -0.14479654925278 , -- 18.51 , -0.15669435068272 , -- 18.515 , -0.17231899455012 , -- 18.52 , -0.19156053351027 , -- 18.525 , -0.2140948418449 , -- 18.53 , -0.23942532421762 , -- 18.535 , -0.26692808116807 , -- 18.54 , -0.29589366741626 , -- 18.545 , -0.32556987300455 , -- 18.55 , -0.35520167089443 , -- 18.555 , -0.38407157568151 , -- 18.56 , -0.41153207462536 , -- 18.565 , -0.43702839771631 , -- 18.57 , -0.46010162556848 , -- 18.575 , -0.4803753536196 , -- 18.58 , -0.49752469104796 , -- 18.585 , -0.51123932275576 , -- 18.59 , -0.52119100580172 , -- 18.595 , -0.52702031860061 , -- 18.6 , -0.52835074084744 , -- 18.605 , -0.52483178107225 , -- 18.61 , -0.51620504117931 , -- 18.615 , -0.50237569943468 , -- 18.62 , -0.4834730346886 , -- 18.625 , -0.45987873870396 , -- 18.63 , -0.43221396453591 , -- 18.635 , -0.40128199130244 , -- 18.64 , -0.36797809251035 , -- 18.645 , -0.33318247540211 , -- 18.65 , -0.2976655847206 , -- 18.655 , -0.26201863587465 , -- 18.66 , -0.22662902367112 , -- 18.665 , -0.19169728326541 , -- 18.67 , -0.15729264669158 , -- 18.675 , -0.1234229501959 , -- 18.68 , -9.010582719609091E-02 , -- 18.685 , -5.741817970014060E-02 , -- 18.69 , -2.552248385036910E-02 , -- 18.695 , 5.339196527069970E-03 , -- 18.7 , 3.486712311982680E-02 , -- 18.705 , 6.273660435450590E-02 , -- 18.71 , 8.862290998998250E-02 , -- 18.715 , 0.112218745947816 , -- 18.72 , 0.133237764611335 , -- 18.725 , 0.151417354399901 , -- 18.73 , 0.166520793732197 , -- 18.735 , 0.178358092928635 , -- 18.74 , 0.186819039757722 , -- 18.745 , 0.191918879888126 , -- 18.75 , 0.193841382081441 , -- 18.755 , 0.192966026117615 , -- 18.76 , 0.189861849245228 , -- 18.765 , 0.185243424802453 , -- 18.77 , 0.179886808055877 , -- 18.775 , 0.174523130427245 , -- 18.78 , 0.169727209876345 , -- 18.785 , 0.165828266795135 , -- 18.79 , 0.162860717438664 , -- 18.795 , 0.160568509105303 , -- 18.8 , 0.158460262202499 , -- 18.805 , 0.155903588032585 , -- 18.81 , 0.152236721793017 , -- 18.815 , 0.146874335438137 , -- 18.82 , 0.139388100075902 , -- 18.825 , 0.129551248829624 , -- 18.83 , 0.117346184292776 , -- 18.835 , 0.102944396398025 , -- 18.84 , 8.667203203856250E-02 , -- 18.845 , 6.897292950992250E-02 , -- 18.85 , 5.037981195577830E-02 , -- 18.855 , 3.149222301298260E-02 , -- 18.86 , 1.295788909713510E-02 , -- 18.865 , -4.552694712540460E-03 , -- 18.87 , -2.038471143298640E-02 , -- 18.875 , -3.395374370024890E-02 , -- 18.88 , -4.480974308295430E-02 , -- 18.885 , -5.269874412847760E-02 , -- 18.89 , -5.760475116618620E-02 , -- 18.895 , -5.975782869643340E-02 , -- 18.9 , -5.959990728708000E-02 , -- 18.905 , -5.771202182665640E-02 , -- 18.91 , -5.471620957553570E-02 , -- 18.915 , -5.117481281717030E-02 , -- 18.92 , -4.751155121434680E-02 , -- 18.925 , -4.397377050356170E-02 , -- 18.93 , -4.064613036051550E-02 , -- 18.935 , -3.750986634275660E-02 , -- 18.94 , -3.453164301123860E-02 , -- 18.945 , -3.175456679161500E-02 , -- 18.95 , -2.936540580184520E-02 , -- 18.955 , -2.771540773125420E-02 , -- 18.96 , -2.728673446781490E-02 , -- 18.965 , -2.860928038065850E-02 , -- 18.97 , -3.214733887015950E-02 , -- 18.975 , -3.818284412564310E-02 , -- 18.98 , -4.672302188795090E-02 , -- 18.985 , -5.745461744704080E-02 , -- 18.99 , -6.975424591801779E-02 , -- 18.995 , -8.275205425474760E-02 , -- 19.0 , -9.543348500501039E-02 , -- 19.005 , -0.10675671144965 , -- 19.01 , -0.11576388175306 , -- 19.015 , -0.12166743333762 , -- 19.02 , -0.12390264431233 , -- 19.025 , -0.12214656117846 , -- 19.03 , -0.11631154879176 , -- 19.035 , -0.10652423304446 , -- 19.04 , -9.310118520163460E-02 , -- 19.045 , -7.652590539072700E-02 , -- 19.05 , -5.743089586506230E-02 , -- 19.055 , -3.657596705689010E-02 , -- 19.06 , -1.481925977005460E-02 , -- 19.065 , 6.926924474783110E-03 , -- 19.07 , 2.775463368340260E-02 , -- 19.075 , 4.683156424739500E-02 , -- 19.08 , 6.347270763070770E-02 , -- 19.085 , 7.720227146370970E-02 , -- 19.09 , 8.779042470764520E-02 , -- 19.095 , 9.526029188212271E-02 , -- 19.1 , 9.986040447199600E-02 , -- 19.105 , 0.102009856725406 , -- 19.11 , 0.102225525300876 , -- 19.115 , 0.101047428528718 , -- 19.12 , 9.897427931868839E-02 , -- 19.125 , 9.642072648080460E-02 , -- 19.13 , 9.369918170530429E-02 , -- 19.135 , 9.102713402201090E-02 , -- 19.14 , 8.855073690832560E-02 , -- 19.145 , 8.637784747202421E-02 , -- 19.15 , 8.460889194052530E-02 , -- 19.155 , 8.335969452805890E-02 , -- 19.16 , 8.277035792073900E-02 , -- 19.165 , 8.300094888178290E-02 , -- 19.17 , 8.421449446395760E-02 , -- 19.175 , 8.655290215462839E-02 , -- 19.18 , 9.010941198122500E-02 , -- 19.185 , 9.490288969345520E-02 , -- 19.19 , 0.100856185025776 , -- 19.195 , 0.107783589409055 , -- 19.2 , 0.115386291208123 , -- 19.205 , 0.123260349877366 , -- 19.21 , 0.130913935378 , -- 19.215 , 0.137796521245135 , -- 19.22 , 0.143335849367096 , -- 19.225 , 0.14698030532155 , -- 19.23 , 0.148242029288944 , -- 19.235 , 0.146735661784648 , -- 19.24 , 0.142208324703231 , -- 19.245 , 0.134556865273917 , -- 19.25 , 0.123832305128576 , -- 19.255 , 0.110231039547548 , -- 19.26 , 9.407703422254150E-02 , -- 19.265 , 7.579763962651660E-02 , -- 19.27 , 5.589930332000480E-02 , -- 19.275 , 3.494345559651580E-02 , -- 19.28 , 1.352655612925890E-02 , -- 19.285 , -7.738281430620860E-03 , -- 19.29 , -2.823640126172170E-02 , -- 19.295 , -4.736851280459840E-02 , -- 19.3 , -6.456726778946650E-02 , -- 19.305 , -7.931522042729799E-02 , -- 19.31 , -9.116146754991310E-02 , -- 19.315 , -9.973543395603350E-02 , -- 19.32 , -0.10475595669325 , -- 19.325 , -0.10603430822357 , -- 19.33 , -0.10347284701214 , -- 19.335 , -9.706124752024230E-02 , -- 19.34 , -8.687430152469530E-02 , -- 19.345 , -7.307405512475940E-02 , -- 19.35 , -5.591887411984520E-02 , -- 19.355 , -3.577706479529710E-02 , -- 19.36 , -1.314335388833300E-02 , -- 19.365 , 1.134983613684490E-02 , -- 19.37 , 3.693079681400050E-02 , -- 19.375 , 6.270474265740390E-02 , -- 19.38 , 8.768905345507640E-02 , -- 19.385 , 0.1108686368144 , -- 19.39 , 0.1312644416171 , -- 19.395 , 0.148009041167522 , -- 19.4 , 0.160416739422417 , -- 19.405 , 0.168040427167663 , -- 19.41 , 0.170704607506662 , -- 19.415 , 0.168512624998284 , -- 19.42 , 0.161826470167071 , -- 19.425 , 0.151223327305197 , -- 19.43 , 0.137436526462059 , -- 19.435 , 0.12128787067038 , -- 19.44 , 0.103621500126964 , -- 19.445 , 8.524411667406280E-02 , -- 19.45 , 6.687930552254420E-02 , -- 19.455 , 4.913589731864990E-02 , -- 19.46 , 3.249281642772610E-02 , -- 19.465 , 1.729796363375550E-02 , -- 19.47 , 3.779772699936010E-03 , -- 19.475 , -7.933453913126739E-03 , -- 19.48 , -1.778837362450150E-02 , -- 19.485 , -2.578180319663970E-02 , -- 19.49 , -3.193743546434960E-02 , -- 19.495 , -3.628975661666560E-02 , -- 19.5 , -3.887558954382360E-02 , -- 19.505 , -3.973470241057670E-02 , -- 19.51 , -3.891788867951480E-02 , -- 19.515 , -3.649986139114820E-02 , -- 19.52 , -3.259249709820460E-02 , -- 19.525 , -2.735427053548850E-02 , -- 19.53 , -2.099133842643200E-02 , -- 19.535 , -1.374830536741160E-02 , -- 19.54 , -5.887877188928280E-03 , -- 19.545 , 2.336959611728440E-03 , -- 19.55 , 1.071436148192050E-02 , -- 19.555 , 1.910203440373310E-02 , -- 19.56 , 2.744608047788240E-02 , -- 19.565 , 3.578603089731680E-02 , -- 19.57 , 4.424249115467690E-02 , -- 19.575 , 5.298918396292150E-02 , -- 19.58 , 6.221237826554930E-02 , -- 19.585 , 7.206505940082400E-02 , -- 19.59 , 8.262287004060030E-02 , -- 19.595 , 9.385089818082880E-02 , -- 19.6 , 0.105586535210159 , -- 19.605 , 0.117542979202558 , -- 19.61 , 0.129332330456747 , -- 19.615 , 0.140505656304056 , -- 19.62 , 0.150602470682144 , -- 19.625 , 0.159201510072528 , -- 19.63 , 0.165963272203869 , -- 19.635 , 0.170657754779367 , -- 19.64 , 0.173171986392552 , -- 19.645 , 0.173497060176099 , -- 19.65 , 0.171698563869022 , -- 19.655 , 0.167877117650055 , -- 19.66 , 0.162128958008132 , -- 19.665 , 0.154515020640188 , -- 19.67 , 0.145047978425579 , -- 19.675 , 0.133699089240968 , -- 19.68 , 0.120425826006013 , -- 19.685 , 0.105211954035009 , -- 19.69 , 8.811482794436119E-02 , -- 19.695 , 6.930362885349300E-02 , -- 19.7 , 4.908317786948910E-02 , -- 19.705 , 2.789284466062680E-02 , -- 19.71 , 6.282684187232620E-03 , -- 19.715 , -1.513293891731910E-02 , -- 19.72 , -3.573219349475490E-02 , -- 19.725 , -5.494565996060560E-02 , -- 19.73 , -7.230331792209500E-02 , -- 19.735 , -8.746611435403620E-02 , -- 19.74 , -0.10023408196077 , -- 19.745 , -0.11053680897542 , -- 19.75 , -0.11840927699064 , -- 19.755 , -0.12396609115553 , -- 19.76 , -0.12737940482213 , -- 19.765 , -0.12886942680431 , -- 19.77 , -0.12870508549978 , -- 19.775 , -0.12721486235372 , -- 19.78 , -0.12479696224801 , -- 19.785 , -0.12192134851853 , -- 19.79 , -0.11911512331687 , -- 19.795 , -0.11692852296234 , -- 19.8 , -0.1158828122011 , -- 19.805 , -0.11640862718208 , -- 19.81 , -0.11878469144379 , -- 19.815 , -0.12309145404105 , -- 19.82 , -0.12918833366224 , -- 19.825 , -0.13672125838288 , -- 19.83 , -0.14515938284391 , -- 19.835 , -0.15385497532022 , -- 19.84 , -0.16211467849934 , -- 19.845 , -0.16927092799142 , -- 19.85 , -0.1747405815055 , -- 19.855 , -0.17806542050622 , -- 19.86 , -0.17893075004105 , -- 19.865 , -0.17716517197334 , -- 19.87 , -0.1727273398208 , -- 19.875 , -0.16568659834495 , -- 19.88 , -0.15620370102824 , -- 19.885 , -0.14451379659869 , -- 19.89 , -0.13091402606184 , -- 19.895 , -0.11575112780621 , -- 19.9 , -9.940839096806510E-02 , -- 19.905 , -8.228798219382000E-02 , -- 19.91 , -6.479104079602420E-02 , -- 19.915 , -4.729626907194930E-02 , -- 19.92 , -3.014389625728430E-02 , -- 19.925 , -1.362770379699480E-02 , -- 19.93 , 1.998432435284760E-03 , -- 19.935 , 1.650283145918720E-02 , -- 19.94 , 2.964895620060110E-02 , -- 19.945 , 4.116860136833410E-02 , -- 19.95 , 5.074351304162170E-02 , -- 19.955 , 5.800645031803000E-02 , -- 19.96 , 6.256532313956960E-02 , -- 19.965 , 6.405233292472851E-02 , -- 19.97 , 6.218959865152200E-02 , -- 19.975 , 5.686184515599930E-02 , -- 19.98 , 4.817972906533240E-02 , -- 19.985 , 3.651967859402010E-02 , -- 19.99 , 2.252985493696160E-02 , -- 19.995 , 7.097071756102240E-03 , -- 20.0 , -8.721812839652310E-03 , -- 20.005 , -2.379447424676810E-02 , -- 20.01 , -3.701839037090120E-02 , -- 20.015 , -4.742092878891140E-02 , -- 20.02 , -5.423951270215350E-02 , -- 20.025 , -5.697258922350620E-02 , -- 20.03 , -5.539776158916270E-02 , -- 20.035 , -4.956057087520670E-02 , -- 20.04 , -3.974179526714170E-02 , -- 20.045 , -2.641288342533750E-02 , -- 20.05 , -1.019081782994870E-02 , -- 20.055 , 8.202447545571230E-03 , -- 20.06 , 2.797116679219240E-02 , -- 20.065 , 4.827036868959560E-02 , -- 20.07 , 6.822566739672180E-02 , -- 20.075 , 8.695562572496580E-02 , -- 20.08 , 0.103598292547575 , -- 20.085 , 0.117345557097572 , -- 20.09 , 0.127481089438341 , -- 20.095 , 0.133420394415517 , -- 20.1 , 0.134744188882336 , -- 20.105 , 0.131221676654994 , -- 20.11 , 0.122818973076751 , -- 20.115 , 0.109691680974573 , -- 20.12 , 9.216522604322611E-02 , -- 20.125 , 7.070600814518090E-02 , -- 20.13 , 4.589147778332150E-02 , -- 20.135 , 1.838180387523030E-02 , -- 20.14 , -1.110108370552780E-02 , -- 20.145 , -4.178877084026370E-02 , -- 20.15 , -7.287571484484311E-02 , -- 20.155 , -0.10352963470195 , -- 20.16 , -0.13290387884342 , -- 20.165 , -0.16015839093613 , -- 20.17 , -0.18448715088686 , -- 20.175 , -0.20515328670567 , -- 20.18 , -0.22152568111903 , -- 20.185 , -0.23311328473587 , -- 20.19 , -0.23959100455607 , -- 20.195 , -0.24081433909493 , -- 20.2 , -0.23682050088862 , -- 20.205 , -0.22781739014645 , -- 20.21 , -0.21416412518464 , -- 20.215 , -0.19634582016096 , -- 20.22 , -0.17494767238438 , -- 20.225 , -0.15062916150452 , -- 20.23 , -0.12410162176008 , -- 20.235 , -9.610482601536199E-02 , -- 20.24 , -6.738446390246500E-02 , -- 20.245 , -3.866506506796110E-02 , -- 20.25 , -1.062408132283030E-02 , -- 20.255 , 1.613821656425260E-02 , -- 20.26 , 4.112363448240460E-02 , -- 20.265 , 6.395563455415000E-02 , -- 20.27 , 8.438638743734070E-02 , -- 20.275 , 0.10229225024046 , -- 20.28 , 0.11765525248804 , -- 20.285 , 0.13053719119583 , -- 20.29 , 0.141047644803831 , -- 20.295 , 0.14931741898274 , -- 20.3 , 0.155478926240496 , -- 20.305 , 0.159660339201315 , -- 20.31 , 0.161990227205732 , -- 20.315 , 0.162612590283051 , -- 20.32 , 0.161703234926074 , -- 20.325 , 0.159483350064339 , -- 20.33 , 0.156221155279841 , -- 20.335 , 0.152221918187124 , -- 20.34 , 0.147804677752111 , -- 20.345 , 0.143271172359312 , -- 20.35 , 0.138873332096741 , -- 20.355 , 0.134787926819641 , -- 20.36 , 0.131103697853831 , -- 20.365 , 0.127825557460833 , -- 20.37 , 0.12489405648423 , -- 20.375 , 0.122216684366155 , -- 20.38 , 0.119703338338164 , -- 20.385 , 0.117298332826065 , -- 20.39 , 0.115002111347558 , -- 20.395 , 0.1128792665639 , -- 20.4 , 0.111051600017025 , -- 20.405 , 0.109680624221402 , -- 20.41 , 0.108942958893076 , -- 20.415 , 0.109006468464252 , -- 20.42 , 0.110010955231372 , -- 20.425 , 0.112056904842183 , -- 20.43 , 0.115202427994996 , -- 20.435 , 0.119466647868312 , -- 20.44 , 0.124835559019734 , -- 20.445 , 0.131267773242386 , -- 20.45 , 0.138696105432056 , -- 20.455 , 0.14702533406325 , -- 20.46 , 0.156125727838975 , -- 20.465 , 0.165825042690333 , -- 20.47 , 0.0 , -- ), -- INTERPOL='LIN', -- PROL_DROITE='CONSTANT', -- PROL_GAUCHE='EXCLU',); -- -- --ACCELV1=DEFI_FONCTION(NOM_PARA='INST', -- VALE= --( -- 0.0 , 0.0 , -- 1.000000000000000E-02 , 1.310000000000000E-03 , -- 2.000000000000000E-02 , 7.200000000000000E-04 , -- 3.000000000000000E-02 , -1.160000000000000E-03 , -- 4.000000000000000E-02 , -4.010000000000000E-03 , -- 5.000000000000000E-02 , -8.580000000000001E-03 , -- 6.000000000000000E-02 , -1.459000000000000E-02 , -- 7.000000000000001E-02 , -1.920000000000000E-02 , -- 8.000000000000000E-02 , -1.947000000000000E-02 , -- 9.000000000000000E-02 , -1.781000000000000E-02 , -- 0.1 , -1.970000000000000E-02 , -- 0.11 , -2.520000000000000E-02 , -- 0.12 , -3.281000000000000E-02 , -- 0.13 , -4.377000000000000E-02 , -- 0.14 , -5.504000000000000E-02 , -- 0.15 , -5.797000000000000E-02 , -- 0.16 , -4.627000000000000E-02 , -- 0.17 , -2.536000000000000E-02 , -- 0.18 , -6.700000000000000E-03 , -- 0.19 , 7.849999999999999E-03 , -- 0.2 , 2.168000000000000E-02 , -- 0.21 , 3.643000000000000E-02 , -- 0.22 , 5.686000000000000E-02 , -- 0.23 , 8.019999999999999E-02 , -- 0.24 , 8.942000000000000E-02 , -- 0.25 , 7.790000000000000E-02 , -- 0.26 , 6.301000000000000E-02 , -- 0.27 , 5.860000000000000E-02 , -- 0.28 , 5.444000000000000E-02 , -- 0.29 , 3.314000000000000E-02 , -- 0.3 , -4.730000000000000E-03 , -- 0.31 , -3.492000000000000E-02 , -- 0.32 , -3.413000000000000E-02 , -- 0.33 , -7.530000000000000E-03 , -- 0.34 , 1.991000000000000E-02 , -- 0.35 , 2.983000000000000E-02 , -- 0.36 , 2.482000000000000E-02 , -- 0.37 , 1.676000000000000E-02 , -- 0.38 , 4.890000000000000E-03 , -- 0.39 , -1.521000000000000E-02 , -- 0.4 , -3.575000000000000E-02 , -- 0.41 , -5.053000000000000E-02 , -- 0.42 , -6.325000000000000E-02 , -- 0.43 , -7.273000000000000E-02 , -- 0.44 , -7.520000000000000E-02 , -- 0.45 , -8.463000000000000E-02 , -- 0.46 , -0.11597 , -- 0.47 , -0.1564 , -- 0.48 , -0.18027 , -- 0.49 , -0.17201 , -- 0.5 , -0.13845 , -- 0.51 , -0.1016 , -- 0.52 , -6.390999999999999E-02 , -- 0.53 , -1.035000000000000E-02 , -- 0.54 , 5.961000000000000E-02 , -- 0.55 , 0.12972 , -- 0.56 , 0.18788 , -- 0.57 , 0.23015 , -- 0.58 , 0.23082 , -- 0.59 , 0.1643 , -- 0.6 , 6.750000000000000E-02 , -- 0.61 , 7.450000000000000E-03 , -- 0.62 , 1.664000000000000E-02 , -- 0.63 , 8.058000000000000E-02 , -- 0.64 , 0.15546 , -- 0.65 , 0.2133 , -- 0.66 , 0.24265 , -- 0.67 , 0.21922 , -- 0.68 , 0.1295 , -- 0.69 , 1.220000000000000E-03 , -- 0.7 , -0.12397 , -- 0.71 , -0.1882 , -- 0.72 , -0.17059 , -- 0.73 , -0.11119 , -- 0.74 , -9.375000000000000E-02 , -- 0.75 , -0.15419 , -- 0.76 , -0.21371 , -- 0.77 , -0.19269 , -- 0.78 , -0.12556 , -- 0.79 , -8.054000000000000E-02 , -- 0.8 , -5.658000000000000E-02 , -- 0.81 , -2.563000000000000E-02 , -- 0.82 , -1.082000000000000E-02 , -- 0.83 , -6.067000000000000E-02 , -- 0.84 , -0.16876 , -- 0.85 , -0.26933 , -- 0.86 , -0.31693 , -- 0.87 , -0.3189 , -- 0.88 , -0.31999 , -- 0.89 , -0.32387 , -- 0.9 , -0.35623 , -- 0.91 , -0.38483 , -- 0.92 , -0.36307 , -- 0.93 , -0.29278 , -- 0.94 , -0.18821 , -- 0.95 , -6.119000000000000E-02 , -- 0.96 , 3.932000000000000E-02 , -- 0.97 , 7.092000000000000E-02 , -- 0.98 , 3.394000000000000E-02 , -- 0.99 , 1.056000000000000E-02 , -- 1.0 , 3.006000000000000E-02 , -- 1.01 , 4.384000000000000E-02 , -- 1.02 , 1.582000000000000E-02 , -- 1.03 , -2.452000000000000E-02 , -- 1.04 , -3.991000000000000E-02 , -- 1.05 , -4.053000000000000E-02 , -- 1.06 , -4.416000000000000E-02 , -- 1.07 , -6.185000000000000E-02 , -- 1.08 , -0.10165 , -- 1.09 , -0.13542 , -- 1.1 , -0.142 , -- 1.11 , -0.13819 , -- 1.12 , -0.13187 , -- 1.13 , -0.11765 , -- 1.14 , -8.853000000000000E-02 , -- 1.15 , -4.957000000000000E-02 , -- 1.16 , -2.751000000000000E-02 , -- 1.17 , -4.837000000000000E-02 , -- 1.18 , -0.11303 , -- 1.19 , -0.16115 , -- 1.2 , -0.1365 , -- 1.21 , -9.369000000000000E-02 , -- 1.22 , -0.10681 , -- 1.23 , -0.16911 , -- 1.24 , -0.23593 , -- 1.25 , -0.27067 , -- 1.26 , -0.27471 , -- 1.27 , -0.25731 , -- 1.28 , -0.19103 , -- 1.29 , -7.716000000000001E-02 , -- 1.3 , 1.100000000000000E-03 , -- 1.31 , -4.582000000000000E-02 , -- 1.32 , -0.19352 , -- 1.33 , -0.32144 , -- 1.34 , -0.37399 , -- 1.35 , -0.40308 , -- 1.36 , -0.45452 , -- 1.37 , -0.51071 , -- 1.38 , -0.52231 , -- 1.39 , -0.45018 , -- 1.4 , -0.30537 , -- 1.41 , -0.15517 , -- 1.42 , -7.362000000000000E-02 , -- 1.43 , -9.615000000000000E-02 , -- 1.44 , -0.17148 , -- 1.45 , -0.17476 , -- 1.46 , -8.399000000000000E-02 , -- 1.47 , -2.696000000000000E-02 , -- 1.48 , -6.808000000000000E-02 , -- 1.49 , -0.12817 , -- 1.5 , -0.12265 , -- 1.51 , -6.149000000000000E-02 , -- 1.52 , -8.380000000000000E-03 , -- 1.53 , 1.139000000000000E-02 , -- 1.54 , 5.830000000000000E-03 , -- 1.55 , -2.002000000000000E-02 , -- 1.56 , -3.584000000000000E-02 , -- 1.57 , -1.060000000000000E-03 , -- 1.58 , 6.028000000000000E-02 , -- 1.59 , 8.509000000000000E-02 , -- 1.6 , 9.515000000000000E-02 , -- 1.61 , 0.14372 , -- 1.62 , 0.17863 , -- 1.63 , 0.16098 , -- 1.64 , 0.15227 , -- 1.65 , 0.16265 , -- 1.66 , 0.1009 , -- 1.67 , -8.347000000000000E-02 , -- 1.68 , -0.28571 , -- 1.69 , -0.3845 , -- 1.7 , -0.42649 , -- 1.71 , -0.48045 , -- 1.72 , -0.48546 , -- 1.73 , -0.34744 , -- 1.74 , -4.460000000000000E-02 , -- 1.75 , 0.31704 , -- 1.76 , 0.56244 , -- 1.77 , 0.61288 , -- 1.78 , 0.56235 , -- 1.79 , 0.56046 , -- 1.8 , 0.58601 , -- 1.81 , 0.50428 , -- 1.82 , 0.34783 , -- 1.83 , 0.2707 , -- 1.84 , 0.32579 , -- 1.85 , 0.43838 , -- 1.86 , 0.49734 , -- 1.87 , 0.46993 , -- 1.88 , 0.42104 , -- 1.89 , 0.39656 , -- 1.9 , 0.37011 , -- 1.91 , 0.3211 , -- 1.92 , 0.27122 , -- 1.93 , 0.2175 , -- 1.94 , 0.1251 , -- 1.95 , 3.090000000000000E-03 , -- 1.96 , -9.401000000000000E-02 , -- 1.97 , -0.13751 , -- 1.98 , -0.12623 , -- 1.99 , -3.147000000000000E-02 , -- 2.0 , 0.15999 , -- 2.01 , 0.39077 , -- 2.02 , 0.57348 , -- 2.03 , 0.61086 , -- 2.04 , 0.4807 , -- 2.05 , 0.29864 , -- 2.06 , 0.18108 , -- 2.07 , 0.167 , -- 2.08 , 0.23579 , -- 2.09 , 0.28543 , -- 2.1 , 0.21887 , -- 2.11 , 6.136000000000000E-02 , -- 2.12 , -8.754000000000001E-02 , -- 2.13 , -0.18795 , -- 2.14 , -0.28217 , -- 2.15 , -0.39328 , -- 2.16 , -0.47351 , -- 2.17 , -0.45659 , -- 2.18 , -0.38611 , -- 2.19 , -0.40359 , -- 2.2 , -0.49671 , -- 2.21 , -0.47831 , -- 2.22 , -0.24834 , -- 2.23 , 9.692000000000001E-02 , -- 2.24 , 0.36832 , -- 2.25 , 0.49779 , -- 2.26 , 0.55588 , -- 2.27 , 0.55074 , -- 2.28 , 0.47652 , -- 2.29 , 0.42596 , -- 2.3 , 0.45439 , -- 2.31 , 0.4758 , -- 2.32 , 0.36011 , -- 2.33 , 9.916999999999999E-02 , -- 2.34 , -0.22081 , -- 2.35 , -0.53559 , -- 2.36 , -0.73055 , -- 2.37 , -0.68219 , -- 2.38 , -0.46512 , -- 2.39 , -0.29795 , -- 2.4 , -0.29155 , -- 2.41 , -0.37205 , -- 2.42 , -0.45321 , -- 2.43 , -0.52678 , -- 2.44 , -0.53549 , -- 2.45 , -0.39903 , -- 2.46 , -0.17073 , -- 2.47 , 4.007000000000000E-02 , -- 2.48 , 0.19098 , -- 2.49 , 0.23016 , -- 2.5 , 0.11487 , -- 2.51 , -3.277000000000000E-02 , -- 2.52 , -2.678000000000000E-02 , -- 2.53 , 0.14456 , -- 2.54 , 0.33564 , -- 2.55 , 0.43459 , -- 2.56 , 0.47636 , -- 2.57 , 0.56106 , -- 2.58 , 0.69871 , -- 2.59 , 0.78021 , -- 2.6 , 0.69033 , -- 2.61 , 0.48738 , -- 2.62 , 0.37542 , -- 2.63 , 0.44792 , -- 2.64 , 0.63115 , -- 2.65 , 0.80303 , -- 2.66 , 0.86913 , -- 2.67 , 0.81861 , -- 2.68 , 0.67639 , -- 2.69 , 0.44981 , -- 2.7 , 0.19577 , -- 2.71 , 1.762000000000000E-02 , -- 2.72 , -7.475000000000000E-02 , -- 2.73 , -0.18543 , -- 2.74 , -0.31712 , -- 2.75 , -0.30763 , -- 2.76 , -5.022000000000000E-02 , -- 2.77 , 0.36264 , -- 2.78 , 0.71418 , -- 2.79 , 0.86474 , -- 2.8 , 0.91391 , -- 2.81 , 0.97578 , -- 2.82 , 0.99997 , -- 2.83 , 0.90663 , -- 2.84 , 0.71448 , -- 2.85 , 0.55982 , -- 2.86 , 0.55183 , -- 2.87 , 0.63744 , -- 2.88 , 0.70292 , -- 2.89 , 0.68299 , -- 2.9 , 0.58616 , -- 2.91 , 0.47484 , -- 2.92 , 0.38822 , -- 2.93 , 0.3229 , -- 2.94 , 0.25296 , -- 2.95 , 0.16705 , -- 2.96 , 0.10044 , -- 2.97 , 7.353000000000000E-02 , -- 2.98 , 4.790000000000000E-02 , -- 2.99 , -3.974000000000000E-02 , -- 3.0 , -0.21989 , -- 3.01 , -0.43388 , -- 3.02 , -0.59094 , -- 3.03 , -0.68752 , -- 3.04 , -0.77344 , -- 3.05 , -0.84165 , -- 3.06 , -0.87592 , -- 3.07 , -0.92165 , -- 3.08 , -0.98681 , -- 3.09 , -0.9813 , -- 3.1 , -0.85134 , -- 3.11 , -0.71226 , -- 3.12 , -0.70318 , -- 3.13 , -0.73062 , -- 3.14 , -0.63434 , -- 3.15 , -0.49621 , -- 3.16 , -0.46434 , -- 3.17 , -0.4895 , -- 3.18 , -0.43989 , -- 3.19 , -0.297 , -- 3.2 , -0.12264 , -- 3.21 , 5.685000000000000E-02 , -- 3.22 , 0.20721 , -- 3.23 , 0.29127 , -- 3.24 , 0.37167 , -- 3.25 , 0.47314 , -- 3.26 , 0.48428 , -- 3.27 , 0.34199 , -- 3.28 , 0.14378 , -- 3.29 , 2.014000000000000E-02 , -- 3.3 , -3.310000000000000E-03 , -- 3.31 , 3.046000000000000E-02 , -- 3.32 , 7.851000000000000E-02 , -- 3.33 , 0.1222 , -- 3.34 , 0.19291 , -- 3.35 , 0.2916 , -- 3.36 , 0.38011 , -- 3.37 , 0.46514 , -- 3.38 , 0.52328 , -- 3.39 , 0.51669 , -- 3.4 , 0.4727 , -- 3.41 , 0.38682 , -- 3.42 , 0.22939 , -- 3.43 , 1.800000000000000E-02 , -- 3.44 , -0.199 , -- 3.45 , -0.40018 , -- 3.46 , -0.5733 , -- 3.47 , -0.72332 , -- 3.48 , -0.82419 , -- 3.49 , -0.83348 , -- 3.5 , -0.74258 , -- 3.51 , -0.61694 , -- 3.52 , -0.56099 , -- 3.53 , -0.61112 , -- 3.54 , -0.71023 , -- 3.55 , -0.78959 , -- 3.56 , -0.85129 , -- 3.57 , -0.93566 , -- 3.58 , -0.99997 , -- 3.59 , -0.92052 , -- 3.6 , -0.6664 , -- 3.61 , -0.3873 , -- 3.62 , -0.25033 , -- 3.63 , -0.24161 , -- 3.64 , -0.18701 , -- 3.65 , 9.379999999999999E-03 , -- 3.66 , 0.11381 , -- 3.67 , 0.16743 , -- 3.68 , 0.16297 , -- 3.69 , 0.1216 , -- 3.7 , 5.279000000000000E-02 , -- 3.71 , -9.607000000000000E-02 , -- 3.72 , -0.30972 , -- 3.73 , -0.35938 , -- 3.74 , -0.19296 , -- 3.75 , 6.919000000000000E-02 , -- 3.76 , 0.27173 , -- 3.77 , 0.34172 , -- 3.78 , 0.31251 , -- 3.79 , 0.24099 , -- 3.8 , 0.15009 , -- 3.81 , 0.10136 , -- 3.82 , 0.18046 , -- 3.83 , 0.36244 , -- 3.84 , 0.47034 , -- 3.85 , 0.36939 , -- 3.86 , 0.15689 , -- 3.87 , 1.108000000000000E-02 , -- 3.88 , 3.990000000000000E-03 , -- 3.89 , 0.11976 , -- 3.9 , 0.24956 , -- 3.91 , 0.21477 , -- 3.92 , -3.172000000000000E-02 , -- 3.93 , -0.24232 , -- 3.94 , -0.1514 , -- 3.95 , 0.12645 , -- 3.96 , 0.3411 , -- 3.97 , 0.48457 , -- 3.98 , 0.61705 , -- 3.99 , 0.70283 , -- 4.0 , 0.70328 , -- 4.01 , 0.62998 , -- 4.02 , 0.53518 , -- 4.03 , 0.44668 , -- 4.04 , 0.36172 , -- 4.05 , 0.31406 , -- 4.06 , 0.32888 , -- 4.07 , 0.35459 , -- 4.08 , 0.32512 , -- 4.09 , 0.25195 , -- 4.1 , 0.20405 , -- 4.11 , 0.22648 , -- 4.12 , 0.30571 , -- 4.13 , 0.37309 , -- 4.14 , 0.35283 , -- 4.15 , 0.24118 , -- 4.16 , 0.11162 , -- 4.17 , 1.458000000000000E-02 , -- 4.18 , -7.364000000000000E-02 , -- 4.19 , -0.1521 , -- 4.2 , -0.14128 , -- 4.21 , 2.440000000000000E-02 , -- 4.22 , 0.2852 , -- 4.23 , 0.45129 , -- 4.24 , 0.38982 , -- 4.25 , 0.15588 , -- 4.26 , -0.11495 , -- 4.27 , -0.31375 , -- 4.28 , -0.42086 , -- 4.29 , -0.48904 , -- 4.3 , -0.52097 , -- 4.31 , -0.49168 , -- 4.32 , -0.4234 , -- 4.33 , -0.36559 , -- 4.34 , -0.36994 , -- 4.35 , -0.42675 , -- 4.36 , -0.45696 , -- 4.37 , -0.39583 , -- 4.38 , -0.24523 , -- 4.39 , -7.371999999999999E-02 , -- 4.4 , 5.577000000000000E-02 , -- 4.41 , 0.13029 , -- 4.42 , 0.17 , -- 4.43 , 0.21223 , -- 4.44 , 0.25214 , -- 4.45 , 0.25221 , -- 4.46 , 0.20971 , -- 4.47 , 0.15915 , -- 4.48 , 0.13965 , -- 4.49 , 0.1015 , -- 4.5 , -5.693000000000000E-02 , -- 4.51 , -0.30165 , -- 4.52 , -0.49413 , -- 4.53 , -0.5601 , -- 4.54 , -0.5473 , -- 4.55 , -0.52318 , -- 4.56 , -0.43186 , -- 4.57 , -0.21177 , -- 4.58 , 5.701000000000000E-02 , -- 4.59 , 0.26717 , -- 4.6 , 0.3673 , -- 4.61 , 0.3813 , -- 4.62 , 0.40079 , -- 4.63 , 0.39365 , -- 4.64 , 0.18973 , -- 4.65 , -0.17373 , -- 4.66 , -0.40285 , -- 4.67 , -0.36957 , -- 4.68 , -0.23873 , -- 4.69 , -0.13623 , -- 4.7 , -1.420000000000000E-02 , -- 4.71 , 0.15954 , -- 4.72 , 0.31583 , -- 4.73 , 0.4076 , -- 4.74 , 0.44925 , -- 4.75 , 0.43323 , -- 4.76 , 0.36783 , -- 4.77 , 0.32597 , -- 4.78 , 0.34835 , -- 4.79 , 0.36693 , -- 4.8 , 0.28138 , -- 4.81 , 0.11386 , -- 4.82 , -4.390000000000000E-02 , -- 4.83 , -0.20925 , -- 4.84 , -0.42702 , -- 4.85 , -0.62277 , -- 4.86 , -0.72429 , -- 4.87 , -0.7462 , -- 4.88 , -0.75887 , -- 4.89 , -0.77194 , -- 4.9 , -0.72951 , -- 4.91 , -0.66245 , -- 4.92 , -0.67709 , -- 4.93 , -0.80669 , -- 4.94 , -0.95972 , -- 4.95 , -0.99997 , -- 4.96 , -0.88454 , -- 4.97 , -0.69049 , -- 4.98 , -0.52094 , -- 4.99 , -0.3957 , -- 5.0 , -0.24286 , -- 5.01 , -3.739000000000000E-02 , -- 5.02 , 0.10577 , -- 5.03 , 0.17347 , -- 5.04 , 0.16886 , -- 5.05 , 0.14491 , -- 5.06 , 0.14907 , -- 5.07 , 0.17361 , -- 5.08 , 0.20083 , -- 5.09 , 0.21954 , -- 5.1 , 0.2328 , -- 5.11 , 0.2575 , -- 5.12 , 0.28932 , -- 5.13 , 0.31126 , -- 5.14 , 0.29244 , -- 5.15 , 0.19772 , -- 5.16 , 5.796000000000000E-02 , -- 5.17 , -6.429000000000000E-02 , -- 5.18 , -5.218000000000000E-02 , -- 5.19 , 9.539000000000000E-02 , -- 5.2 , 0.20966 , -- 5.21 , 0.15862 , -- 5.22 , 1.473000000000000E-02 , -- 5.23 , -3.926000000000000E-02 , -- 5.24 , 8.541000000000000E-02 , -- 5.25 , 0.31423 , -- 5.26 , 0.44181 , -- 5.27 , 0.30949 , -- 5.28 , -4.230000000000000E-03 , -- 5.29 , -0.32893 , -- 5.3 , -0.59096 , -- 5.31 , -0.72514 , -- 5.32 , -0.65562 , -- 5.33 , -0.42079 , -- 5.34 , -0.1588 , -- 5.35 , 2.904000000000000E-02 , -- 5.36 , 0.10308 , -- 5.37 , 4.177000000000000E-02 , -- 5.38 , -6.319000000000000E-02 , -- 5.39 , -4.705000000000000E-02 , -- 5.4 , 9.604000000000000E-02 , -- 5.41 , 0.24518 , -- 5.42 , 0.30632 , -- 5.43 , 0.23914 , -- 5.44 , 9.232000000000000E-02 , -- 5.45 , -1.776000000000000E-02 , -- 5.46 , -7.690000000000000E-03 , -- 5.47 , 7.241000000000000E-02 , -- 5.48 , 9.512000000000000E-02 , -- 5.49 , 8.989000000000000E-02 , -- 5.5 , 0.19384 , -- 5.51 , 0.35667 , -- 5.52 , 0.38627 , -- 5.53 , 0.27202 , -- 5.54 , 0.22809 , -- 5.55 , 0.35372 , -- 5.56 , 0.49889 , -- 5.57 , 0.54618 , -- 5.58 , 0.55561 , -- 5.59 , 0.6075 , -- 5.6 , 0.65833 , -- 5.61 , 0.62315 , -- 5.62 , 0.54314 , -- 5.63 , 0.5024 , -- 5.64 , 0.49951 , -- 5.65 , 0.50238 , -- 5.66 , 0.459 , -- 5.67 , 0.32065 , -- 5.68 , 0.12297 , -- 5.69 , -4.304000000000000E-02 , -- 5.7 , -0.12348 , -- 5.71 , -0.16939 , -- 5.72 , -0.26337 , -- 5.73 , -0.37116 , -- 5.74 , -0.40828 , -- 5.75 , -0.39748 , -- 5.76 , -0.42458 , -- 5.77 , -0.49729 , -- 5.78 , -0.51741 , -- 5.79 , -0.39554 , -- 5.8 , -0.19178 , -- 5.81 , -6.471000000000000E-02 , -- 5.82 , -6.743000000000000E-02 , -- 5.83 , -0.1271 , -- 5.84 , -0.1634 , -- 5.85 , -0.13345 , -- 5.86 , -6.090000000000000E-02 , -- 5.87 , 2.519000000000000E-02 , -- 5.88 , 0.14903 , -- 5.89 , 0.28064 , -- 5.9 , 0.34038 , -- 5.91 , 0.3104 , -- 5.92 , 0.22998 , -- 5.93 , 0.15353 , -- 5.94 , 0.1055 , -- 5.95 , 7.457000000000000E-02 , -- 5.96 , 5.763000000000000E-02 , -- 5.97 , 8.033999999999999E-02 , -- 5.98 , 0.14644 , -- 5.99 , 0.1332 , -- 6.0 , -7.482000000000000E-02 , -- 6.01 , -0.36556 , -- 6.02 , -0.55895 , -- 6.03 , -0.59056 , -- 6.04 , -0.46664 , -- 6.05 , -0.26194 , -- 6.06 , -7.546000000000000E-02 , -- 6.07 , 7.784000000000001E-02 , -- 6.08 , 0.23755 , -- 6.09 , 0.36836 , -- 6.1 , 0.37298 , -- 6.11 , 0.26509 , -- 6.12 , 0.15102 , -- 6.13 , 6.525000000000000E-02 , -- 6.14 , -1.695000000000000E-02 , -- 6.15 , -0.10207 , -- 6.16 , -0.1821 , -- 6.17 , -0.26644 , -- 6.18 , -0.32842 , -- 6.19 , -0.24869 , -- 6.2 , 2.279000000000000E-02 , -- 6.21 , 0.37255 , -- 6.22 , 0.6758 , -- 6.23 , 0.86221 , -- 6.24 , 0.91467 , -- 6.25 , 0.89167 , -- 6.26 , 0.84631 , -- 6.27 , 0.74074 , -- 6.28 , 0.49841 , -- 6.29 , 0.16761 , -- 6.3 , -4.544000000000000E-02 , -- 6.31 , -2.644000000000000E-02 , -- 6.32 , 9.400000000000000E-02 , -- 6.33 , 0.16063 , -- 6.34 , 0.18176 , -- 6.35 , 0.20612 , -- 6.36 , 0.22068 , -- 6.37 , 0.22211 , -- 6.38 , 0.23664 , -- 6.39 , 0.24671 , -- 6.4 , 0.1861 , -- 6.41 , 0.10676 , -- 6.42 , 0.2039 , -- 6.43 , 0.4894 , -- 6.44 , 0.7178 , -- 6.45 , 0.73624 , -- 6.46 , 0.64197 , -- 6.47 , 0.61236 , -- 6.48 , 0.66281 , -- 6.49 , 0.6407 , -- 6.5 , 0.48402 , -- 6.51 , 0.28743 , -- 6.52 , 0.1436 , -- 6.53 , 6.140000000000000E-02 , -- 6.54 , -1.770000000000000E-03 , -- 6.55 , -6.498000000000000E-02 , -- 6.56 , -0.12251 , -- 6.57 , -0.16577 , -- 6.58 , -0.20217 , -- 6.59 , -0.28219 , -- 6.6 , -0.37605 , -- 6.61 , -0.34257 , -- 6.62 , -0.12814 , -- 6.63 , 0.1706 , -- 6.64 , 0.38468 , -- 6.65 , 0.39384 , -- 6.66 , 0.26746 , -- 6.67 , 0.18207 , -- 6.68 , 0.19512 , -- 6.69 , 0.22133 , -- 6.7 , 0.209 , -- 6.71 , 0.17146 , -- 6.72 , 6.763000000000000E-02 , -- 6.73 , -0.13527 , -- 6.74 , -0.37496 , -- 6.75 , -0.55764 , -- 6.76 , -0.58824 , -- 6.77 , -0.44844 , -- 6.78 , -0.27116 , -- 6.79 , -0.19551 , -- 6.8 , -0.18978 , -- 6.81 , -9.911000000000000E-02 , -- 6.82 , 0.11626 , -- 6.83 , 0.30541 , -- 6.84 , 0.3521 , -- 6.85 , 0.27698 , -- 6.86 , 0.10781 , -- 6.87 , -0.13553 , -- 6.88 , -0.3724 , -- 6.89 , -0.51163 , -- 6.9 , -0.49535 , -- 6.91 , -0.29991 , -- 6.92 , -1.034000000000000E-02 , -- 6.93 , 0.19111 , -- 6.94 , 0.1843 , -- 6.95 , 6.730000000000000E-03 , -- 6.96 , -0.21507 , -- 6.97 , -0.41983 , -- 6.98 , -0.58894 , -- 6.99 , -0.63614 , -- 7.0 , -0.54698 , -- 7.01 , -0.44682 , -- 7.02 , -0.42416 , -- 7.03 , -0.46132 , -- 7.04 , -0.48084 , -- 7.05 , -0.43504 , -- 7.06 , -0.34615 , -- 7.07 , -0.23496 , -- 7.08 , -0.13072 , -- 7.09 , -5.857000000000000E-02 , -- 7.1 , 1.753000000000000E-02 , -- 7.11 , 0.10141 , -- 7.12 , 0.12684 , -- 7.13 , 9.014000000000000E-02 , -- 7.14 , 0.11682 , -- 7.15 , 0.28896 , -- 7.16 , 0.48134 , -- 7.17 , 0.54721 , -- 7.18 , 0.49147 , -- 7.19 , 0.35746 , -- 7.2 , 0.17093 , -- 7.21 , -6.870000000000000E-03 , -- 7.22 , -7.575999999999999E-02 , -- 7.23 , -4.320000000000000E-03 , -- 7.24 , 6.714000000000001E-02 , -- 7.25 , 2.620000000000000E-03 , -- 7.26 , -0.12071 , -- 7.27 , -0.16453 , -- 7.28 , -0.1671 , -- 7.29 , -0.24591 , -- 7.3 , -0.36246 , -- 7.31 , -0.39855 , -- 7.32 , -0.33851 , -- 7.33 , -0.22608 , -- 7.34 , -0.1129 , -- 7.35 , -3.976000000000000E-02 , -- 7.36 , 5.950000000000000E-03 , -- 7.37 , 4.231000000000000E-02 , -- 7.38 , 9.320000000000001E-02 , -- 7.39 , 0.21161 , -- 7.4 , 0.37502 , -- 7.41 , 0.46085 , -- 7.42 , 0.42852 , -- 7.43 , 0.39911 , -- 7.44 , 0.48134 , -- 7.45 , 0.61862 , -- 7.46 , 0.65845 , -- 7.47 , 0.52488 , -- 7.48 , 0.27775 , -- 7.49 , 2.611000000000000E-02 , -- 7.5 , -0.16858 , -- 7.51 , -0.35917 , -- 7.52 , -0.64888 , -- 7.53 , -0.93894 , -- 7.54 , -0.99997 , -- 7.55 , -0.79545 , -- 7.56 , -0.50022 , -- 7.57 , -0.31055 , -- 7.58 , -0.28451 , -- 7.59 , -0.32788 , -- 7.6 , -0.34293 , -- 7.61 , -0.30914 , -- 7.62 , -0.29364 , -- 7.63 , -0.36128 , -- 7.64 , -0.43128 , -- 7.65 , -0.41928 , -- 7.66 , -0.39651 , -- 7.67 , -0.43324 , -- 7.68 , -0.4592 , -- 7.69 , -0.3661 , -- 7.7 , -0.17726 , -- 7.71 , -7.930000000000000E-03 , -- 7.72 , 9.228000000000000E-02 , -- 7.73 , 0.12711 , -- 7.74 , 0.10315 , -- 7.75 , 9.070000000000000E-03 , -- 7.76 , -0.1676 , -- 7.77 , -0.37078 , -- 7.78 , -0.48702 , -- 7.79 , -0.42176 , -- 7.8 , -0.20091 , -- 7.81 , -7.270000000000000E-03 , -- 7.82 , 3.404000000000000E-02 , -- 7.83 , 2.700000000000000E-03 , -- 7.84 , -4.730000000000000E-03 , -- 7.85 , -2.107000000000000E-02 , -- 7.86 , -7.763000000000000E-02 , -- 7.87 , -0.11332 , -- 7.88 , -9.217000000000000E-02 , -- 7.89 , -7.226000000000000E-02 , -- 7.9 , -0.10282 , -- 7.91 , -0.18072 , -- 7.92 , -0.27112 , -- 7.93 , -0.33308 , -- 7.94 , -0.37009 , -- 7.95 , -0.41046 , -- 7.96 , -0.46542 , -- 7.97 , -0.51679 , -- 7.98 , -0.48695 , -- 7.99 , -0.31766 , -- 8.0 , -0.11193 , -- 8.01 , -1.808000000000000E-02 , -- 8.02 , -9.790000000000000E-03 , -- 8.03 , 7.910000000000000E-03 , -- 8.04 , 2.892000000000000E-02 , -- 8.05 , 5.256000000000000E-02 , -- 8.06 , 0.15118 , -- 8.07 , 0.33598 , -- 8.08 , 0.47411 , -- 8.09 , 0.4184 , -- 8.1 , 0.22182 , -- 8.11 , 6.008000000000000E-02 , -- 8.12 , 7.820000000000001E-03 , -- 8.13 , 3.031000000000000E-02 , -- 8.14 , 6.139000000000000E-02 , -- 8.15 , 9.475000000000000E-02 , -- 8.16 , 0.1711 , -- 8.17 , 0.25375 , -- 8.18 , 0.32694 , -- 8.19 , 0.47654 , -- 8.2 , 0.71476 , -- 8.21 , 0.92354 , -- 8.22 , 0.99997 , -- 8.23 , 0.96174 , -- 8.24 , 0.85956 , -- 8.25 , 0.67462 , -- 8.26 , 0.42666 , -- 8.27 , 0.21402 , -- 8.28 , 8.068000000000000E-02 , -- 8.29 , -2.572000000000000E-02 , -- 8.3 , -0.18823 , -- 8.31 , -0.43016 , -- 8.32 , -0.69265 , -- 8.33 , -0.84523 , -- 8.34 , -0.78451 , -- 8.35 , -0.5823 , -- 8.36 , -0.39951 , -- 8.37 , -0.3009 , -- 8.38 , -0.28826 , -- 8.39 , -0.34762 , -- 8.4 , -0.40794 , -- 8.41 , -0.37827 , -- 8.42 , -0.24945 , -- 8.43 , -0.10703 , -- 8.44 , -1.106000000000000E-02 , -- 8.45 , 6.251000000000000E-02 , -- 8.46 , 0.1419 , -- 8.47 , 0.19928 , -- 8.48 , 0.18798 , -- 8.49 , 0.11645 , -- 8.5 , 4.575000000000000E-02 , -- 8.51 , 4.959000000000000E-02 , -- 8.52 , 0.17716 , -- 8.53 , 0.34359 , -- 8.54 , 0.36584 , -- 8.55 , 0.23915 , -- 8.56 , 0.18171 , -- 8.57 , 0.30089 , -- 8.58 , 0.43922 , -- 8.59 , 0.40395 , -- 8.6 , 0.15759 , -- 8.61 , -0.16407 , -- 8.62 , -0.36165 , -- 8.63 , -0.39041 , -- 8.64 , -0.35247 , -- 8.65 , -0.31056 , -- 8.66 , -0.24355 , -- 8.67 , -9.318000000000000E-02 , -- 8.68 , 7.779999999999999E-02 , -- 8.69 , 5.175000000000000E-02 , -- 8.7 , -0.23925 , -- 8.71 , -0.59171 , -- 8.72 , -0.77473 , -- 8.73 , -0.75474 , -- 8.74 , -0.64528 , -- 8.75 , -0.48987 , -- 8.76 , -0.29956 , -- 8.77 , -0.1701 , -- 8.78 , -0.13175 , -- 8.79 , -0.10789 , -- 8.8 , -4.978000000000000E-02 , -- 8.81 , 4.376000000000000E-02 , -- 8.82 , 0.15205 , -- 8.83 , 0.2202 , -- 8.84 , 0.17479 , -- 8.85 , 2.103000000000000E-02 , -- 8.86 , -0.14172 , -- 8.87 , -0.26548 , -- 8.88 , -0.38534 , -- 8.89 , -0.50451 , -- 8.9 , -0.53404 , -- 8.91 , -0.38116 , -- 8.92 , -0.11525 , -- 8.93 , 7.395000000000000E-02 , -- 8.94 , 0.10361 , -- 8.95 , 6.577000000000000E-02 , -- 8.96 , 6.259000000000001E-02 , -- 8.97 , 5.649000000000000E-02 , -- 8.98 , -3.880000000000000E-03 , -- 8.99 , -2.390000000000000E-02 , -- 9.0 , 7.305000000000000E-02 , -- 9.01 , 0.19452 , -- 9.02 , 0.2608 , -- 9.03 , 0.35267 , -- 9.04 , 0.5391 , -- 9.05 , 0.73389 , -- 9.06 , 0.83545 , -- 9.07 , 0.82904 , -- 9.08 , 0.72024 , -- 9.09 , 0.51294 , -- 9.1 , 0.23736 , -- 9.11 , -4.577000000000000E-02 , -- 9.12 , -0.26395 , -- 9.13 , -0.38853 , -- 9.14 , -0.43089 , -- 9.15 , -0.4349 , -- 9.16 , -0.41682 , -- 9.17 , -0.37537 , -- 9.18 , -0.32465 , -- 9.19 , -0.29702 , -- 9.2 , -0.32491 , -- 9.21 , -0.3466 , -- 9.22 , -0.28185 , -- 9.23 , -0.19619 , -- 9.24 , -0.14637 , -- 9.25 , -9.772000000000000E-02 , -- 9.26 , -7.858999999999999E-02 , -- 9.27 , -0.13191 , -- 9.28 , -0.21558 , -- 9.29 , -0.24568 , -- 9.3 , -0.18549 , -- 9.31 , -9.976000000000000E-02 , -- 9.32 , -6.297000000000000E-02 , -- 9.33 , -8.577000000000000E-02 , -- 9.34 , -0.11997 , -- 9.35 , -5.070000000000000E-02 , -- 9.36 , 0.19743 , -- 9.37 , 0.55636 , -- 9.38 , 0.86649 , -- 9.39 , 0.99997 , -- 9.4 , 0.95787 , -- 9.41 , 0.80859 , -- 9.42 , 0.58733 , -- 9.43 , 0.34042 , -- 9.44 , 0.15629 , -- 9.45 , 7.298000000000000E-02 , -- 9.46 , 3.103000000000000E-02 , -- 9.47 , -1.360000000000000E-03 , -- 9.48 , 2.567000000000000E-02 , -- 9.49 , 9.848000000000000E-02 , -- 9.5 , 0.13363 , -- 9.51 , 0.10499 , -- 9.52 , 1.947000000000000E-02 , -- 9.53 , -0.11686 , -- 9.54 , -0.25475 , -- 9.55 , -0.33284 , -- 9.56 , -0.37717 , -- 9.57 , -0.45927 , -- 9.58 , -0.53679 , -- 9.59 , -0.50988 , -- 9.6 , -0.4323 , -- 9.61 , -0.46891 , -- 9.62 , -0.62414 , -- 9.63 , -0.67897 , -- 9.64 , -0.46893 , -- 9.65 , -0.10561 , -- 9.66 , 0.12896 , -- 9.67 , 7.442000000000000E-02 , -- 9.68 , -0.13619 , -- 9.69 , -0.25497 , -- 9.7 , -0.19615 , -- 9.71 , -5.295000000000000E-02 , -- 9.72 , 5.399000000000000E-02 , -- 9.73 , 8.438000000000000E-02 , -- 9.74 , 7.897000000000000E-02 , -- 9.75 , 0.11239 , -- 9.76 , 0.18699 , -- 9.77 , 0.19038 , -- 9.78 , 0.13535 , -- 9.79 , 0.20938 , -- 9.8 , 0.43787 , -- 9.81 , 0.63937 , -- 9.82 , 0.67742 , -- 9.83 , 0.58799 , -- 9.84 , 0.49876 , -- 9.85 , 0.4183 , -- 9.86 , 0.29948 , -- 9.87 , 0.22905 , -- 9.88 , 0.2606 , -- 9.89 , 0.28847 , -- 9.9 , 0.22616 , -- 9.91 , 0.12545 , -- 9.92 , 8.956000000000000E-02 , -- 9.93 , 0.12928 , -- 9.94 , 0.15076 , -- 9.95 , 4.544000000000000E-02 , -- 9.96 , -0.20722 , -- 9.97 , -0.49063 , -- 9.98 , -0.6894 , -- 9.99 , -0.80485 , -- 10.0 , -0.84771 , -- 10.01 , -0.76807 , -- 10.02 , -0.56037 , -- 10.03 , -0.32503 , -- 10.04 , -0.15016 , -- 10.05 , -3.882000000000000E-02 , -- 10.06 , 6.110000000000000E-03 , -- 10.07 , -2.178000000000000E-02 , -- 10.08 , -6.615000000000000E-02 , -- 10.09 , -3.796000000000000E-02 , -- 10.1 , 8.788000000000000E-02 , -- 10.11 , 0.2149 , -- 10.12 , 0.23018 , -- 10.13 , 0.14302 , -- 10.14 , 3.300000000000000E-02 , -- 10.15 , -5.442000000000000E-02 , -- 10.16 , -9.190000000000000E-02 , -- 10.17 , -5.636000000000000E-02 , -- 10.18 , 1.760000000000000E-03 , -- 10.19 , -4.910000000000000E-03 , -- 10.2 , -7.645000000000000E-02 , -- 10.21 , -0.16067 , -- 10.22 , -0.22708 , -- 10.23 , -0.23139 , -- 10.24 , -0.12101 , -- 10.25 , 7.537000000000001E-02 , -- 10.26 , 0.24004 , -- 10.27 , 0.32546 , -- 10.28 , 0.38826 , -- 10.29 , 0.41863 , -- 10.3 , 0.35794 , -- 10.31 , 0.23222 , -- 10.32 , 0.11401 , -- 10.33 , 1.697000000000000E-02 , -- 10.34 , -0.10766 , -- 10.35 , -0.25136 , -- 10.36 , -0.35757 , -- 10.37 , -0.41565 , -- 10.38 , -0.3843 , -- 10.39 , -0.22915 , -- 10.4 , -7.590000000000000E-03 , -- 10.41 , 0.24235 , -- 10.42 , 0.48677 , -- 10.43 , 0.65383 , -- 10.44 , 0.70515 , -- 10.45 , 0.61222 , -- 10.46 , 0.40693 , -- 10.47 , 0.24331 , -- 10.48 , 0.2277 , -- 10.49 , 0.27807 , -- 10.5 , 0.24063 , -- 10.51 , 9.018000000000000E-02 , -- 10.52 , -8.182000000000000E-02 , -- 10.53 , -0.23302 , -- 10.54 , -0.37812 , -- 10.55 , -0.4703 , -- 10.56 , -0.41592 , -- 10.57 , -0.24651 , -- 10.58 , -0.12814 , -- 10.59 , -0.13 , -- 10.6 , -0.17581 , -- 10.61 , -0.22261 , -- 10.62 , -0.29974 , -- 10.63 , -0.40731 , -- 10.64 , -0.49694 , -- 10.65 , -0.51567 , -- 10.66 , -0.38399 , -- 10.67 , -6.413000000000001E-02 , -- 10.68 , 0.26417 , -- 10.69 , 0.33331 , -- 10.7 , 0.13429 , -- 10.71 , -8.293000000000000E-02 , -- 10.72 , -0.1463 , -- 10.73 , -0.13542 , -- 10.74 , -0.20542 , -- 10.75 , -0.35982 , -- 10.76 , -0.44591 , -- 10.77 , -0.37107 , -- 10.78 , -0.25668 , -- 10.79 , -0.25179 , -- 10.8 , -0.31124 , -- 10.81 , -0.28374 , -- 10.82 , -0.12758 , -- 10.83 , 1.490000000000000E-02 , -- 10.84 , 1.229000000000000E-02 , -- 10.85 , -6.356000000000001E-02 , -- 10.86 , -5.771000000000000E-02 , -- 10.87 , 8.679000000000001E-02 , -- 10.88 , 0.31097 , -- 10.89 , 0.53347 , -- 10.9 , 0.68419 , -- 10.91 , 0.65081 , -- 10.92 , 0.4251 , -- 10.93 , 0.19891 , -- 10.94 , 0.11666 , -- 10.95 , 0.13796 , -- 10.96 , 0.14749 , -- 10.97 , 9.375000000000000E-02 , -- 10.98 , 2.569000000000000E-02 , -- 10.99 , -1.828000000000000E-02 , -- 11.0 , -6.660000000000000E-03 , -- 11.01 , 9.803000000000001E-02 , -- 11.02 , 0.2156 , -- 11.03 , 0.2608 , -- 11.04 , 0.28376 , -- 11.05 , 0.31446 , -- 11.06 , 0.30511 , -- 11.07 , 0.25332 , -- 11.08 , 0.19284 , -- 11.09 , 0.1152 , -- 11.1 , 1.948000000000000E-02 , -- 11.11 , -8.540000000000001E-03 , -- 11.12 , -8.070000000000001E-03 , -- 11.13 , 5.720000000000000E-03 , -- 11.14 , 5.899000000000000E-02 , -- 11.15 , 0.13421 , -- 11.16 , 0.26053 , -- 11.17 , 0.41353 , -- 11.18 , 0.51092 , -- 11.19 , 0.52002 , -- 11.2 , 0.50124 , -- 11.21 , 0.5386 , -- 11.22 , 0.65388 , -- 11.23 , 0.8058 , -- 11.24 , 0.93844 , -- 11.25 , 0.99997 , -- 11.26 , 0.96789 , -- 11.27 , 0.87593 , -- 11.28 , 0.80065 , -- 11.29 , 0.79192 , -- 11.3 , 0.8141 , -- 11.31 , 0.8052 , -- 11.32 , 0.74262 , -- 11.33 , 0.61546 , -- 11.34 , 0.41975 , -- 11.35 , 0.22346 , -- 11.36 , 0.14585 , -- 11.37 , 0.18339 , -- 11.38 , 0.21495 , -- 11.39 , 0.22018 , -- 11.4 , 0.23766 , -- 11.41 , 0.19769 , -- 11.42 , 1.272000000000000E-02 , -- 11.43 , -0.33277 , -- 11.44 , -0.5999 , -- 11.45 , -0.66307 , -- 11.46 , -0.54941 , -- 11.47 , -0.30754 , -- 11.48 , 9.150000000000000E-03 , -- 11.49 , 0.33567 , -- 11.5 , 0.62395 , -- 11.51 , 0.82292 , -- 11.52 , 0.92488 , -- 11.53 , 0.94922 , -- 11.54 , 0.90162 , -- 11.55 , 0.81535 , -- 11.56 , 0.68529 , -- 11.57 , 0.48301 , -- 11.58 , 0.28744 , -- 11.59 , 0.21968 , -- 11.6 , 0.31463 , -- 11.61 , 0.4858 , -- 11.62 , 0.58845 , -- 11.63 , 0.57005 , -- 11.64 , 0.49055 , -- 11.65 , 0.39877 , -- 11.66 , 0.2819 , -- 11.67 , 0.11731 , -- 11.68 , -6.177000000000000E-02 , -- 11.69 , -0.1701 , -- 11.7 , -0.21434 , -- 11.71 , -0.36528 , -- 11.72 , -0.67236 , -- 11.73 , -0.88398 , -- 11.74 , -0.82736 , -- 11.75 , -0.67582 , -- 11.76 , -0.64387 , -- 11.77 , -0.69937 , -- 11.78 , -0.68858 , -- 11.79 , -0.5758 , -- 11.8 , -0.46315 , -- 11.81 , -0.45051 , -- 11.82 , -0.51549 , -- 11.83 , -0.51468 , -- 11.84 , -0.35292 , -- 11.85 , -0.11964 , -- 11.86 , -1.117000000000000E-02 , -- 11.87 , -0.1357 , -- 11.88 , -0.40276 , -- 11.89 , -0.63738 , -- 11.9 , -0.73699 , -- 11.91 , -0.69661 , -- 11.92 , -0.58112 , -- 11.93 , -0.46357 , -- 11.94 , -0.38497 , -- 11.95 , -0.33617 , -- 11.96 , -0.26831 , -- 11.97 , -0.19582 , -- 11.98 , -0.16518 , -- 11.99 , -0.14401 , -- 12.0 , -7.318000000000000E-02 , -- 12.01 , 7.769000000000000E-02 , -- 12.02 , 0.26041 , -- 12.03 , 0.37046 , -- 12.04 , 0.40569 , -- 12.05 , 0.44476 , -- 12.06 , 0.50231 , -- 12.07 , 0.52622 , -- 12.08 , 0.47631 , -- 12.09 , 0.35672 , -- 12.1 , 0.14838 , -- 12.11 , -0.13846 , -- 12.12 , -0.36979 , -- 12.13 , -0.47711 , -- 12.14 , -0.54786 , -- 12.15 , -0.62333 , -- 12.16 , -0.64749 , -- 12.17 , -0.58515 , -- 12.18 , -0.46856 , -- 12.19 , -0.35151 , -- 12.2 , -0.26225 , -- 12.21 , -0.22214 , -- 12.22 , -0.22853 , -- 12.23 , -0.19257 , -- 12.24 , -2.725000000000000E-02 , -- 12.25 , 0.18283 , -- 12.26 , 0.25344 , -- 12.27 , 0.12964 , -- 12.28 , -9.258000000000000E-02 , -- 12.29 , -0.29733 , -- 12.3 , -0.42242 , -- 12.31 , -0.45343 , -- 12.32 , -0.38158 , -- 12.33 , -0.24116 , -- 12.34 , -0.13557 , -- 12.35 , -0.11938 , -- 12.36 , -0.14999 , -- 12.37 , -0.17426 , -- 12.38 , -0.16707 , -- 12.39 , -0.12211 , -- 12.4 , -6.938000000000000E-02 , -- 12.41 , -5.365000000000000E-02 , -- 12.42 , -6.988999999999999E-02 , -- 12.43 , -0.10537 , -- 12.44 , -0.18301 , -- 12.45 , -0.26683 , -- 12.46 , -0.27079 , -- 12.47 , -0.18067 , -- 12.48 , -5.357000000000000E-02 , -- 12.49 , 5.621000000000000E-02 , -- 12.5 , 0.12411 , -- 12.51 , 0.1349 , -- 12.52 , 0.10552 , -- 12.53 , 8.767000000000000E-02 , -- 12.54 , 5.312000000000000E-02 , -- 12.55 , -7.994000000000000E-02 , -- 12.56 , -0.28316 , -- 12.57 , -0.43439 , -- 12.58 , -0.45819 , -- 12.59 , -0.39875 , -- 12.6 , -0.3257 , -- 12.61 , -0.21617 , -- 12.62 , -5.834000000000000E-02 , -- 12.63 , 6.234000000000000E-02 , -- 12.64 , 7.834000000000001E-02 , -- 12.65 , 2.524000000000000E-02 , -- 12.66 , -4.370000000000000E-03 , -- 12.67 , 2.088000000000000E-02 , -- 12.68 , 3.738000000000000E-02 , -- 12.69 , -5.780000000000000E-03 , -- 12.7 , -7.783000000000000E-02 , -- 12.71 , -0.10293 , -- 12.72 , -5.917000000000000E-02 , -- 12.73 , -2.088000000000000E-02 , -- 12.74 , -4.084000000000000E-02 , -- 12.75 , -7.596000000000000E-02 , -- 12.76 , -7.527000000000000E-02 , -- 12.77 , -4.418000000000000E-02 , -- 12.78 , -2.046000000000000E-02 , -- 12.79 , -2.682000000000000E-02 , -- 12.8 , -2.654000000000000E-02 , -- 12.81 , 3.635000000000000E-02 , -- 12.82 , 0.12352 , -- 12.83 , 0.13159 , -- 12.84 , 4.372000000000000E-02 , -- 12.85 , -6.480000000000000E-02 , -- 12.86 , -0.1361 , -- 12.87 , -0.17058 , -- 12.88 , -0.1883 , -- 12.89 , -0.19167 , -- 12.9 , -0.19116 , -- 12.91 , -0.20869 , -- 12.92 , -0.23797 , -- 12.93 , -0.28017 , -- 12.94 , -0.36467 , -- 12.95 , -0.46778 , -- 12.96 , -0.49324 , -- 12.97 , -0.38894 , -- 12.98 , -0.2225 , -- 12.99 , -9.676000000000000E-02 , -- 13.0 , -5.153000000000000E-02 , -- 13.01 , -5.856000000000000E-02 , -- 13.02 , -6.265000000000000E-02 , -- 13.03 , -3.700000000000000E-02 , -- 13.04 , 8.800000000000001E-03 , -- 13.05 , 4.189000000000000E-02 , -- 13.06 , 1.048000000000000E-02 , -- 13.07 , -8.393000000000000E-02 , -- 13.08 , -0.17214 , -- 13.09 , -0.21986 , -- 13.1 , -0.25265 , -- 13.11 , -0.28696 , -- 13.12 , -0.29845 , -- 13.13 , -0.27534 , -- 13.14 , -0.25187 , -- 13.15 , -0.25011 , -- 13.16 , -0.27425 , -- 13.17 , -0.33551 , -- 13.18 , -0.41051 , -- 13.19 , -0.45406 , -- 13.2 , -0.44533 , -- 13.21 , -0.38727 , -- 13.22 , -0.30756 , -- 13.23 , -0.24203 , -- 13.24 , -0.20129 , -- 13.25 , -0.16106 , -- 13.26 , -9.457000000000000E-02 , -- 13.27 , -2.440000000000000E-02 , -- 13.28 , 7.040000000000000E-03 , -- 13.29 , 8.600000000000000E-03 , -- 13.3 , 1.981000000000000E-02 , -- 13.31 , 4.834000000000000E-02 , -- 13.32 , 7.178000000000000E-02 , -- 13.33 , 8.525000000000001E-02 , -- 13.34 , 0.1107 , -- 13.35 , 0.15822 , -- 13.36 , 0.21564 , -- 13.37 , 0.27468 , -- 13.38 , 0.32506 , -- 13.39 , 0.34096 , -- 13.4 , 0.32619 , -- 13.41 , 0.32491 , -- 13.42 , 0.34842 , -- 13.43 , 0.36279 , -- 13.44 , 0.34026 , -- 13.45 , 0.2756 , -- 13.46 , 0.18648 , -- 13.47 , 9.881000000000000E-02 , -- 13.48 , 3.222000000000000E-02 , -- 13.49 , 1.061000000000000E-02 , -- 13.5 , 4.343000000000000E-02 , -- 13.51 , 9.372000000000000E-02 , -- 13.52 , 0.10628 , -- 13.53 , 7.198000000000000E-02 , -- 13.54 , 3.458000000000000E-02 , -- 13.55 , 2.182000000000000E-02 , -- 13.56 , 1.377000000000000E-02 , -- 13.57 , -1.295000000000000E-02 , -- 13.58 , -4.297000000000000E-02 , -- 13.59 , -4.232000000000000E-02 , -- 13.6 , -1.224000000000000E-02 , -- 13.61 , 1.559000000000000E-02 , -- 13.62 , 1.639000000000000E-02 , -- 13.63 , -1.544000000000000E-02 , -- 13.64 , -5.384000000000000E-02 , -- 13.65 , -7.287000000000000E-02 , -- 13.66 , -8.747000000000001E-02 , -- 13.67 , -0.10976 , -- 13.68 , -0.11529 , -- 13.69 , -8.388000000000000E-02 , -- 13.7 , -3.945000000000000E-02 , -- 13.71 , -2.420000000000000E-02 , -- 13.72 , -3.630000000000000E-02 , -- 13.73 , -3.928000000000000E-02 , -- 13.74 , -2.207000000000000E-02 , -- 13.75 , -5.590000000000000E-03 , -- 13.76 , -9.450000000000000E-03 , -- 13.77 , -2.752000000000000E-02 , -- 13.78 , -4.478000000000000E-02 , -- 13.79 , -6.457000000000000E-02 , -- 13.8 , -8.530000000000000E-02 , -- 13.81 , -8.704000000000001E-02 , -- 13.82 , -5.918000000000000E-02 , -- 13.83 , -3.830000000000000E-03 , -- 13.84 , 7.192000000000000E-02 , -- 13.85 , 0.14312 , -- 13.86 , 0.17488 , -- 13.87 , 0.16315 , -- 13.88 , 0.14274 , -- 13.89 , 0.14017 , -- 13.9 , 0.14556 , -- 13.91 , 0.13989 , -- 13.92 , 0.12104 , -- 13.93 , 9.578000000000000E-02 , -- 13.94 , 7.056999999999999E-02 , -- 13.95 , 5.257000000000000E-02 , -- 13.96 , 4.283000000000000E-02 , -- 13.97 , 3.754000000000000E-02 , -- 13.98 , 3.580000000000000E-02 , -- 13.99 , 3.422000000000000E-02 , -- 14.0 , 2.593000000000000E-02 , -- 14.01 , 4.220000000000000E-03 , -- 14.02 , -1.590000000000000E-02 , -- 14.03 , -2.929000000000000E-02 , -- 14.04 , 4.251000000000000E-02 , -- 14.05 , 5.369000000000000E-02 , -- 14.06 , 6.154000000000000E-02 , -- 14.07 , 6.560000000000001E-02 , -- 14.08 , 6.591000000000000E-02 , -- 14.09 , 6.272000000000000E-02 , -- 14.1 , 5.704000000000000E-02 , -- 14.11 , 5.054000000000000E-02 , -- 14.12 , 4.304000000000000E-02 , -- 14.13 , 3.569000000000000E-02 , -- 14.14 , 2.953000000000000E-02 , -- 14.15 , 2.591000000000000E-02 , -- 14.16 , 2.479000000000000E-02 , -- 14.17 , 2.511000000000000E-02 , -- 14.18 , 2.581000000000000E-02 , -- 14.19 , 2.493000000000000E-02 , -- 14.2 , 2.314000000000000E-02 , -- 14.21 , 2.027000000000000E-02 , -- 14.22 , 1.935000000000000E-02 , -- 14.23 , 2.023000000000000E-02 , -- 14.24 , 2.506000000000000E-02 , -- 14.25 , 3.099000000000000E-02 , -- 14.26 , 3.760000000000000E-02 , -- 14.27 , 4.262000000000000E-02 , -- 14.28 , 4.532000000000000E-02 , -- 14.29 , 4.802000000000000E-02 , -- 14.3 , 5.005000000000000E-02 , -- 14.31 , 5.302000000000000E-02 , -- 14.32 , 5.416000000000000E-02 , -- 14.33 , 5.517000000000000E-02 , -- 14.34 , 5.543000000000000E-02 , -- 14.35 , 5.403000000000000E-02 , -- 14.36 , 5.095000000000000E-02 , -- 14.37 , 4.660000000000000E-02 , -- 14.38 , 4.407000000000000E-02 , -- 14.39 , 4.359000000000000E-02 , -- 14.4 , 4.649000000000000E-02 , -- 14.41 , 4.927000000000000E-02 , -- 14.42 , 5.116000000000000E-02 , -- 14.43 , 5.246000000000000E-02 , -- 14.44 , 5.290000000000000E-02 , -- 14.45 , 5.342000000000000E-02 , -- 14.46 , 5.301000000000000E-02 , -- 14.47 , 5.389000000000000E-02 , -- 14.48 , 5.518000000000000E-02 , -- 14.49 , 5.594000000000000E-02 , -- 14.5 , 5.543000000000000E-02 , -- 14.51 , 5.542000000000000E-02 , -- 14.52 , 5.677000000000000E-02 , -- 14.53 , 5.746000000000000E-02 , -- 14.54 , 5.802000000000000E-02 , -- 14.55 , 5.847000000000000E-02 , -- 14.56 , 5.842000000000000E-02 , -- 14.57 , 5.750000000000000E-02 , -- 14.58 , 5.606000000000000E-02 , -- 14.59 , 5.592000000000000E-02 , -- 14.6 , 5.517000000000000E-02 , -- 14.61 , 5.439000000000000E-02 , -- 14.62 , 5.392000000000000E-02 , -- 14.63 , 5.395000000000000E-02 , -- 14.64 , 5.260000000000000E-02 , -- 14.65 , 5.031000000000000E-02 , -- 14.66 , 4.883000000000000E-02 , -- 14.67 , 4.944000000000000E-02 , -- 14.68 , 5.215000000000000E-02 , -- 14.69 , 5.627000000000000E-02 , -- 14.7 , 6.244000000000000E-02 , -- 14.71 , 6.783000000000000E-02 , -- 14.72 , 7.159000000000000E-02 , -- 14.73 , 7.149999999999999E-02 , -- 14.74 , 6.673000000000000E-02 , -- 14.75 , 5.755000000000000E-02 , -- 14.76 , 4.539000000000000E-02 , -- 14.77 , 3.504000000000000E-02 , -- 14.78 , 2.721000000000000E-02 , -- 14.79 , 2.308000000000000E-02 , -- 14.8 , 2.125000000000000E-02 , -- 14.81 , 2.022000000000000E-02 , -- 14.82 , 1.831000000000000E-02 , -- 14.83 , 1.547000000000000E-02 , -- 14.84 , 1.321000000000000E-02 , -- 14.85 , 1.112000000000000E-02 , -- 14.86 , 1.025000000000000E-02 , -- 14.87 , 9.549999999999999E-03 , -- 14.88 , 1.040000000000000E-02 , -- 14.89 , 1.059000000000000E-02 , -- 14.9 , 1.108000000000000E-02 , -- 14.91 , 1.195000000000000E-02 , -- 14.92 , 1.452000000000000E-02 , -- 14.93 , 1.809000000000000E-02 , -- 14.94 , 2.029000000000000E-02 , -- 14.95 , 2.323000000000000E-02 , -- 14.96 , 2.515000000000000E-02 , -- 14.97 , 2.836000000000000E-02 , -- 14.98 , 3.278000000000000E-02 , -- 14.99 , 3.934000000000000E-02 , -- 15.00 , 0.0 , -- ), -- INTERPOL='LIN', -- PROL_DROITE='CONSTANT', -- PROL_GAUCHE='EXCLU',); -- -- -- -- diff --cc Tests/testcomm/forma12c.comm index 2027774f,2027774f..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm/forma12c.comm +++ /dev/null @@@ -1,773 -1,773 +1,0 @@@ --# MODIF DATE 12/05/2005 AUTEUR DURAND C.DURAND --# TITRE TP ANALYSE SISMIQUE --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2004 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. --# ====================================================================== --# RESPONSABLE BOYERE E.BOYERE --#----------------------------------------------------------------------- --# --# ANALYSE RIS12 TR4 REGLEMENTAIRE --# SCENARIO 1 --# GL1(X,Y) + GL2(Z) --# --#----------------------------------------------------------------------- -- --DEBUT(CODE=_F(NOM ='FORMA12C',NIV_PUB_WEB='INTERNET')) -- --MAILLAGE=LIRE_MAILLAGE(INFO=2) -- --MODELE=AFFE_MODELE( -- MAILLAGE=MAILLAGE, -- AFFE=( -- _F(GROUP_MA='GPOU_D_T', -- PHENOMENE='MECANIQUE', -- MODELISATION='POU_D_T',), -- _F(GROUP_MA='GPOU_C_T', -- PHENOMENE='MECANIQUE', -- MODELISATION='POU_C_T',), -- _F(GROUP_MA='GDIS_TR', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_TR',), -- ), -- ) -- --IMPR_RESU(FORMAT='CASTEM',UNITE=37, -- MODELE=MODELE, -- RESU=_F( -- MAILLAGE=MAILLAGE)) -- -- -- --#----------------------------------------------------------------------- --# CARACTERISTIQUES DES ELEMENTS --#----------------------------------------------------------------------- -- -- --CARA=AFFE_CARA_ELEM( -- MODELE=MODELE, -- POUTRE=( -- _F(GROUP_MA='GMEL0301', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.00711),), -- _F(GROUP_MA='GMEL0501', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL0601', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL0701', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1001', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1101', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1201', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1501', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1701', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1801', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1901', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2001', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2101', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2201', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2401', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.00711),),), -- DISCRET=(_F(MAILLE='M0801I02', -- CARA='M_TR_D_N', -- VALE=(36.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0),), -- _F(MAILLE='M1301I02', -- CARA='M_TR_D_N', -- VALE=(36.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0),),), -- DEFI_ARC=(_F(GROUP_MA='GMEL0601', -- CENTRE=(466.39260860000002,107.5500031,0.27747499939999998), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL1101', -- CENTRE=(466.16400149999998,107.3214035,3.7724525930000001), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL1701', -- CENTRE=(466.16400149999998,106.4785995,4.2335472110000003), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL1901', -- CENTRE=(466.16400149999998,106.4785995,8.7655010220000005), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL2101', -- CENTRE=(466.16400149999998,107.4713974,9.2274990080000006), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,),),) -- --#----------------------------------------------------------------------- --# DEFINITION DES MATERIAUX --#----------------------------------------------------------------------- -- --MATP01=DEFI_MATERIAU(ELAS=_F(E=1.97E11, -- NU=0.3, -- RHO=1.3108749019999999E4, -- ALPHA=1.639999937E-05,),) --MATP03=DEFI_MATERIAU(ELAS=_F(E=1.97E11, -- NU=0.3, -- RHO=1.956015625E4, -- ALPHA=1.639999937E-05,),) -- --#----------------------------------------------------------------------- --# DEFINITION DES SUPPORTS --#----------------------------------------------------------------------- -- --SUPPORT=AFFE_CHAR_MECA( -- MODELE=MODELE, -- DDL_IMPO=( --# PF1 ET PF2 -- _F( NOEUD = ('N02__I00', 'N01__I00',), -- DX = 0., DY = 0., DZ = 0., DRX = 0., DRY = 0., DRZ = 0.), --# GL1 -- _F( NOEUD = 'N0701I00', -- DX = 0., DY = 0.), --# GL2 -- _F( NOEUD = 'N1201I00', -- DZ = 0.), -- ), -- ) -- --#----------------------------------------------------------------------- --# DEFINITION DES CHAMPS DE MATERIAUX --#----------------------------------------------------------------------- -- --CHMATP=AFFE_MATERIAU(MAILLAGE=MAILLAGE, -- AFFE=(_F(GROUP_MA='GMAT01', -- MATER=MATP01, -- TEMP_REF=20.0,), -- _F(GROUP_MA='GMAT03', -- MATER=MATP03, -- TEMP_REF=20.0,),),) -- --#----------------------------------------------------------------------- --# ASSEMBLAGE MATRICE MASSE ET RIGIDITE --#----------------------------------------------------------------------- -- --MACRO_MATR_ASSE(MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- CHARGE=SUPPORT, -- NUME_DDL=CO('NUMDDL'), -- MATR_ASSE=(_F(MATRICE=CO("MATRRIGI"), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO("MATRMASS"), -- OPTION='MASS_MECA',),),); -- -- --#----------------------------------------------------------------------- --# ASSEMBLAGE DU SECOND MEMBRE --#----------------------------------------------------------------------- -- --INCLUDE(UNITE=22) -- --CHSEIX=CALC_CHAR_SEISME( MATR_MASS=MATRMASS, -- DIRECTION=(1., 0., 0.,), MONO_APPUI='OUI' -- ) --CHSEIY=CALC_CHAR_SEISME( MATR_MASS=MATRMASS, -- DIRECTION=(0., 1., 0.,), MONO_APPUI='OUI' -- ) --CHSEIZ=CALC_CHAR_SEISME( MATR_MASS=MATRMASS, -- DIRECTION=(0., 0., 1.,), MONO_APPUI='OUI' -- ) -- --#----------------------------------------------------------------------- --# CALCUL DES MODES --#----------------------------------------------------------------------- --MASSINER=POST_ELEM( -- MODELE=MODELE, -- CHARGE=SUPPORT, -- CARA_ELEM=CARA, -- CHAM_MATER=CHMATP, -- MASS_INER=_F( TOUT = 'OUI',) -- ) --MODES=MACRO_MODE_MECA( -- MATR_A=MATRRIGI, -- MATR_B=MATRMASS, -- CALC_FREQ=_F( -- FREQ_MIN = 0.0, -- FREQ_MAX = 33.0, -- NB_BLOC_FREQ = 1), -- VERI_MODE=_F( STOP_ERREUR = 'NON'), -- NORM_MODE=_F( -- NORME = 'MASS_GENE', -- MASS_INER =MASSINER), -- IMPRESSION=_F( TOUT_PARA = 'OUI') -- ) -- --# TEST_RESU UNIQUEMENT POUR FAIRE CAS TEST --TEST_RESU(RESU=(_F(RESULTAT=MODES, -- NUME_ORDRE=1, -- PARA='FREQ', -- VALE= 4.5135794612152, -- PRECISION=1e-05, -- REFERENCE='NON_REGRESSION', -- VERSION='7.3.19',))) -- --MODES=CALC_ELEM( -- reuse=MODES, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=MODES,) -- --########################################################### --#---- REPONSE TRANSITOIRE PAR SUPERPOSITION MODALE ------ --#---- MONO APPUI GRANDEURS RELATIVES ------ --########################################################### -- --# DEFINITION DES INSTANTS DE RECUPERATION -- --L_RECU=DEFI_LIST_REEL( DEBUT=0., -- INTERVALLE=_F( -- JUSQU_A = 20.47, -- PAS = 0.01) -- ) -- --#---------------------------------------------------- --#------------- PROJECTION SUR LA BASE MODALE -------- --#---------------------------------------------------- --MACRO_PROJ_BASE( -- BASE=MODES, -- MATR_ASSE_GENE=( -- _F( -- MATRICE=CO("MASSEGEN"), -- MATR_ASSE=MATRMASS, -- ), -- _F( -- MATRICE=CO("RIGIDGEN"), -- MATR_ASSE=MATRRIGI, -- ), -- ), -- VECT_ASSE_GENE=( -- _F( -- VECTEUR=CO("EFGENX"), -- VECT_ASSE=CHSEIX, -- ), -- _F( -- VECTEUR=CO("EFGENY"), -- VECT_ASSE=CHSEIY, -- ), -- _F( -- VECTEUR=CO("EFGENZ"), -- VECT_ASSE=CHSEIZ, -- ), -- ), -- ) -- --#------------------------------------------------------------------ --#-------------- RESOLUTION DU PB GENERALISE ----------------------- --#-------------- SANS CORRECTION STATIQUE -------------------------- --#------------------------------------------------------------------ --GSCR=DYNA_TRAN_MODAL( -- MASS_GENE=MASSEGEN, -- RIGI_GENE=RIGIDGEN, -- AMOR_REDUIT=0.02, -- EXCIT=( -- _F( -- VECT_GENE=EFGENX, -- FONC_MULT=ACCELH1, -- ), -- _F( -- VECT_GENE=EFGENY, -- FONC_MULT=ACCELH1, -- ), -- _F( -- VECT_GENE=EFGENZ, -- FONC_MULT=ACCELV1, -- ), -- ), -- INCREMENT=_F( -- INST_INIT = 0., -- INST_FIN =20.47, -- PAS = 0.001 -- ), -- ) -- --#-------------------------------------------------------------- --#---- RESTITUTION GRANDEUR PHYSIQUE DANS LE REPERE RELATIF --#--- SANS CORRECTION STATIQUE --#-------------------------------------------------------------- --# RESTITUTION GLOBALE DU CHAMP DE DEPLACEMENT RELATIF A CHAQUE INSTANT --# DE LA LISTE L_RECU --RGSCR=REST_BASE_PHYS( -- RESU_GENE=GSCR, -- INTERPOL='LIN', -- LIST_INST=L_RECU, -- #TOUT_INST='OUI', -- TOUT_CHAM='OUI', -- ) --DPSCR=CREA_CHAMP( -- TYPE_CHAM='NOEU_DEPL_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR, -- NOM_CHAM='DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) --TDPSCR=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_MAX_R', -- GROUP_NO='GNSTR01', -- CHAM_GD=DPSCR, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- -- --# RESTITUTION GLOBALE DU CHAMP EFGE_ELNO_DEPL A CHAQUE INSTANT --# DE LA LISTE L_RECU --RGSCR=CALC_ELEM( -- reuse=RGSCR, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=RGSCR,) --EFSCR=CREA_CHAMP( -- TYPE_CHAM='ELNO_SIEF_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR, -- NOM_CHAM='EFGE_ELNO_DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) --TEFSCR=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_MAX_R', -- GROUP_NO='GNSTR01', -- CHAM_GD=EFSCR, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) --IMPR_TABLE( -- TABLE=TEFSCR, -- FORMAT='TABLEAU', -- ) -- --########################################################### --#---- REPONSE TRANSITOIRE PAR SUPERPOSITION MODALE ------ --#---- MULTI APPUIS GRANDEURS ABSOLUES ------ --########################################################### -- --# DEFINITION EXCITATION MULTIPLE -- --MSTA=MODE_STATIQUE( -- MATR_RIGI=MATRRIGI, -- MATR_MASS=MATRMASS, -- MODE_STAT=_F(TOUT='OUI',AVEC_CMP=('DX','DY','DZ'),),) -- -- --CHSEIXM=CALC_CHAR_SEISME( -- MATR_MASS=MATRMASS, -- DIRECTION=(1., 0., 0.,), -- MODE_STAT=MSTA, -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ) -- --CHSEIYM=CALC_CHAR_SEISME( -- MATR_MASS=MATRMASS, -- DIRECTION=(0., 1., 0.,), -- MODE_STAT=MSTA, -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ) -- --CHSEIZM=CALC_CHAR_SEISME( -- MATR_MASS=MATRMASS, -- DIRECTION=(0., 0., 1.,), -- MODE_STAT=MSTA, -- NOEUD=('N02__I00','N01__I00','N1201I00',), -- ) -- --MACRO_PROJ_BASE( -- BASE=MODES, -- MATR_ASSE_GENE=( -- _F( -- MATRICE=CO("MASGEN2"), -- MATR_ASSE=MATRMASS, -- ), -- _F( -- MATRICE=CO("RIGGEN2"), -- MATR_ASSE=MATRRIGI, -- ), -- ), -- VECT_ASSE_GENE=( -- _F( -- VECTEUR=CO("EFX2"), -- VECT_ASSE=CHSEIXM, -- ), -- _F( -- VECTEUR=CO("EFY2"), -- VECT_ASSE=CHSEIYM, -- ), -- _F( -- VECTEUR=CO("EFZ2"), -- VECT_ASSE=CHSEIZM, -- ), -- ), -- ) -- -- --VITESH1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=ACCELH1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) --DEPLAH1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=VITESH1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) --VITESV1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=ACCELV1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) --DEPLAV1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=VITESV1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) -- --GSCA=DYNA_TRAN_MODAL( -- MASS_GENE=MASGEN2, -- RIGI_GENE=RIGGEN2, -- AMOR_REDUIT=0.02, -- MODE_STAT=MSTA, -- EXCIT=( -- _F( -- VECT_GENE=EFX2, -- ACCE=ACCELH1, -- VITE=VITESH1, -- DEPL=DEPLAH1, -- MULT_APPUI='OUI', -- DIRECTION=(1.,0.,0.,), -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ), -- _F( -- VECT_GENE=EFY2, -- ACCE=ACCELH1, -- VITE=VITESH1, -- DEPL=DEPLAH1, -- MULT_APPUI='OUI', -- DIRECTION=(0.,1.,0.,), -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ), -- _F( -- VECT_GENE=EFZ2, -- ACCE=ACCELV1, -- VITE=VITESV1, -- DEPL=DEPLAV1, -- MULT_APPUI='OUI', -- DIRECTION=(0.,0.,1.,), -- NOEUD=('N02__I00','N01__I00','N1201I00',), -- ), -- ), -- INCREMENT=_F( -- INST_INIT = 0., -- INST_FIN =20.47, -- PAS = 0.001 -- ), -- ) -- -- --# RESTITUTION GRANDEURS ABSOLUES --#------------------------------- -- --RGSCA=REST_BASE_PHYS( -- RESU_GENE=GSCA, -- INTERPOL='LIN', -- LIST_INST=L_RECU, -- TOUT_CHAM='OUI', -- MULT_APPUI='OUI', -- ) -- --# DEPLACEMENTS -- --DPSCA=CREA_CHAMP( -- TYPE_CHAM='NOEU_DEPL_R', -- OPERATION='EXTR', -- RESULTAT=RGSCA, -- NOM_CHAM='DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TDPSCA=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_MAX_A', -- GROUP_NO='GNSTR01', -- CHAM_GD=DPSCA, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=TDPSCA, -- FORMAT='TABLEAU', -- ) -- --# EFFORTS -- --RGSCA=CALC_ELEM( -- reuse=RGSCA, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=RGSCA,) -- --EFSCA=CREA_CHAMP( -- TYPE_CHAM='ELNO_SIEF_R', -- OPERATION='EXTR', -- RESULTAT=RGSCA, -- NOM_CHAM='EFGE_ELNO_DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TEFSCA=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_MAX_A', -- GROUP_NO='GNSTR01', -- CHAM_GD=EFSCA, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) --IMPR_TABLE( -- TABLE=TEFSCA, -- FORMAT='TABLEAU', -- ) -- -- --# RESTITUTION GRANDEURS RELATIVES --#------------------------------- -- --# DEPLACEMENTS -- --RGSCR2=REST_BASE_PHYS( -- RESU_GENE=GSCA, -- INTERPOL='LIN', -- LIST_INST=L_RECU, -- TOUT_CHAM='OUI', -- ) -- --DPSCR2=CREA_CHAMP( -- TYPE_CHAM='NOEU_DEPL_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR2, -- NOM_CHAM='DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TDPSCR2=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_MAX_R2', -- GROUP_NO='GNSTR01', -- CHAM_GD=DPSCR2, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=TDPSCR2, -- FORMAT='TABLEAU', -- ) -- --# EFFORTS -- --RGSCR2=CALC_ELEM( -- reuse=RGSCR2, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=RGSCR2,) -- --EFSCR2=CREA_CHAMP( -- TYPE_CHAM='ELNO_SIEF_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR2, -- NOM_CHAM='EFGE_ELNO_DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TEFSCR2=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_MAX_R2', -- GROUP_NO='GNSTR01', -- CHAM_GD=EFSCR2, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=TEFSCR2, -- FORMAT='TABLEAU', -- ) -- --########################################################### --#------REPONSE SPECTRALE PAR SUPERPOSITION MODALE--------- --########################################################### -- --# CALCUL DU SPECTRE DE REPONSE OSCILLATEUR EN PSEUDO ACCELERATION ABSOLUE --# NAPPE SRO FONCTION DE AMORTISSEMENT --#------------------------------------------------------------------------ --SROXY=CALC_FONCTION( -- SPEC_OSCI=_F( -- FONCTION=ACCELH1, -- AMOR_REDUIT=(0.02,0.05,0.10), -- NORME=9.81, -- ), -- ) --SROZ=CALC_FONCTION( -- SPEC_OSCI=_F( -- FONCTION=ACCELV1, -- AMOR_REDUIT=(0.02,0.05,0.10), -- NORME=9.81, -- ), -- ) -- -- --#----------------------------------------------- --# REPONSE SPECTRALE SANS CORRECTION STATIQUE --#----------------------------------------------- --SPEC=COMB_SISM_MODAL( -- MODE_MECA=MODES, -- AMOR_REDUIT=0.02, -- MASS_INER=MASSINER, -- EXCIT=_F( -- MONO_APPUI='OUI', -- TRI_SPEC='OUI', -- SPEC_OSCI=(SROXY,SROXY,SROZ), -- ECHELLE=(9.81,9.81,9.81),), -- COMB_MODE=_F(TYPE='CQC',), -- COMB_DIRECTION=_F( TYPE = 'QUAD',), -- OPTION=( -- 'DEPL', -- 'EFGE_ELNO_DEPL', -- ), -- ) -- --EFSPEC=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_SPEC', -- GROUP_NO='GNSTR01', -- RESULTAT=SPEC, -- NOM_CHAM='EFGE_ELNO_DEPL', -- NUME_ORDRE=4, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=EFSPEC, -- FORMAT='TABLEAU', -- ) -- --DPSPEC=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_SPEC', -- GROUP_NO='GNSTR01', -- RESULTAT=SPEC, -- NOM_CHAM='DEPL', -- NUME_ORDRE=4, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=DPSPEC, -- FORMAT='TABLEAU', -- ) -- -- -- --FIN() -- -- -- -- -- -- diff --cc Tests/testcomm/g.comm index 8756209b,8756209b..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/g.comm +++ /dev/null @@@ -1,11 -1,11 +1,0 @@@ --DEBUT() --sensible=[2.1E11, 0.3, 1.E-6, 1.E-6, ] -- --# parse: -affectation --n=len(sensible) --PS=[None]*n -- --#for i in range(n): --# PS[i]=DEFI_PARA_SENSI(VALE=sensible[i]) -- --FIN() diff --cc Tests/testcomm/hplp101b.comm index ef2790a1,ef2790a1..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm/hplp101b.comm +++ /dev/null @@@ -1,189 -1,189 +1,0 @@@ --# MODIF DATE 09/05/2006 AUTEUR REZETTE C.REZETTE --# TITRE FISSURE AU CENTRE D'UNE PLAQUE MINCE RECTANGULAIRE FAISANT --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2004 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. --# ====================================================================== --# OBSTACLE A UN FLUC DE CHALEUR UNIFORME EN MILIEU ISOTROPE --# --# TESTE LES DERIVEES DE G DANS LE CAS D'UN CHARGEMENT EN FORCE DE VOLUME -- --DEBUT( CODE=_F( NOM = 'HPLP101B',NIV_PUB_WEB='INTERNET')) -- --YOUNG = DEFI_PARA_SENSI(VALE=1.) --FORC = DEFI_PARA_SENSI(VALE=1.) -- --MA=LIRE_MAILLAGE( ) -- --MA=DEFI_GROUP( reuse=MA, MAILLAGE=MA, -- CREA_GROUP_NO=_F( -- GROUP_MA = ( 'LP9P10', 'LP9P10B', -- 'LP8P9', 'LP8P9B', -- )) -- ) -- --MO=AFFE_MODELE( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- PHENOMENE = 'MECANIQUE', -- MODELISATION = 'C_PLAN') -- ) --ZERO = DEFI_CONSTANTE(VALE=0.) --NU = DEFI_CONSTANTE(VALE=0.3) --ALPHA = DEFI_CONSTANTE(VALE=0.) -- --MAT=DEFI_MATERIAU(ELAS_FO=_F( E = YOUNG, NU = NU, -- TEMP_DEF_ALPHA =20., -- ALPHA = ALPHA, RHO=7800.,)) -- --CHMAT=AFFE_MATERIAU( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- MATER = MAT) -- ) -- --CH=AFFE_CHAR_MECA_F( MODELE=MO, -- FORCE_INTERNE=_F(TOUT='OUI',FY=FORC,), -- DDL_IMPO=( -- _F( GROUP_NO = 'LP8P9', -- DX = ZERO), -- _F( GROUP_NO = 'LP8P9B', -- DX = ZERO), -- _F( GROUP_NO = 'P11', -- DY = ZERO)) -- ) -- --DEP=MECA_STATIQUE( MODELE=MO, CHAM_MATER=CHMAT, -- SENSIBILITE = (FORC), -- EXCIT=_F( CHARGE = CH), -- ) -- --DEP=CALC_ELEM(reuse=DEP,RESULTAT=DEP, -- SENSIBILITE = (FORC), -- OPTION=('EPSI_ELGA_DEPL','SIEF_ELGA_DEPL',),) -- --FOND=DEFI_FOND_FISS( MAILLAGE=MA, -- FOND_FISS=_F( GROUP_NO = ('P0',)), -- NORMALE=(0., 1., 0.,) -- ) -- --THETA0=CALC_THETA( MODELE=MO, -- THETA_2D=_F( GROUP_NO = ('P0',), -- MODULE = 1., -- R_INF = 3.75E-5, -- R_SUP = 7.50E-5), -- DIRECTION=(1., 0., 0.,) -- ) -- --G0=CALC_G( RESULTAT=DEP, -- THETA=_F(THETA=THETA0), -- SYME_CHAR='SANS', -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT') -- ) -- --DG0=CALC_G( RESULTAT=DEP, -- SENSIBILITE = (FORC), -- THETA=_F(THETA=THETA0), -- SYME_CHAR='SANS', -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT') -- ) -- --TEST_TABLE( TABLE=DG0, -- NOM_PARA='DG/DF', -- SENSIBILITE = (FORC), -- VALE=1.06E-2, -- REFERENCE='ANALYTIQUE', -- PRECISION=0.0005 ) --FIN() -- --THETA01=CALC_THETA( MODELE=MO, -- THETA_2D=_F( GROUP_NO = ('P0',), -- MODULE = 1., -- R_INF = 7.50E-5, -- R_SUP = 1.125E-4), -- DIRECTION=(1., 0., 0.,) -- ) -- --G1=CALC_G( RESULTAT=DEP, -- THETA=_F(THETA=THETA01), -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT'), -- SYME_CHAR='SANS' -- ) -- --DG1=CALC_G( RESULTAT=DEP, -- SENSIBILITE = (FORC), -- THETA=_F(THETA=THETA01), -- SYME_CHAR='SANS', -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT') -- ) -- --TEST_TABLE( TABLE=DG1, -- NOM_PARA='G', -- SENSIBILITE = (FORC), -- REFERENCE='ANALYTIQUE', -- VALE=1.06E-2, -- PRECISION=0.0005 ) -- --# --# DERIVEE PAR RAPPORT A E --# -- --DEP2=MECA_STATIQUE( MODELE=MO, CHAM_MATER=CHMAT, -- SENSIBILITE = (YOUNG), -- EXCIT=_F( CHARGE = CH), -- ) -- --DEP2=CALC_ELEM(reuse=DEP2,RESULTAT=DEP2, -- SENSIBILITE = (YOUNG), -- OPTION=('EPSI_ELGA_DEPL','SIEF_ELGA_DEPL',),) -- -- --DG2=CALC_G( RESULTAT=DEP2, -- SENSIBILITE = (YOUNG), -- THETA=_F(THETA=THETA0), -- SYME_CHAR='SANS', -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT') -- ) -- --TEST_TABLE( TABLE=DG2, -- NOM_PARA='G', -- SENSIBILITE = (YOUNG), -- REFERENCE='ANALYTIQUE', -- VALE=-5.3E-3, -- PRECISION=0.0005 ) -- -- --DG3=CALC_G( RESULTAT=DEP2, -- SENSIBILITE = (YOUNG), -- THETA=_F(THETA=THETA01), -- SYME_CHAR='SANS', -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT') -- ) -- --TEST_TABLE( TABLE=DG3, -- NOM_PARA='G', -- VALE=-5.3E-3, -- SENSIBILITE = (YOUNG), -- REFERENCE='ANALYTIQUE', -- PRECISION=0.0005 ) -- -- --FIN() -- diff --cc Tests/testcomm/hsnv100h.comm index 976dc604,976dc604..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm/hsnv100h.comm +++ /dev/null @@@ -1,46 -1,46 +1,0 @@@ --# MODIF DATE 23/10/2006 AUTEUR VABHHTS J.PELLET --# TITRE THERMO-PLASTICITE EN TRACTION SIMPLE (MODELISATION:C_PLAN) --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2006 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. --# ====================================================================== --# -- --DEBUT(CODE=_F( NOM = 'HSNV100H',NIV_PUB_WEB='INTRANET'),IMPR_MACRO='OUI',DEBUG=_F(SDVERI='OUI')) -- --#...................................................................... --# CAS TEST THERMOPLASTICITE ELEMENTAIRE --#...................................................................... --# DEFINITION DES CARACTERISTIQUES DU MATERIAU --# -- --MAIL=LIRE_MAILLAGE( ) -- --INCLUDE_MATERIAU(TYPE_MODELE='REF', -- TYPE_VALE='NOMI', -- NOM_AFNOR='Z2CND1712', -- VARIANTE='A', -- NOM_MATER='MONMAT', -- UNITE_LONGUEUR='MM' -- ) -- --CHMAT=AFFE_MATERIAU( MAILLAGE=MAIL,AFFE=( -- _F( TOUT='OUI',TEMP_REF=25, MATER = MONMAT), -- ),) -- --# -- --FIN() diff --cc Tests/testcomm/incmat.comm index 705a1cbd,705a1cbd..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/incmat.comm +++ /dev/null @@@ -1,7 -1,7 +1,0 @@@ --DEBUT() --MA=LIRE_MAILLAGE() --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) -- --FIN() diff --cc Tests/testcomm/param1.comm index 79172614,79172614..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/param1.comm +++ /dev/null @@@ -1,36 -1,36 +1,0 @@@ -- --DEBUT() --TEMP_MOY=50. --coef0 = 1.E-3 -- --A0=DEFI_FONCTION( NOM_PARA='TEMP', -- PROL_DROITE='EXCLU', -- PROL_GAUCHE='EXCLU', -- VALE=( -- 20. ,14.7 *coef0, -- 50. ,15.2 *coef0, -- 100. ,15.8 *coef0, -- 150. ,16.7 *coef0, -- 200. ,17.2 *coef0, -- 250. ,18. *coef0, -- 300. ,18.6 *coef0, -- 350. ,19.3 *coef0, -- 400. ,20. *coef0, -- 450. ,20.5 *coef0, -- 500. ,21.1 *coef0, -- 550. ,21.7 *coef0, -- 600. ,22.2 *coef0, -- 650. ,22.7 *coef0, -- 700. ,23.2 *coef0, -- 750. ,23.7 *coef0, -- 800. ,24.1 *coef0, -- 950. ,26.67 *coef0, -- 1150. ,29.24 *coef0, -- 1370. ,32.06 *coef0, -- )) -- --DEFI_MATERIAU( ELAS=_F( RHO = 1.E08, -- NU = 0.3, -- E = A0(TEMP_MOY))) -- --FIN() diff --cc Tests/testcomm/param2.com0 index 2d32a387,2d32a387..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/param2.com0 +++ /dev/null @@@ -1,4 -1,4 +1,0 @@@ --POURSUITE(); --l1=DEFI_LIST_ENTI(DEBUT=mon_param,); --FIN(); -- diff --cc Tests/testcomm/param2.comm index 19c8eeb2,19c8eeb2..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/param2.comm +++ /dev/null @@@ -1,4 -1,4 +1,0 @@@ --DEBUT(); --mon_param = 2; --m=LIRE_MAILLAGE() --FIN(); diff --cc Tests/testcomm/param3.11 index 236ca5ca,236ca5ca..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/param3.11 +++ /dev/null @@@ -1,2 -1,2 +1,0 @@@ --x=45 --y=77 diff --cc Tests/testcomm/param3.12 index 2c2a2157,2c2a2157..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/param3.12 +++ /dev/null @@@ -1,1 -1,1 +1,0 @@@ --d=5;f=7 diff --cc Tests/testcomm/param3.com0 index d5a0bbf5,d5a0bbf5..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/param3.com0 +++ /dev/null @@@ -1,11 -1,11 +1,0 @@@ --POURSUITE(); --l1=DEFI_LIST_ENTI(DEBUT=2*mon_param+1,); --l2=DEFI_LIST_ENTI(DEBUT=a[1]); --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) --INCLUDE(UNITE=11) --INCLUDE(UNITE=12) -- --FIN(); -- diff --cc Tests/testcomm/param3.comm index b7a38ea2,b7a38ea2..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/param3.comm +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --DEBUT(); --mon_param = 2; --m=LIRE_MAILLAGE() --a=[1,2,3,4];b=2 --FIN(); diff --cc Tests/testcomm/pars1.comm index 53e7f325,53e7f325..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/pars1.comm +++ /dev/null @@@ -1,61 -1,61 +1,0 @@@ --DEBUT() --a=1 # comment --c=32.3 # comment -- --aa='string # bizarre' --a="string # bizarre" -- --b="string ( bizarre" -- --d="""string multi --line --""" --e="""string multi # ssssssssssss --line --""" --P='''string # bizarre' #profondeur ' # autre --bbb''' -- --#comment --#comment --#comment -- --#commenta --##XXXX=CHARGE(RAYON=0.1E-2,VALE=(0.12E-1,0.54E-5,0.1),MCF=_F(VALE=0.3E-5), --## V="toto", -- ## ) --#commentb -- --##CH=CHARGE(RAYON=0.1E-2,VALE=(0.12E-1,0.54E-5,0.1),MCF=_F(VALE=0.3E-5), --## MCF2=(_F(VALE=0.3E-4,GROUP_MA='GMA0601'),_F(VALE=0.3E-2)), --## VALE_C=[0.12E-3,0.54E-1,0.1], -- ## ) --MA=LIRE_MAILLAGE() --a=(10, --#commentc --12,13) -- --#commentd --P=1 #profondeur --#commente --aaa=(10, --11, #commentc --12,13) --xx=EVAL("13.26") -- --fmt_raison='-'*80+''' -- -- Exception erreur_Fatale interceptee -- Raison : %s -- --'''+'-'*80+'xxxxxxxxxxxxxxxx\n' -- --# commen """ --# commen ''' --# commen ' --# commen " --BETA=3.41557E-08 -- --a=8.3 ; #position -- --FIN() diff --cc Tests/testcomm/parseur.comm index 92aaf898,92aaf898..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/parseur.comm +++ /dev/null @@@ -1,74 -1,74 +1,0 @@@ --DEBUT() --P1 = 9.8; -- --P2 = 8.8; -- --P3 = 7; -- --P5 = P3*P1; -- --P6 = P1-3; -- --P4 = [2,3,4]; -- --a = 1. --b=3 --c= 3 * 5 --cc="b+3" --d= 4 + \ -- 5 \ -- -4 --e=LIRE_MAILLAGE() --##MA=LIRE_MAILLAGE() --x=(1,2) --y=[3, --#comme --4] --z="a" --zz='v' --u='''aaaa --bbbb''' --#ne marche pas avec le parseur actuel --#if 1: --# a=45 --#else: --# a=5.6 --d={"a":0} --e={"a":0, --#comme --"d":4} --#ne marche pas avec le parseur actuel --#a==1 --s="-"*80 --fmt_raison='-'*80+''' -- -- Exception erreur_Fatale interceptee -- Raison : %s -- --'''+'-'*80+'xxxxxxxxxxxxxxxx\n' -- --# commen """ --# commen ''' --# commen ' --# commen " --BETA=3.41557E-08 -- --C_0=105.7 -- --C_EQ_I05=69.1 -- --C_EQ_E05=69.1 -- --C_EQ_I10=51.6 -- --C_EQ_E10=69.1 -- --FL_INT05 = FORMULE(NOM_PARA='TEMP',VALE=''' --(0.5*BETA / ((C_0 - C_EQ_I05 )**2) -- * (TEMP - (2.*C_0 - C_EQ_I05 ))*(TEMP - C_EQ_I05 ))''') -- --zz=8.9; --#ne marche pas avec le parseur actuel --#zz=8.9;aa=10 #position -- --FIN() diff --cc Tests/testcomm/testcomm.py index 14d8981f,2fce38b6..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/testcomm.py +++ /dev/null @@@ -1,70 -1,70 +1,0 @@@ --import os,glob,sys --import unittest --import difflib -- --import prefs --from InterfaceTK import appli -- --def add_param(j,pos,nom,valeur): - co=j.addentite("PARAMETRE",pos) - co.set_nom(nom) - co=j.addEntite("PARAMETRE",pos) - co.setNom(nom) -- co.set_valeur(valeur) -- return co -- --def add_mcsimp(obj,nom,valeur): - mcs=obj.get_child(nom,restreint='oui') - mcs=obj.getChild(nom,restreint='oui') -- if mcs is None: - pos=obj.get_index_child(nom) - mcs=obj.addentite(nom,pos) - mcs.set_valeur(mcs.eval_val(valeur)) - pos=obj.getIndexChild(nom) - mcs=obj.addEntite(nom,pos) - mcs.set_valeur(mcs.evalVal(valeur)) -- return mcs -- --def cdiff(text1,text2): -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- --class TestCase(unittest.TestCase): -- app=None -- def setUp(self): -- if self.app == None: -- self.app=appli.STANDALONE(version='v8') -- pass -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- -- i=0 -- files= os.path.join(os.path.dirname(__file__),"*.comm") -- for f in glob.glob(files): -- for o in ('3','2','1','0','m'): -- f=f[:-1]+o -- if os.path.isfile(f):break -- -- i=i+1 -- exec """def test%s(self,file="%s"): -- "fichier:%s" -- self.commtest(file) --""" % (i,f,f) -- del i -- -- def commtest(self,file): -- """ Test generique""" -- #print file -- name=os.path.splitext(os.path.basename(file))[0] -- errfile=os.path.join(os.path.dirname(__file__),name+".err") -- err="" -- if os.path.isfile(errfile): -- f=open(errfile) -- err=f.read() -- f.close() -- j=self.app.openJDC(file=file) - assert j.cr.get_mess_exception() == "" - assert j.cr.getMessException() == "" -- -- if err == "": - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- else: -- txt=str(j.report()) -- assert txt == err,cdiff(err,txt) -- - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- j.supprime() -- assert sys.getrefcount(j) == 2,sys.getrefcount(j) diff --cc Tests/testcomm/titi.comm index a235be8a,a235be8a..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm/titi.comm +++ /dev/null @@@ -1,69 -1,69 +1,0 @@@ --DEBUT() --YOUNG = DEFI_PARA_SENSI(VALE=1.) --FORC = DEFI_PARA_SENSI(VALE=1.) --MA=LIRE_MAILLAGE() --MA=DEFI_GROUP( reuse=MA, MAILLAGE=MA, -- CREA_GROUP_NO=_F( -- GROUP_MA = ( 'LP9P10', 'LP9P10B', -- 'LP8P9', 'LP8P9B', -- )) -- ) -- --MO=AFFE_MODELE( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- PHENOMENE = 'MECANIQUE', -- MODELISATION = 'C_PLAN') -- ) --ZERO = DEFI_CONSTANTE(VALE=0.) --NU = DEFI_CONSTANTE(VALE=0.3) --ALPHA = DEFI_CONSTANTE(VALE=0.) -- --MAT=DEFI_MATERIAU(ELAS_FO=_F( E = YOUNG, NU = NU, -- TEMP_DEF_ALPHA =20., -- ALPHA = ALPHA, RHO=7800.,)) -- --CHMAT=AFFE_MATERIAU( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- MATER = MAT) -- ) -- --CH=AFFE_CHAR_MECA_F( MODELE=MO, -- FORCE_INTERNE=_F(TOUT='OUI',FY=FORC,), -- DDL_IMPO=( -- _F( GROUP_NO = 'LP8P9', -- DX = ZERO), -- _F( GROUP_NO = 'LP8P9B', -- DX = ZERO), -- _F( GROUP_NO = 'P11', -- DY = ZERO)) -- ) -- --DEP=MECA_STATIQUE( MODELE=MO, CHAM_MATER=CHMAT, -- SENSIBILITE = (FORC), -- EXCIT=_F( CHARGE = CH), -- ) -- --DEP=CALC_ELEM(reuse=DEP,RESULTAT=DEP, -- SENSIBILITE = (FORC), -- OPTION=('EPSI_ELGA_DEPL','SIEF_ELGA_DEPL',),) -- --FOND=DEFI_FOND_FISS( MAILLAGE=MA, -- FOND_FISS=_F( GROUP_NO = ('P0',)), -- NORMALE=(0., 1., 0.,) -- ) -- --THETA0=CALC_THETA( MODELE=MO, -- THETA_2D=_F( GROUP_NO = ('P0',), -- MODULE = 1., -- R_INF = 3.75E-5, -- R_SUP = 7.50E-5), -- DIRECTION=(1., 0., 0.,) -- ) -- -- --FIN() --MA1=LIRE_MAILLAGE() --MO1=AFFE_MODELE( MAILLAGE=MA1, AFFE=_F( TOUT = 'OUI', -- PHENOMENE = 'MECANIQUE', MODELISATION = 'C_PLAN')) -- --FIN() diff --cc Tests/testcomm7/a.11 index 1723fcb9,1723fcb9..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/a.11 +++ /dev/null @@@ -1,1 -1,1 +1,0 @@@ --MM=LIRE_MAILLAGE() diff --cc Tests/testcomm7/a.com0 index 04d1cc20,04d1cc20..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/a.com0 +++ /dev/null @@@ -1,3 -1,3 +1,0 @@@ --POURSUITE() --MA=LIRE_MAILLAGE(INFO=inf) --FIN() diff --cc Tests/testcomm7/a.comm index 665f63fe,665f63fe..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/a.comm +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --DEBUT() --inf=1 --p2=inf+1 --p3=sin(p2) --FIN() diff --cc Tests/testcomm7/aa.comm index 124141b4,124141b4..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/aa.comm +++ /dev/null @@@ -1,8 -1,8 +1,0 @@@ --DEBUT() --inf1=1 --MA=LIRE_MAILLAGE(INFO=inf1) --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) -- --FIN() diff --cc Tests/testcomm7/b.comm index 478973df,478973df..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/b.comm +++ /dev/null @@@ -1,9 -1,9 +1,0 @@@ --DEBUT() --a=1 --fmt_raison='-'*80+""" -- -- Exception erreur_Fatale interceptee -- Raison : %s -- --"""+'-'*80+'\n' --FIN() diff --cc Tests/testcomm7/c.comm index 36906c57,36906c57..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/c.comm +++ /dev/null @@@ -1,49 -1,49 +1,0 @@@ --from Numeric import cos --DEBUT() --RAYCRA=1. --EPCRA=0.1 --S_CR=3.1415*(RAYCRA**2-(RAYCRA-EPCRA)**2) --T_CR=3.1415 --NOMF="nomfichier" --n=2 -- --MA=LIRE_MAILLAGE( ) -- --MO=AFFE_MODELE( MAILLAGE=MA, -- #test de validateur GEOM (typ=grma) avec grma derive de GEOM -- AFFE=(_F(GROUP_MA = ('LI1'), -- PHENOMENE = 'MECANIQUE', -- MODELISATION = 'DIS_TR'), -- ), -- INFO=2,); -- --carel=[0.]*78 -- --CAREG=AFFE_CARA_ELEM(MODELE=MO, -- DISCRET=_F(GROUP_MA=('LI1'), -- CARA = 'K_TR_L', -- VALE = carel, -- REPERE='LOCAL' , ), -- ORIENTATION=(_F(GROUP_MA=('LI1',), -- CARA='VECT_Y', -- VALE=(0.,0.,1.),),), -- AFFE_FIBRE =( _F(GROUP_MA='CRAYON', COOR_AXE_POUTRE = (0.,0.,), CARA='SURFACE', VALE=( 0.,S_CR/4,)), -- _F(GROUP_MA='CRAYON', COOR_AXE_POUTRE = (0.,0.,), CARA='SURFACE', VALE=( 0.,T_CR,)), -- _F(GROUP_MA='CRAYON', COOR_AXE_POUTRE = (0.,sin(n*22.5*pi/180),), CARA='SURFACE', VALE=( 0.,T_CR/4,)), -- _F(GROUP_MA='CRAYON', COOR_AXE_POUTRE = (0.,(cos(n*22.5*pi/180)),), CARA='SURFACE', VALE=( 0.,T_CR/4,)), -- ), -- ); -- --DEFI_FICHIER(UNITE=50, FICHIER='./REPE_OUT/zzzz206a_resu.mail') --#test de validateur LongStr avec parametre instance de PARAMETRE --DEFI_FICHIER(UNITE=50, FICHIER=NOMF) --#test de validateur LongStr avec parametre instance de Formula --u=DEFI_FICHIER( FICHIER=NOMF*2) --DEFI_FICHIER (ACTION='LIBERER',UNITE=50) --#test de validateur d'objet entier (typ='I'), instance de la classe entier --DEFI_FICHIER (ACTION='LIBERER',UNITE=u) -- --# test de validateur qui accepte tout (typ=assd) --IMPR_CO(CO=MA) -- --FIN() diff --cc Tests/testcomm7/d.comm index 06bd2405,06bd2405..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/d.comm +++ /dev/null @@@ -1,4 -1,4 +1,0 @@@ --DEBUT() --a=1 --MA=LIRE_MAILLAGE() --FIN() diff --cc Tests/testcomm7/e.comm index 15bf3261,15bf3261..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/e.comm +++ /dev/null @@@ -1,70 -1,70 +1,0 @@@ --DEBUT() --MAYA=LIRE_MAILLAGE() -- --MAYA=DEFI_GROUP( reuse=MAYA, MAILLAGE=MAYA, -- CREA_GROUP_MA=_F( NOM = 'TOUT', TOUT = 'OUI')) -- --BARRE1=AFFE_MODELE( MAILLAGE=MAYA, -- AFFE=_F( GROUP_MA='SS1', -- MODELISATION = 'POU_D_E', -- PHENOMENE = 'MECANIQUE')) --# --MATERIO1=DEFI_MATERIAU( ELAS=_F( RHO = 1.E08, NU = 0.3, E = 1.E10)) -- --MATERIO2=DEFI_MATERIAU( ELAS=_F( RHO = 0., NU = 0., E = 1.E15)) --# --CHMAT=AFFE_MATERIAU( MAILLAGE=MAYA,AFFE=( -- #_F( TOUT = 'OUI', MATER = MATERIO1), -- _F( GROUP_MA = 'SS1', MATER = MATERIO1), -- _F( GROUP_MA = 'SS2', MATER = MATERIO1), -- _F( GROUP_MA = 'SS3', MATER = MATERIO1), -- _F( GROUP_MA = 'RIGIDE', MATER = MATERIO2), --)) # commentaire test -- --CARA1=AFFE_CARA_ELEM( MODELE=BARRE1, -- POUTRE=_F( -- GROUP_MA = 'TOUT', -- SECTION = 'CERCLE', -- CARA = ('R', 'EP',), -- VALE = (0.1, 0.01,))) -- --GUIDAGE1=AFFE_CHAR_MECA( MODELE=BARRE1,DDL_IMPO=( -- _F( GROUP_MA='SS1', -- DX = 0., DZ = 0., DRX = 0., DRY = 0.), -- _F( GROUP_NO = 'L1', DY = 0., DRZ = 0.), -- )) -- --K_ELEM1=CALC_MATR_ELEM( MODELE=BARRE1, -- CARA_ELEM=CARA1, -- CHAM_MATER=CHMAT, -- OPTION='RIGI_MECA', -- CHARGE=GUIDAGE1) -- --NUM1=NUME_DDL( MATR_RIGI=K_ELEM1) -- --# --K_ASSE1=ASSE_MATRICE( MATR_ELEM=K_ELEM1, -- NUME_DDL=NUM1) -- --MODESTA1=MODE_STATIQUE( MATR_RIGI=K_ASSE1, -- MODE_STAT=_F( -- GROUP_NO=('L12'), -- AVEC_CMP = ('DY','DRZ'), -- )) -- --# parse: -affectation -- --DS1=[None]*5 --DS2=[None]*5 --DS3=[None]*5 --DS4=[None]*5 --CHS1=[None]*5 --CHS2=[None]*5 -- --# parse: +affectation -- --#for k in range(1,5): --# DS1[k] = CREA_CHAMP( OPERATION='EXTR', TYPE_CHAM='NOEU_DEPL_R', --# RESULTAT= MODESTA1, NUME_ORDRE=k, NOM_CHAM = 'DEPL'); -- --FIN() diff --cc Tests/testcomm7/efica01a.11 index bec37b5b,bec37b5b..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/efica01a.11 +++ /dev/null @@@ -1,19 -1,19 +1,0 @@@ --DEPL2 = FORMULE(NOM_PARA='INST',VALE='sin(OMEGAA*INST)/(OMEGAA**xx)') --DEPLACE2=CALC_FONC_INTERP( FONCTION=DEPL2, -- LIST_PARA=L_INST, -- NOM_PARA='INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE', -- NOM_RESU='DEPL' ) -- --MONO_X=CALC_CHAR_SEISME( MATR_MASS=MASSE, -- DIRECTION=( 1., 0., 0.,), -- MONO_APPUI='OUI' ) -- -- --MACRO_PROJ_BASE(BASE=MODE_MEC,MATR_ASSE_GENE=( -- _F( MATRICE = CO("MASS_GEN"), MATR_ASSE = MASSE), -- _F( MATRICE = CO("RIGI_GEN"), MATR_ASSE = RIGIDITE)), -- VECT_ASSE_GENE=_F( VECTEUR = CO("VECT_X"), VECT_ASSE = MONO_X) -- ) -- diff --cc Tests/testcomm7/efica01a.com0 index 25134e98,25134e98..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm7/efica01a.com0 +++ /dev/null @@@ -1,49 -1,49 +1,0 @@@ --POURSUITE(CODE=_F( NOM = 'EFICA01A')) -- --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) -- --CHMAT3=AFFE_MATERIAU( MAILLAGE=MAILLA3, -- AFFE=_F( TOUT='OUI', MATER = MAT3, TEMP_REF = 20.)) -- --riginor = 2.88E7 -- --TRAN_GE2=DYNA_TRAN_MODAL( MASS_GENE=MGEN_BIC, RIGI_GENE=RGEN_BIC, -- METHODE='EULER', -- AMOR_REDUIT=( 0.07, 0.07, ), -- MODE_STAT=MSTA_BIC,EXCIT=( -- _F( VECT_GENE = VECT_X1, ACCE = ACCELER1, -- MULT_APPUI = 'OUI', -- DIRECTION = ( 1., 0., 0.,), NOEUD = 'NO1', -- VITE = VITESSE1, DEPL = DEPLACE1), -- _F( VECT_GENE = VECT_X2, ACCE = ACCELER2, -- MULT_APPUI = 'OUI', -- DIRECTION = ( 1., 0., 0.,), NOEUD = 'NO11', -- VITE = VITESSE2, DEPL = DEPLACE2)), -- CHOC=_F( GROUP_NO_1 = 'MASSES1', -- GROUP_NO_2 = 'MASSES2', -- OBSTACLE = GRILLE, -- INTITULE = 'NO2/NO12', -- NORM_OBST = (0., 0., 1.,), -- DIST_1 = 0.4495, -- DIST_2 = 0.4495, -- RIGI_NOR = riginor, -- AMOR_NOR = 0., -- RIGI_TAN = 0., -- COULOMB = 0.), -- INCREMENT=_F( INST_INIT = 0., INST_FIN = 1., PAS = 0.00025), -- ARCHIVAGE=_F( PAS_ARCH = 8) -- ) -- --LISTIMP=DEFI_LIST_REEL( DEBUT=0., -- INTERVALLE=_F( JUSQU_A = 1., NOMBRE = 500)) -- --RESUA1=REST_BASE_PHYS( RESU_GENE=TRAN_GE1, -- LIST_INST=LISTIMP, -- INTERPOL='LIN', -- NOM_CHAM='DEPL', -- MULT_APPUI='OUI' -- ) -- --FIN() diff --cc Tests/testcomm7/efica01a.comm index 20eea866,20eea866..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm7/efica01a.comm +++ /dev/null @@@ -1,275 -1,275 +1,0 @@@ --# MODIF DATE 20/09/2004 AUTEUR DURAND C.DURAND --# TITRE TEST DE NON REGRESSION DE L IHM EFICAS - DERIVE DE SDND102A --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2001 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. --# ====================================================================== --# Ce cas test est gere en configuration dans la base ASTER, il sert de --# modele pour prononcer la recette de l IHM d EFICAS : l objectif est de --# pouvoir recreer ce test a l identique dans EFICAS a partir d une page --# blanche. --# On a donc essaye d y placer toutes les commandes un peu particulieres --# du langage de commandes d ASTER --# --# Il s agit en fait du test SDND102A auquel on a ajoute : --# la definition d un parametre (VAL) --# l inclusion d un fichier (INCLUDE) --# une poursuite (POURSUITE) --# Il contient ainsi : --# des parametres, des formules, des macros, des mots cles facteurs repetes --# (y compris conditionnes par des regles : calc_fonction / COMB), --# des blocs (mode_iter_simult,calc_char_seisme), un defi_valeur, un parametre. --# --# --# Il faudra y associer quelques recommandations pour la recette : --# - verifier qu en ouvrant le .com0, il demande bien a browser le .comm puis, en cascade, le .11 --# - verifier qu on peut bien supprimer une commande, un mot cle simple et facteur --# - verifier les acces a la doc --# --# -- -- --DEBUT(CODE=_F(NOM='EFICA01A',NIV_PUB_WEB='INTERNET',VISU_EFICAS='NON'),) -- --MAILLAGE=LIRE_MAILLAGE() -- --MAILLAGE=DEFI_GROUP(reuse=MAILLAGE, -- MAILLAGE=MAILLAGE, -- CREA_GROUP_NO=(_F(NOEUD='NO2', -- NOM='MASSES',), -- _F(NOEUD='NO1', -- NOM='ENCASTRE',),),) -- --MAILLA2=LIRE_MAILLAGE(UNITE=21,) -- --MODELE=AFFE_MODELE(MAILLAGE=MAILLAGE, -- AFFE=(_F(GROUP_MA='RESSORT', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO='MASSES', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) -- --BICHOC=AFFE_MODELE(MAILLAGE=MAILLA2, -- AFFE=(_F(GROUP_MA='RESSORTS', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) --VAL = 98696.0 -- -- --CARA_ELE=AFFE_CARA_ELEM(MODELE=MODELE, -- DISCRET=(_F(GROUP_MA='RESSORT', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CARA_BIC=AFFE_CARA_ELEM(MODELE=BICHOC, -- DISCRET=(_F(GROUP_MA='RESSORTS', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES1', -- CARA='M_T_D_N', -- VALE=25.0,), -- _F(GROUP_NO='MASSES2', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CON_LIM=AFFE_CHAR_MECA(MODELE=MODELE, -- DDL_IMPO=(_F(GROUP_NO='ENCASTRE', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO='MASSES', -- DY=0.0, -- DZ=0.0,),),) -- --CL_BICHO=AFFE_CHAR_MECA(MODELE=BICHOC, -- DDL_IMPO=(_F(GROUP_NO='ENCBICHO', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- DY=0.0, -- DZ=0.0,),),) -- --MACRO_MATR_ASSE(MODELE=MODELE, -- CARA_ELEM=CARA_ELE, -- CHARGE=CON_LIM, -- NUME_DDL=CO('NUMEDDL'), -- MATR_ASSE=(_F(MATRICE=CO('RIGIDITE'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASSE'), -- OPTION='MASS_MECA',),),) -- --MACRO_MATR_ASSE(MODELE=BICHOC, -- CARA_ELEM=CARA_BIC, -- CHARGE=CL_BICHO, -- NUME_DDL=CO('NUMDDLC'), -- MATR_ASSE=(_F(MATRICE=CO('RIGI_BIC'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASS_BIC'), -- OPTION='MASS_MECA',),),) -- --MODE_MEC=MODE_ITER_SIMULT(MATR_A=RIGIDITE, -- MATR_B=MASSE,) -- --MODE_MEC=NORM_MODE(reuse =MODE_MEC, -- MODE=MODE_MEC, -- NORME='MASS_GENE',) -- --MODE_BIC=MODE_ITER_SIMULT(MATR_A=RIGI_BIC, -- MATR_B=MASS_BIC, -- METHODE='JACOBI', -- OPTION='SANS', -- CALC_FREQ=_F(OPTION='BANDE', -- FREQ=(1.0,10.0,),),) -- --MODE_BIC=NORM_MODE(reuse =MODE_BIC, -- MODE=MODE_BIC, -- NORME='MASS_GENE',) -- --MODE_STA=MODE_STATIQUE(MATR_RIGI=RIGIDITE, -- MATR_MASS=MASSE, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --MSTA_BIC=MODE_STATIQUE(MATR_RIGI=RIGI_BIC, -- MATR_MASS=MASS_BIC, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --L_INST=DEFI_LIST_REEL(DEBUT=0.0, -- INTERVALLE=_F(JUSQU_A=1.0, -- PAS=1.E-4,),) -- --OMEGAA=2.*pi*10. -- --ACCE1 = FORMULE(VALE = 'sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER1=CALC_FONC_INTERP(FONCTION=ACCE1, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --ACCE2 = FORMULE(VALE = '-sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER2=CALC_FONC_INTERP(FONCTION=ACCE2, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE1 = FORMULE(VALE = '-cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE1=CALC_FONC_INTERP(FONCTION=VITE1, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --DEPL1 = FORMULE(VALE = '-sin(OMEGAA*INST)/(OMEGAA**2)', -- NOM_PARA='INST') -- --DEPLACE1=CALC_FONC_INTERP(FONCTION=DEPL1, -- NOM_RESU='DEPL', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE2 = FORMULE(VALE = 'cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE2=CALC_FONC_INTERP(FONCTION=VITE2, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --xx=2 -- --INCLUDE(UNITE=11, -- INFO=1,) -- --MUR=DEFI_OBSTACLE(TYPE='PLAN_Z',) -- --TRAN_GE1=DYNA_TRAN_MODAL(METHODE='EULER', -- MASS_GENE=MASS_GEN, -- RIGI_GENE=RIGI_GEN, -- AMOR_REDUIT=0.07, -- MODE_STAT=MODE_STA, -- INCREMENT=_F(INST_INIT=0.0, -- INST_FIN=1.0, -- PAS=2.0E-4,), -- ARCHIVAGE=_F(PAS_ARCH=8,), -- EXCIT=_F(VECT_GENE=VECT_X, -- ACCE=ACCELER1, -- VITE=VITESSE1, -- DEPL=DEPLACE1, -- MULT_APPUI='OUI', -- DIRECTION=(1.0,0.0,0.0,), -- NOEUD='NO1',), -- CHOC=_F(INTITULE='NO2/MUR', -- GROUP_NO_1='MASSES', -- OBSTACLE=MUR, -- ORIG_OBST=(-1.0,0.0,0.0,), -- NORM_OBST=(0.0,0.0,1.0,), -- JEU=1.1005, -- RIGI_NOR=5.76E7, -- AMOR_NOR=0.0, -- RIGI_TAN=0.0, -- COULOMB=0.0,),) -- --MULT_X1=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO1',) -- --MULT_X2=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO11',) -- --MACRO_PROJ_BASE(BASE=MODE_BIC, -- MATR_ASSE_GENE=(_F(MATRICE=CO('MGEN_BIC'), -- MATR_ASSE=MASS_BIC,), -- _F(MATRICE=CO('RGEN_BIC'), -- MATR_ASSE=RIGI_BIC,),), -- VECT_ASSE_GENE=(_F(VECTEUR=CO('VECT_X1'), -- VECT_ASSE=MULT_X1,), -- _F(VECTEUR=CO('VECT_X2'), -- VECT_ASSE=MULT_X2,),),) -- --GRILLE=DEFI_OBSTACLE(TYPE='BI_PLAN_Z',) -- --MAILLA3=LIRE_MAILLAGE(UNITE=22,) -- --FIN() diff --cc Tests/testcomm7/efica01b.11 index bec37b5b,bec37b5b..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/efica01b.11 +++ /dev/null @@@ -1,19 -1,19 +1,0 @@@ --DEPL2 = FORMULE(NOM_PARA='INST',VALE='sin(OMEGAA*INST)/(OMEGAA**xx)') --DEPLACE2=CALC_FONC_INTERP( FONCTION=DEPL2, -- LIST_PARA=L_INST, -- NOM_PARA='INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE', -- NOM_RESU='DEPL' ) -- --MONO_X=CALC_CHAR_SEISME( MATR_MASS=MASSE, -- DIRECTION=( 1., 0., 0.,), -- MONO_APPUI='OUI' ) -- -- --MACRO_PROJ_BASE(BASE=MODE_MEC,MATR_ASSE_GENE=( -- _F( MATRICE = CO("MASS_GEN"), MATR_ASSE = MASSE), -- _F( MATRICE = CO("RIGI_GEN"), MATR_ASSE = RIGIDITE)), -- VECT_ASSE_GENE=_F( VECTEUR = CO("VECT_X"), VECT_ASSE = MONO_X) -- ) -- diff --cc Tests/testcomm7/efica01b.comm index 20eea866,20eea866..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm7/efica01b.comm +++ /dev/null @@@ -1,275 -1,275 +1,0 @@@ --# MODIF DATE 20/09/2004 AUTEUR DURAND C.DURAND --# TITRE TEST DE NON REGRESSION DE L IHM EFICAS - DERIVE DE SDND102A --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2001 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. --# ====================================================================== --# Ce cas test est gere en configuration dans la base ASTER, il sert de --# modele pour prononcer la recette de l IHM d EFICAS : l objectif est de --# pouvoir recreer ce test a l identique dans EFICAS a partir d une page --# blanche. --# On a donc essaye d y placer toutes les commandes un peu particulieres --# du langage de commandes d ASTER --# --# Il s agit en fait du test SDND102A auquel on a ajoute : --# la definition d un parametre (VAL) --# l inclusion d un fichier (INCLUDE) --# une poursuite (POURSUITE) --# Il contient ainsi : --# des parametres, des formules, des macros, des mots cles facteurs repetes --# (y compris conditionnes par des regles : calc_fonction / COMB), --# des blocs (mode_iter_simult,calc_char_seisme), un defi_valeur, un parametre. --# --# --# Il faudra y associer quelques recommandations pour la recette : --# - verifier qu en ouvrant le .com0, il demande bien a browser le .comm puis, en cascade, le .11 --# - verifier qu on peut bien supprimer une commande, un mot cle simple et facteur --# - verifier les acces a la doc --# --# -- -- --DEBUT(CODE=_F(NOM='EFICA01A',NIV_PUB_WEB='INTERNET',VISU_EFICAS='NON'),) -- --MAILLAGE=LIRE_MAILLAGE() -- --MAILLAGE=DEFI_GROUP(reuse=MAILLAGE, -- MAILLAGE=MAILLAGE, -- CREA_GROUP_NO=(_F(NOEUD='NO2', -- NOM='MASSES',), -- _F(NOEUD='NO1', -- NOM='ENCASTRE',),),) -- --MAILLA2=LIRE_MAILLAGE(UNITE=21,) -- --MODELE=AFFE_MODELE(MAILLAGE=MAILLAGE, -- AFFE=(_F(GROUP_MA='RESSORT', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO='MASSES', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) -- --BICHOC=AFFE_MODELE(MAILLAGE=MAILLA2, -- AFFE=(_F(GROUP_MA='RESSORTS', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) --VAL = 98696.0 -- -- --CARA_ELE=AFFE_CARA_ELEM(MODELE=MODELE, -- DISCRET=(_F(GROUP_MA='RESSORT', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CARA_BIC=AFFE_CARA_ELEM(MODELE=BICHOC, -- DISCRET=(_F(GROUP_MA='RESSORTS', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES1', -- CARA='M_T_D_N', -- VALE=25.0,), -- _F(GROUP_NO='MASSES2', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CON_LIM=AFFE_CHAR_MECA(MODELE=MODELE, -- DDL_IMPO=(_F(GROUP_NO='ENCASTRE', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO='MASSES', -- DY=0.0, -- DZ=0.0,),),) -- --CL_BICHO=AFFE_CHAR_MECA(MODELE=BICHOC, -- DDL_IMPO=(_F(GROUP_NO='ENCBICHO', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- DY=0.0, -- DZ=0.0,),),) -- --MACRO_MATR_ASSE(MODELE=MODELE, -- CARA_ELEM=CARA_ELE, -- CHARGE=CON_LIM, -- NUME_DDL=CO('NUMEDDL'), -- MATR_ASSE=(_F(MATRICE=CO('RIGIDITE'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASSE'), -- OPTION='MASS_MECA',),),) -- --MACRO_MATR_ASSE(MODELE=BICHOC, -- CARA_ELEM=CARA_BIC, -- CHARGE=CL_BICHO, -- NUME_DDL=CO('NUMDDLC'), -- MATR_ASSE=(_F(MATRICE=CO('RIGI_BIC'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASS_BIC'), -- OPTION='MASS_MECA',),),) -- --MODE_MEC=MODE_ITER_SIMULT(MATR_A=RIGIDITE, -- MATR_B=MASSE,) -- --MODE_MEC=NORM_MODE(reuse =MODE_MEC, -- MODE=MODE_MEC, -- NORME='MASS_GENE',) -- --MODE_BIC=MODE_ITER_SIMULT(MATR_A=RIGI_BIC, -- MATR_B=MASS_BIC, -- METHODE='JACOBI', -- OPTION='SANS', -- CALC_FREQ=_F(OPTION='BANDE', -- FREQ=(1.0,10.0,),),) -- --MODE_BIC=NORM_MODE(reuse =MODE_BIC, -- MODE=MODE_BIC, -- NORME='MASS_GENE',) -- --MODE_STA=MODE_STATIQUE(MATR_RIGI=RIGIDITE, -- MATR_MASS=MASSE, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --MSTA_BIC=MODE_STATIQUE(MATR_RIGI=RIGI_BIC, -- MATR_MASS=MASS_BIC, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --L_INST=DEFI_LIST_REEL(DEBUT=0.0, -- INTERVALLE=_F(JUSQU_A=1.0, -- PAS=1.E-4,),) -- --OMEGAA=2.*pi*10. -- --ACCE1 = FORMULE(VALE = 'sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER1=CALC_FONC_INTERP(FONCTION=ACCE1, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --ACCE2 = FORMULE(VALE = '-sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER2=CALC_FONC_INTERP(FONCTION=ACCE2, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE1 = FORMULE(VALE = '-cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE1=CALC_FONC_INTERP(FONCTION=VITE1, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --DEPL1 = FORMULE(VALE = '-sin(OMEGAA*INST)/(OMEGAA**2)', -- NOM_PARA='INST') -- --DEPLACE1=CALC_FONC_INTERP(FONCTION=DEPL1, -- NOM_RESU='DEPL', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE2 = FORMULE(VALE = 'cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE2=CALC_FONC_INTERP(FONCTION=VITE2, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --xx=2 -- --INCLUDE(UNITE=11, -- INFO=1,) -- --MUR=DEFI_OBSTACLE(TYPE='PLAN_Z',) -- --TRAN_GE1=DYNA_TRAN_MODAL(METHODE='EULER', -- MASS_GENE=MASS_GEN, -- RIGI_GENE=RIGI_GEN, -- AMOR_REDUIT=0.07, -- MODE_STAT=MODE_STA, -- INCREMENT=_F(INST_INIT=0.0, -- INST_FIN=1.0, -- PAS=2.0E-4,), -- ARCHIVAGE=_F(PAS_ARCH=8,), -- EXCIT=_F(VECT_GENE=VECT_X, -- ACCE=ACCELER1, -- VITE=VITESSE1, -- DEPL=DEPLACE1, -- MULT_APPUI='OUI', -- DIRECTION=(1.0,0.0,0.0,), -- NOEUD='NO1',), -- CHOC=_F(INTITULE='NO2/MUR', -- GROUP_NO_1='MASSES', -- OBSTACLE=MUR, -- ORIG_OBST=(-1.0,0.0,0.0,), -- NORM_OBST=(0.0,0.0,1.0,), -- JEU=1.1005, -- RIGI_NOR=5.76E7, -- AMOR_NOR=0.0, -- RIGI_TAN=0.0, -- COULOMB=0.0,),) -- --MULT_X1=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO1',) -- --MULT_X2=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO11',) -- --MACRO_PROJ_BASE(BASE=MODE_BIC, -- MATR_ASSE_GENE=(_F(MATRICE=CO('MGEN_BIC'), -- MATR_ASSE=MASS_BIC,), -- _F(MATRICE=CO('RGEN_BIC'), -- MATR_ASSE=RIGI_BIC,),), -- VECT_ASSE_GENE=(_F(VECTEUR=CO('VECT_X1'), -- VECT_ASSE=MULT_X1,), -- _F(VECTEUR=CO('VECT_X2'), -- VECT_ASSE=MULT_X2,),),) -- --GRILLE=DEFI_OBSTACLE(TYPE='BI_PLAN_Z',) -- --MAILLA3=LIRE_MAILLAGE(UNITE=22,) -- --FIN() diff --cc Tests/testcomm7/f.comm index d15a6179,d15a6179..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/f.comm +++ /dev/null @@@ -1,18 -1,18 +1,0 @@@ --from Numeric import size -- --DEBUT() -- --# Definition des parametres de l'excitation sinusoidale --freq=1500.0 --periode=1.0/freq --pas=periode/100.0 -- --LISTTM=DEFI_LIST_REEL(DEBUT=0.0*periode, -- INTERVALLE=_F(JUSQU_A=100.0*periode, -- PAS=pas,),); -- --LISTRD=DEFI_LIST_REEL(DEBUT=(98.0)*periode+pas, -- INTERVALLE=_F(JUSQU_A=(100.0)*periode, -- PAS=pas,),); -- --FIN() diff --cc Tests/testcomm7/forma12c.22 index 1452b8f2,1452b8f2..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm7/forma12c.22 +++ /dev/null @@@ -1,5616 -1,5616 +1,0 @@@ --ACCELH1=DEFI_FONCTION(NOM_PARA='INST', -- VALE= -- ( -- 0.0 , 0.0 , -- 5.000000000000000E-03 , 1.384945820672120E-02 , -- 1.000000000000000E-02 , 1.382919843991470E-02 , -- 1.500000000000000E-02 , 1.382973754982250E-02 , -- 2.000000000000000E-02 , 1.383338152282280E-02 , -- 2.500000000000000E-02 , 1.393648950771420E-02 , -- 3.000000000000000E-02 , 1.434779984741860E-02 , -- 3.500000000000000E-02 , 1.512950713231800E-02 , -- 4.000000000000000E-02 , 1.614535272002630E-02 , -- 4.500000000000000E-02 , 1.731995083544010E-02 , -- 5.000000000000000E-02 , 1.859624623558040E-02 , -- 5.500000000000000E-02 , 1.953967672923960E-02 , -- 6.000000000000000E-02 , 1.941781110418540E-02 , -- 6.500000000000000E-02 , 1.786343830924350E-02 , -- 7.000000000000001E-02 , 1.516191250319950E-02 , -- 7.500000000000000E-02 , 1.188464893531830E-02 , -- 8.000000000000000E-02 , 8.604671706807470E-03 , -- 8.500000000000001E-02 , 5.843238016204390E-03 , -- 9.000000000000000E-02 , 3.844393537029640E-03 , -- 9.500000000000000E-02 , 2.578831760615030E-03 , -- 0.1 , 2.285337760842440E-03 , -- 0.105 , 3.429647164261850E-03 , -- 0.11 , 5.693975593542530E-03 , -- 0.115 , 8.059677068797949E-03 , -- 0.12 , 1.074690536157120E-02 , -- 0.125 , 1.570430547663250E-02 , -- 0.13 , 2.370085802024690E-02 , -- 0.135 , 3.228248728765840E-02 , -- 0.14 , 3.854420890726100E-02 , -- 0.145 , 4.255105840524570E-02 , -- 0.15 , 4.542487497977820E-02 , -- 0.155 , 4.522394778102340E-02 , -- 0.16 , 3.829095514459380E-02 , -- 0.165 , 2.483633029107950E-02 , -- 0.17 , 9.962011825963081E-03 , -- 0.175 , -1.690338763720670E-03 , -- 0.18 , -9.628765294085771E-03 , -- 0.185 , -1.491533457160890E-02 , -- 0.19 , -1.675574249783150E-02 , -- 0.195 , -1.397302390604700E-02 , -- 0.2 , -8.394257392452909E-03 , -- 0.205 , -4.066198655663860E-03 , -- 0.21 , -2.824511823738000E-03 , -- 0.215 , -2.617183840945080E-03 , -- 0.22 , -1.417346427510000E-03 , -- 0.225 , -1.143002215953450E-03 , -- 0.23 , -5.114862179520550E-03 , -- 0.235 , -1.257393226409120E-02 , -- 0.24 , -2.009825306788950E-02 , -- 0.245 , -2.922606396367100E-02 , -- 0.25 , -4.681398923377460E-02 , -- 0.255 , -7.440515051138789E-02 , -- 0.26 , -0.10334790104033 , -- 0.265 , -0.12586697159281 , -- 0.27 , -0.14387794464775 , -- 0.275 , -0.15814759425273 , -- 0.28 , -0.15645166862504 , -- 0.285 , -0.12686021613717 , -- 0.29 , -7.870738657620450E-02 , -- 0.295 , -3.337529798013800E-02 , -- 0.3 , 4.960493246599410E-03 , -- 0.305 , 5.045559596258160E-02 , -- 0.31 , 0.105226085321393 , -- 0.315 , 0.149377859842677 , -- 0.32 , 0.169404090056596 , -- 0.325 , 0.175768658339062 , -- 0.33 , 0.179795570216475 , -- 0.335 , 0.172362231098084 , -- 0.34 , 0.14178782193451 , -- 0.345 , 9.600009720172401E-02 , -- 0.35 , 4.821844915823450E-02 , -- 0.355 , -4.337533256019430E-03 , -- 0.36 , -6.584719156367530E-02 , -- 0.365 , -0.11836425870338 , -- 0.37 , -0.13733576068719 , -- 0.375 , -0.12352979806305 , -- 0.38 , -9.647458189678811E-02 , -- 0.385 , -6.215705630868780E-02 , -- 0.39 , -1.230416228554950E-02 , -- 0.395 , 4.641921735700460E-02 , -- 0.4 , 8.859572962085120E-02 , -- 0.405 , 9.988862929152570E-02 , -- 0.41 , 9.014811266775360E-02 , -- 0.415 , 7.203047941527541E-02 , -- 0.42 , 4.502398610270280E-02 , -- 0.425 , 6.797639622722420E-03 , -- 0.43 , -3.515202910758360E-02 , -- 0.435 , -7.008994299356780E-02 , -- 0.44 , -9.184195885494270E-02 , -- 0.445 , -9.764578216442391E-02 , -- 0.45 , -8.980199943709211E-02 , -- 0.455 , -7.844678621890611E-02 , -- 0.46 , -7.092648374585479E-02 , -- 0.465 , -5.916134617989510E-02 , -- 0.47 , -2.956966177372460E-02 , -- 0.475 , 1.671374368998170E-02 , -- 0.48 , 6.681414337976969E-02 , -- 0.485 , 0.115921896874314 , -- 0.49 , 0.168522035427266 , -- 0.495 , 0.222448388891968 , -- 0.5 , 0.268501345352512 , -- 0.505 , 0.304492502191568 , -- 0.51 , 0.333201521434027 , -- 0.515 , 0.348912055073103 , -- 0.52 , 0.344336194210705 , -- 0.525 , 0.328357457992693 , -- 0.53 , 0.315639958020935 , -- 0.535 , 0.298753776631336 , -- 0.54 , 0.252828404979867 , -- 0.545 , 0.169993172714936 , -- 0.55 , 6.727059721322880E-02 , -- 0.555 , -4.209915010595060E-02 , -- 0.56 , -0.16027870746769 , -- 0.565 , -0.28051898189652 , -- 0.57 , -0.37473468426368 , -- 0.575 , -0.41761046311846 , -- 0.58 , -0.40704487960185 , -- 0.585 , -0.35317881167887 , -- 0.59 , -0.26473865427636 , -- 0.595 , -0.15439054042026 , -- 0.6 , -4.069603171914010E-02 , -- 0.605 , 6.408493301865420E-02 , -- 0.61 , 0.155029022019142 , -- 0.615 , 0.221244653075603 , -- 0.62 , 0.250448298949297 , -- 0.625 , 0.2498283906321 , -- 0.63 , 0.239493456134941 , -- 0.635 , 0.218886088833644 , -- 0.64 , 0.164337222785859 , -- 0.645 , 7.035013146739150E-02 , -- 0.65 , -3.065825126167990E-02 , -- 0.655 , -0.10313193025801 , -- 0.66 , -0.14127712726139 , -- 0.665 , -0.15425776005121 , -- 0.67 , -0.14167316851909 , -- 0.675 , -0.10137097186279 , -- 0.68 , -4.328536800004760E-02 , -- 0.685 , 2.048801937177380E-02 , -- 0.69 , 8.302000641121640E-02 , -- 0.695 , 0.129331142992423 , -- 0.7 , 0.139601455006784 , -- 0.705 , 0.121227983591054 , -- 0.71 , 0.113005236382458 , -- 0.715 , 0.1379818615802 , -- 0.72 , 0.176308826146499 , -- 0.725 , 0.205232483015008 , -- 0.73 , 0.236700670002903 , -- 0.735 , 0.28518726999873 , -- 0.74 , 0.325155532319882 , -- 0.745 , 0.319888795846513 , -- 0.75 , 0.275055725375209 , -- 0.755 , 0.223753796143942 , -- 0.76 , 0.172075077677344 , -- 0.765 , 0.102710116433296 , -- 0.77 , 2.458158105150330E-02 , -- 0.775 , -2.772090362464080E-02 , -- 0.78 , -4.579263759539020E-02 , -- 0.785 , -5.563702283874560E-02 , -- 0.79 , -6.754184615076410E-02 , -- 0.795 , -5.871706032442020E-02 , -- 0.8 , -1.692509300464670E-02 , -- 0.805 , 3.809918865159700E-02 , -- 0.81 , 9.363878798804159E-02 , -- 0.815 , 0.168712355371222 , -- 0.82 , 0.278043767236916 , -- 0.825 , 0.400260018759297 , -- 0.83 , 0.503549901131272 , -- 0.835 , 0.576593704222666 , -- 0.84 , 0.611464547720466 , -- 0.845 , 0.581774928421811 , -- 0.85 , 0.466685485187298 , -- 0.855 , 0.279469592461024 , -- 0.86 , 4.649599505060000E-02 , -- 0.865 , -0.22611474655397 , -- 0.87 , -0.53742100922433 , -- 0.875 , -0.85597468112981 , -- 0.88 , -1.12858445463436 , -- 0.885 , -1.31964097839003 , -- 0.89 , -1.41810357733099 , -- 0.895 , -1.4129005458435 , -- 0.9 , -1.29047173798494 , -- 0.905 , -1.05919909208997 , -- 0.91 , -0.75411881989804 , -- 0.915 , -0.41406737678731 , -- 0.92 , -7.194360976911091E-02 , -- 0.925 , 0.232932654611786 , -- 0.93 , 0.457448784206965 , -- 0.935 , 0.581369260987795 , -- 0.94 , 0.617884772522987 , -- 0.945 , 0.588638581913632 , -- 0.95 , 0.499594354895777 , -- 0.955 , 0.351854051263097 , -- 0.96 , 0.167285288529307 , -- 0.965 , -1.354817972678980E-02 , -- 0.97 , -0.16506107206104 , -- 0.975 , -0.30020976135865 , -- 0.98 , -0.44800006523462 , -- 0.985 , -0.60571664044792 , -- 0.99 , -0.72882650966723 , -- 0.995 , -0.78150351703968 , -- 1.0 , -0.78325351768449 , -- 1.005 , -0.7804638307994 , -- 1.01 , -0.77907901470961 , -- 1.015 , -0.74044922924701 , -- 1.02 , -0.64794816611668 , -- 1.025 , -0.53653982368824 , -- 1.03 , -0.43590944296704 , -- 1.035 , -0.32196595199848 , -- 1.04 , -0.15803623495676 , -- 1.045 , 4.418314484939760E-02 , -- 1.05 , 0.242865235492215 , -- 1.055 , 0.422391619487335 , -- 1.06 , 0.586878740356939 , -- 1.065 , 0.710461681206935 , -- 1.07 , 0.741340861669433 , -- 1.075 , 0.655713664787049 , -- 1.08 , 0.470616913700976 , -- 1.085 , 0.20656145315631 , -- 1.09 , -0.12112308548803 , -- 1.095 , -0.47118919290136 , -- 1.1 , -0.77786799146278 , -- 1.105 , -0.99394827732625 , -- 1.11 , -1.10304473601585 , -- 1.115 , -1.08949447190265 , -- 1.12 , -0.93583496154967 , -- 1.125 , -0.65727377808015 , -- 1.13 , -0.30107834922153 , -- 1.135 , 9.620828359443580E-02 , -- 1.14 , 0.514013416080853 , -- 1.145 , 0.90642132985077 , -- 1.15 , 1.20374217441116 , -- 1.155 , 1.37257710404611 , -- 1.16 , 1.43303286111545 , -- 1.165 , 1.40075730037501 , -- 1.17 , 1.25846296855354 , -- 1.175 , 1.00832137286648 , -- 1.18 , 0.706462116642059 , -- 1.185 , 0.413493607411118 , -- 1.19 , 0.148293682071222 , -- 1.195 , -8.190792579850280E-02 , -- 1.2 , -0.25000976533114 , -- 1.205 , -0.34497838239222 , -- 1.21 , -0.39991632301279 , -- 1.215 , -0.44361527764964 , -- 1.22 , -0.45948891812011 , -- 1.225 , -0.43276591909851 , -- 1.23 , -0.39819165775721 , -- 1.235 , -0.38929817650006 , -- 1.24 , -0.37545880341991 , -- 1.245 , -0.30998449197619 , -- 1.25 , -0.21624700688801 , -- 1.255 , -0.16343645166853 , -- 1.26 , -0.17391443905321 , -- 1.265 , -0.21919282258219 , -- 1.27 , -0.29688345097037 , -- 1.275 , -0.43984931085551 , -- 1.28 , -0.64071500818847 , -- 1.285 , -0.82875858278133 , -- 1.29 , -0.93796346189032 , -- 1.295 , -0.949512523725 , -- 1.3 , -0.857601537535 , -- 1.305 , -0.65014691427727 , -- 1.31 , -0.34930571456794 , -- 1.315 , -2.752743937664530E-02 , -- 1.32 , 0.246332435481473 , -- 1.325 , 0.45001279080827 , -- 1.33 , 0.58297681321004 , -- 1.335 , 0.636158064092188 , -- 1.34 , 0.611598530544366 , -- 1.345 , 0.543575003876384 , -- 1.35 , 0.472132760127251 , -- 1.355 , 0.4099056501601 , -- 1.36 , 0.349344621324927 , -- 1.365 , 0.282806527352702 , -- 1.37 , 0.200676817565078 , -- 1.375 , 9.097626989587490E-02 , -- 1.38 , -3.844874520206900E-02 , -- 1.385 , -0.1485730750104 , -- 1.39 , -0.19431957586841 , -- 1.395 , -0.15348271845224 , -- 1.4 , -2.614043201034680E-02 , -- 1.405 , 0.177537986918302 , -- 1.41 , 0.435115227256899 , -- 1.415 , 0.705841641151383 , -- 1.42 , 0.939450691097474 , -- 1.425 , 1.09606995057385 , -- 1.43 , 1.16508829271638 , -- 1.435 , 1.17152904343664 , -- 1.44 , 1.15677325221222 , -- 1.445 , 1.14474618562157 , -- 1.45 , 1.13563604509728 , -- 1.455 , 1.136131797716 , -- 1.46 , 1.17059034109195 , -- 1.465 , 1.24349566378999 , -- 1.47 , 1.31555125128714 , -- 1.475 , 1.34451073520553 , -- 1.48 , 1.32767985662737 , -- 1.485 , 1.27338631745007 , -- 1.49 , 1.15790168079473 , -- 1.495 , 0.956521791996786 , -- 1.5 , 0.698290997947875 , -- 1.505 , 0.438367846650034 , -- 1.51 , 0.189519144568428 , -- 1.515 , -6.309865148517370E-02 , -- 1.52 , -0.2907946493572 , -- 1.525 , -0.43414032419491 , -- 1.53 , -0.49035140435209 , -- 1.535 , -0.51769162343818 , -- 1.54 , -0.53944953961898 , -- 1.545 , -0.51762829963883 , -- 1.55 , -0.44905875024602 , -- 1.555 , -0.41047655284131 , -- 1.56 , -0.45801991852189 , -- 1.565 , -0.5452728301642 , -- 1.57 , -0.60180223196739 , -- 1.575 , -0.64090769354799 , -- 1.58 , -0.71776674993069 , -- 1.585 , -0.81770575898523 , -- 1.59 , -0.86693741584294 , -- 1.595 , -0.84067997754846 , -- 1.6 , -0.78353488744314 , -- 1.605 , -0.71744286940014 , -- 1.61 , -0.59774454986713 , -- 1.615 , -0.38171240617319 , -- 1.62 , -8.924731070437070E-02 , -- 1.625 , 0.229074480135456 , -- 1.63 , 0.542610098773165 , -- 1.635 , 0.829628497520742 , -- 1.64 , 1.04494574127203 , -- 1.645 , 1.13156269562082 , -- 1.65 , 1.05624249517991 , -- 1.655 , 0.819935992458342 , -- 1.66 , 0.449565343322086 , -- 1.665 , -2.180707598866940E-03 , -- 1.67 , -0.46040931126981 , -- 1.675 , -0.85138688793934 , -- 1.68 , -1.12388943755807 , -- 1.685 , -1.24657385888904 , -- 1.69 , -1.20179685962043 , -- 1.695 , -0.99981038351547 , -- 1.7 , -0.69163368557204 , -- 1.705 , -0.34742052586021 , -- 1.71 , -1.646326697056420E-02 , -- 1.715 , 0.283945578116849 , -- 1.72 , 0.543028107021654 , -- 1.725 , 0.737133979583192 , -- 1.73 , 0.84487160610996 , -- 1.735 , 0.870212972351319 , -- 1.74 , 0.834700198404195 , -- 1.745 , 0.747170431789498 , -- 1.75 , 0.594410232927394 , -- 1.755 , 0.367486332109475 , -- 1.76 , 8.962182967477010E-02 , -- 1.765 , -0.1883067260291 , -- 1.77 , -0.41613375697166 , -- 1.775 , -0.56543072263443 , -- 1.78 , -0.62930681455469 , -- 1.785 , -0.60967253780204 , -- 1.79 , -0.50702726496872 , -- 1.795 , -0.32533912503295 , -- 1.8 , -9.026946700126549E-02 , -- 1.805 , 0.145429511003968 , -- 1.81 , 0.330819022676906 , -- 1.815 , 0.45222714352563 , -- 1.82 , 0.524252434401283 , -- 1.825 , 0.544685292311812 , -- 1.83 , 0.482635967462947 , -- 1.835 , 0.323118603668567 , -- 1.84 , 9.999214308770410E-02 , -- 1.845 , -0.1356321129448 , -- 1.85 , -0.36128518628156 , -- 1.855 , -0.57322505412043 , -- 1.86 , -0.74566937227067 , -- 1.865 , -0.831111234663 , -- 1.87 , -0.79988891088422 , -- 1.875 , -0.65798317740384 , -- 1.88 , -0.42968513644553 , -- 1.885 , -0.14457167669537 , -- 1.89 , 0.161701689894838 , -- 1.895 , 0.456458659481019 , -- 1.9 , 0.720641473510481 , -- 1.905 , 0.93536449279502 , -- 1.91 , 1.06690148982661 , -- 1.915 , 1.08832474904443 , -- 1.92 , 1.00876475369484 , -- 1.925 , 0.854457298011041 , -- 1.93 , 0.628173977645005 , -- 1.935 , 0.322546940276438 , -- 1.94 , -2.596888473873320E-02 , -- 1.945 , -0.33525384338564 , -- 1.95 , -0.5416882826646 , -- 1.955 , -0.63460201942509 , -- 1.96 , -0.61577036509424 , -- 1.965 , -0.46445342826001 , -- 1.97 , -0.17427091738081 , -- 1.975 , 0.197608608481982 , -- 1.98 , 0.551300717211572 , -- 1.985 , 0.807313151449369 , -- 1.99 , 0.929291756112952 , -- 1.995 , 0.900203655372628 , -- 2.0 , 0.711960914602783 , -- 2.005 , 0.386125888668035 , -- 2.01 , -1.664845298933290E-02 , -- 2.015 , -0.42003837834356 , -- 2.02 , -0.75822166854004 , -- 2.025 , -0.97936810396973 , -- 2.03 , -1.0426579951744 , -- 2.035 , -0.93057240999803 , -- 2.04 , -0.66368034717177 , -- 2.045 , -0.29110991423144 , -- 2.05 , 0.119136312621438 , -- 2.055 , 0.505291402538494 , -- 2.06 , 0.880216899892637 , -- 2.065 , 1.20828770980265 , -- 2.07 , 1.46849325860208 , -- 2.075 , 1.67233522841001 , -- 2.08 , 1.84159238892188 , -- 2.085 , 1.97017314302929 , -- 2.09 , 2.02820005370812 , -- 2.095 , 2.00307389537606 , -- 2.1 , 1.90918679712901 , -- 2.105 , 1.7492164388665 , -- 2.11 , 1.49601732028444 , -- 2.115 , 1.13320644545655 , -- 2.12 , 0.691534368057989 , -- 2.125 , 0.222522846896641 , -- 2.13 , -0.2568718835065 , -- 2.135 , -0.73270869895797 , -- 2.14 , -1.16691560085841 , -- 2.145 , -1.52131308342383 , -- 2.15 , -1.77830659090987 , -- 2.155 , -1.94190868704924 , -- 2.16 , -2.01807428134882 , -- 2.165 , -2.01753841723068 , -- 2.17 , -1.96550102271951 , -- 2.175 , -1.88172547074643 , -- 2.18 , -1.76181108149962 , -- 2.185 , -1.60314470865115 , -- 2.19 , -1.43287068566641 , -- 2.195 , -1.27868078783724 , -- 2.2 , -1.12992856906385 , -- 2.205 , -0.96854903020236 , -- 2.21 , -0.82469988669093 , -- 2.215 , -0.75306712540506 , -- 2.22 , -0.75949831264927 , -- 2.225 , -0.80266627698916 , -- 2.23 , -0.86825465400046 , -- 2.235 , -0.98190873939491 , -- 2.24 , -1.13332846537187 , -- 2.245 , -1.24587809111606 , -- 2.25 , -1.25403636722243 , -- 2.255 , -1.16774949125882 , -- 2.26 , -1.02737996901608 , -- 2.265 , -0.83618584315821 , -- 2.27 , -0.58078051378866 , -- 2.275 , -0.28886675266917 , -- 2.28 , -1.584903466322660E-02 , -- 2.285 , 0.243494185775485 , -- 2.29 , 0.493747779128152 , -- 2.295 , 0.763367558765503 , -- 2.3 , 1.04659160151311 , -- 2.305 , 1.31787059651459 , -- 2.31 , 1.55330513693362 , -- 2.315 , 1.72708398800512 , -- 2.32 , 1.80403390270411 , -- 2.325 , 1.74474528448072 , -- 2.33 , 1.51781565889812 , -- 2.335 , 1.11765857002866 , -- 2.34 , 0.582482410154426 , -- 2.345 , -9.718428438488540E-03 , -- 2.35 , -0.57168637020167 , -- 2.355 , -1.03230607359137 , -- 2.36 , -1.33718623748091 , -- 2.365 , -1.44694517260007 , -- 2.37 , -1.35098612723151 , -- 2.375 , -1.07661964039704 , -- 2.38 , -0.67815732332436 , -- 2.385 , -0.22427774359532 , -- 2.39 , 0.206546911873295 , -- 2.395 , 0.541628296955107 , -- 2.4 , 0.739725635914114 , -- 2.405 , 0.792688071679571 , -- 2.41 , 0.699855261818748 , -- 2.415 , 0.460345996951087 , -- 2.42 , 9.825062680758330E-02 , -- 2.425 , -0.32686436332366 , -- 2.43 , -0.75151572607261 , -- 2.435 , -1.13800924040631 , -- 2.44 , -1.46265919709476 , -- 2.445 , -1.69312259897435 , -- 2.45 , -1.79655595938503 , -- 2.455 , -1.76112116582848 , -- 2.46 , -1.59504402395201 , -- 2.465 , -1.31375304224191 , -- 2.47 , -0.94339622712974 , -- 2.475 , -0.5311872307141 , -- 2.48 , -0.13652655158703 , -- 2.485 , 0.191652831784399 , -- 2.49 , 0.427316277261529 , -- 2.495 , 0.565105289247264 , -- 2.5 , 0.614388715344672 , -- 2.505 , 0.595214227948157 , -- 2.51 , 0.537482815214678 , -- 2.515 , 0.480599475426244 , -- 2.52 , 0.461418219827792 , -- 2.525 , 0.490351150400196 , -- 2.53 , 0.544926077525614 , -- 2.535 , 0.597359901626847 , -- 2.54 , 0.63915145270988 , -- 2.545 , 0.666359147512914 , -- 2.55 , 0.659549902572926 , -- 2.555 , 0.607653814797886 , -- 2.56 , 0.542274304956947 , -- 2.565 , 0.514978623780516 , -- 2.57 , 0.542507936778163 , -- 2.575 , 0.605343596447052 , -- 2.58 , 0.694971250554721 , -- 2.585 , 0.820564438850225 , -- 2.59 , 0.964525817889196 , -- 2.595 , 1.07728875105342 , -- 2.6 , 1.13416623229962 , -- 2.605 , 1.16046452303612 , -- 2.61 , 1.18333170206295 , -- 2.615 , 1.19818806982642 , -- 2.62 , 1.2055342011362 , -- 2.625 , 1.23921335799247 , -- 2.63 , 1.32082369230339 , -- 2.635 , 1.41353565810184 , -- 2.64 , 1.45647248242833 , -- 2.645 , 1.42296156176653 , -- 2.65 , 1.31247243180803 , -- 2.655 , 1.10982597617917 , -- 2.66 , 0.796193729509591 , -- 2.665 , 0.391525367264635 , -- 2.67 , -5.039209232008630E-02 , -- 2.675 , -0.48551296055089 , -- 2.68 , -0.89084690987514 , -- 2.685 , -1.24148991258587 , -- 2.69 , -1.50817716119153 , -- 2.695 , -1.67597297557138 , -- 2.7 , -1.74058611919401 , -- 2.705 , -1.69018703360535 , -- 2.71 , -1.51441737441596 , -- 2.715 , -1.22691360409733 , -- 2.72 , -0.85820811206465 , -- 2.725 , -0.43656402639097 , -- 2.73 , -1.877591162527850E-03 , -- 2.735 , 0.3722134714064 , -- 2.74 , 0.604368486493566 , -- 2.745 , 0.654206094948509 , -- 2.75 , 0.520823349815255 , -- 2.755 , 0.204565302761595 , -- 2.76 , -0.24284766157643 , -- 2.765 , -0.75311719985656 , -- 2.77 , -1.25324781337662 , -- 2.775 , -1.6520239944361 , -- 2.78 , -1.91175925323649 , -- 2.785 , -2.02042853839568 , -- 2.79 , -1.95654753001104 , -- 2.795 , -1.71189367332731 , -- 2.8 , -1.33217954914393 , -- 2.805 , -0.90169171320611 , -- 2.81 , -0.48741397679456 , -- 2.815 , -0.11957680209296 , -- 2.82 , 0.208180180447444 , -- 2.825 , 0.429754499753944 , -- 2.83 , 0.500373556893508 , -- 2.835 , 0.453923556202155 , -- 2.84 , 0.356589274872127 , -- 2.845 , 0.252756610751608 , -- 2.85 , 0.15368816142573 , -- 2.855 , 7.226479768245560E-02 , -- 2.86 , 3.888968358902120E-02 , -- 2.865 , 7.085947846528430E-02 , -- 2.87 , 0.145649387450817 , -- 2.875 , 0.221440328548596 , -- 2.88 , 0.271936154319643 , -- 2.885 , 0.285520971687156 , -- 2.89 , 0.244558483181686 , -- 2.895 , 0.131111505423643 , -- 2.9 , -4.976188706858230E-02 , -- 2.905 , -0.27342387270832 , -- 2.91 , -0.51955671330527 , -- 2.915 , -0.77083790776384 , -- 2.92 , -0.9909431240431 , -- 2.925 , -1.1326860598253 , -- 2.93 , -1.17530215375529 , -- 2.935 , -1.1315547074335 , -- 2.94 , -1.01461371409468 , -- 2.945 , -0.82697517656886 , -- 2.95 , -0.5923950948081 , -- 2.955 , -0.367250148284 , -- 2.96 , -0.19748847576212 , -- 2.965 , -8.287483750208639E-02 , -- 2.97 , 1.205615998459890E-03 , -- 2.975 , 6.700285876984650E-02 , -- 2.98 , 0.142475719272639 , -- 2.985 , 0.272732688275581 , -- 2.99 , 0.498473860216776 , -- 2.995 , 0.815246300242191 , -- 3.0 , 1.17850966940332 , -- 3.005 , 1.5365879707165 , -- 3.01 , 1.83696246846193 , -- 3.015 , 2.01683359177992 , -- 3.02 , 2.02473029766593 , -- 3.025 , 1.85763991176815 , -- 3.03 , 1.55996114842794 , -- 3.035 , 1.19160270003895 , -- 3.04 , 0.817034460759104 , -- 3.045 , 0.512897988315463 , -- 3.05 , 0.347660769303193 , -- 3.055 , 0.341161122643262 , -- 3.06 , 0.460638539442427 , -- 3.065 , 0.655193651694964 , -- 3.07 , 0.871495085561553 , -- 3.075 , 1.04025886670637 , -- 3.08 , 1.0866972125822 , -- 3.085 , 0.97592646156581 , -- 3.09 , 0.732149789609832 , -- 3.095 , 0.404350262104711 , -- 3.1 , 3.450811147404410E-02 , -- 3.105 , -0.3574143716153 , -- 3.11 , -0.67593382755679 , -- 3.115 , -0.85741138771834 , -- 3.12 , -0.88812837843921 , -- 3.125 , -0.79137979090702 , -- 3.13 , -0.59262327029812 , -- 3.135 , -0.31629865744548 , -- 3.14 , -7.233283133936310E-03 , -- 3.145 , 0.273183439196407 , -- 3.15 , 0.478066409829062 , -- 3.155 , 0.58805365224197 , -- 3.16 , 0.593648649534557 , -- 3.165 , 0.483000051126779 , -- 3.17 , 0.254384438681656 , -- 3.175 , -6.624305965878829E-02 , -- 3.18 , -0.4267275966133 , -- 3.185 , -0.81396009231636 , -- 3.19 , -1.1955849391981 , -- 3.195 , -1.53431204255614 , -- 3.2 , -1.79550741772338 , -- 3.205 , -1.95961471169112 , -- 3.21 , -2.02193224868472 , -- 3.215 , -1.98153140879109 , -- 3.22 , -1.83692731893728 , -- 3.225 , -1.59274123405354 , -- 3.23 , -1.26186737186096 , -- 3.235 , -0.85475661028155 , -- 3.24 , -0.37101324608578 , -- 3.245 , 0.104191797011254 , -- 3.25 , 0.444402436394787 , -- 3.255 , 0.80270823947836 , -- 3.26 , 1.15997110726162 , -- 3.265 , 1.495182836989 , -- 3.27 , 1.77744468860316 , -- 3.275 , 1.96545418255327 , -- 3.28 , 2.0238275806165 , -- 3.285 , 1.94070094966571 , -- 3.29 , 1.72718398222401 , -- 3.295 , 1.40473739766314 , -- 3.3 , 1.00200904728279 , -- 3.305 , 0.563540200278601 , -- 3.31 , 0.149874332156587 , -- 3.315 , -0.36080714644631 , -- 3.32 , -0.78705501088032 , -- 3.325 , -0.96779259671266 , -- 3.33 , -0.92388383903371 , -- 3.335 , -0.70129187312547 , -- 3.34 , -0.37633413832281 , -- 3.345 , -4.983212937679970E-02 , -- 3.35 , 0.182525585093038 , -- 3.355 , 0.262197946276188 , -- 3.36 , 0.176793782229557 , -- 3.365 , -5.176420413944920E-02 , -- 3.37 , -0.37933630972585 , -- 3.375 , -0.74271351288949 , -- 3.38 , -1.06375084817712 , -- 3.385 , -1.26478653529069 , -- 3.39 , -1.29047203891782 , -- 3.395 , -1.12256167350094 , -- 3.4 , -0.78075489126115 , -- 3.405 , -0.31359677016703 , -- 3.41 , 0.21274034122224 , -- 3.415 , 0.723339413347021 , -- 3.42 , 1.14216320992711 , -- 3.425 , 1.40285852862188 , -- 3.43 , 1.46353765010519 , -- 3.435 , 1.31751508169454 , -- 3.44 , 0.990610982524745 , -- 3.445 , 0.528518300724784 , -- 3.45 , -1.201464116995880E-02 , -- 3.455 , -0.56495490805526 , -- 3.46 , -1.06256507808036 , -- 3.465 , -1.45449004401942 , -- 3.47 , -1.72216993561753 , -- 3.475 , -1.87372425489139 , -- 3.48 , -1.93012616321294 , -- 3.485 , -1.92125770401275 , -- 3.49 , -1.88683182264746 , -- 3.495 , -1.86489427093378 , -- 3.5 , -1.87314769209702 , -- 3.505 , -1.90576881574645 , -- 3.51 , -1.947112317286 , -- 3.515 , -1.97949862409975 , -- 3.52 , -1.97797423254897 , -- 3.525 , -1.91218852417812 , -- 3.53 , -1.76423764925703 , -- 3.535 , -1.54024679422456 , -- 3.54 , -1.25875344890035 , -- 3.545 , -0.9338632056843 , -- 3.55 , -0.57694094749828 , -- 3.555 , -0.20814045746558 , -- 3.56 , 0.146206363036127 , -- 3.565 , 0.468653953534567 , -- 3.57 , 0.754631835985132 , -- 3.575 , 0.999185044322006 , -- 3.58 , 1.18633789810153 , -- 3.585 , 1.29531712809396 , -- 3.59 , 1.31308664187438 , -- 3.595 , 1.23731524907479 , -- 3.6 , 1.07118836166498 , -- 3.605 , 0.822464072088323 , -- 3.61 , 0.509927368235254 , -- 3.615 , 0.167608567620092 , -- 3.62 , -0.16136132010127 , -- 3.625 , -0.43756626339828 , -- 3.63 , -0.63523583164368 , -- 3.635 , -0.74542737572521 , -- 3.64 , -0.7756133968174 , -- 3.645 , -0.74811092815284 , -- 3.65 , -0.69606885610044 , -- 3.655 , -0.6565734770812 , -- 3.66 , -0.66248883313473 , -- 3.665 , -0.7327889886856 , -- 3.67 , -0.86178796221599 , -- 3.675 , -1.01484775035497 , -- 3.68 , -1.13874812866412 , -- 3.685 , -1.18063976569405 , -- 3.69 , -1.10015331426255 , -- 3.695 , -0.87258642642403 , -- 3.7 , -0.49606882241743 , -- 3.705 , -3.859866915145810E-03 , -- 3.71 , 0.536274174652005 , -- 3.715 , 1.04296495682297 , -- 3.72 , 1.44309287260192 , -- 3.725 , 1.67861157963259 , -- 3.73 , 1.7100067792938 , -- 3.735 , 1.52993945453465 , -- 3.74 , 1.17332394495836 , -- 3.745 , 0.705456146258253 , -- 3.75 , 0.19881090381289 , -- 3.755 , -0.27919234543845 , -- 3.76 , -0.66960551503829 , -- 3.765 , -0.93205155196248 , -- 3.77 , -1.05626273217395 , -- 3.775 , -1.05832450991158 , -- 3.78 , -0.96616376411692 , -- 3.785 , -0.81175596966687 , -- 3.79 , -0.6282915868819 , -- 3.795 , -0.43985996859902 , -- 3.8 , -0.25160708755689 , -- 3.805 , -5.670095344855360E-02 , -- 3.81 , 0.149245250303935 , -- 3.815 , 0.367246556878583 , -- 3.82 , 0.6001728423305 , -- 3.825 , 0.842651059699404 , -- 3.83 , 1.06576976559939 , -- 3.835 , 1.22584984073272 , -- 3.84 , 1.29118905603104 , -- 3.845 , 1.25131649498925 , -- 3.85 , 1.10483834283469 , -- 3.855 , 0.858719957928343 , -- 3.86 , 0.546596899968826 , -- 3.865 , 0.232913780073415 , -- 3.87 , -1.178392373167330E-02 , -- 3.875 , -0.13503158427521 , -- 3.88 , -0.10474649816556 , -- 3.885 , 8.615352677596511E-02 , -- 3.89 , 0.410679548743155 , -- 3.895 , 0.826698146053687 , -- 3.9 , 1.26554832994177 , -- 3.905 , 1.65499072160026 , -- 3.91 , 1.92591491458393 , -- 3.915 , 2.02174681879988 , -- 3.92 , 1.91690039738994 , -- 3.925 , 1.62485068724173 , -- 3.93 , 1.1855690119834 , -- 3.935 , 0.653037378513217 , -- 3.94 , 9.668746640223920E-02 , -- 3.945 , -0.4301741972333 , -- 3.95 , -0.83059880381395 , -- 3.955 , -1.06253651005356 , -- 3.96 , -1.12343783668418 , -- 3.965 , -1.02905594887957 , -- 3.97 , -0.81438063696053 , -- 3.975 , -0.53887343061785 , -- 3.98 , -0.27199822870815 , -- 3.985 , -6.791154597367660E-02 , -- 3.99 , 4.530742217552380E-02 , -- 3.995 , 6.262857784368379E-02 , -- 4.0 , 2.441344328897610E-03 , -- 4.005 , -9.190475922367920E-02 , -- 4.01 , -0.16297517487801 , -- 4.015 , -0.15723894800794 , -- 4.02 , -3.537253515270430E-02 , -- 4.025 , 0.193043922562747 , -- 4.03 , 0.526357119583793 , -- 4.035 , 0.929427363269694 , -- 4.04 , 1.34182501632519 , -- 4.045 , 1.69896106062951 , -- 4.05 , 1.94147299764395 , -- 4.055 , 2.02131168938189 , -- 4.06 , 1.91405493567929 , -- 4.065 , 1.62895808406502 , -- 4.07 , 1.20381890102136 , -- 4.075 , 0.692151048809337 , -- 4.08 , 0.156757509395021 , -- 4.085 , -0.38604102584051 , -- 4.09 , -0.84133083525009 , -- 4.095 , -1.156233699226 , -- 4.1 , -1.33230861444598 , -- 4.105 , -1.38570779035153 , -- 4.11 , -1.34124970345719 , -- 4.115 , -1.23546550701648 , -- 4.12 , -1.10801235519435 , -- 4.125 , -0.98248955079667 , -- 4.13 , -0.86003296814087 , -- 4.135 , -0.73178734822649 , -- 4.14 , -0.59090783838188 , -- 4.145 , -0.43318234968906 , -- 4.15 , -0.25684880447788 , -- 4.155 , -6.856986064204031E-02 , -- 4.16 , 0.113175698843399 , -- 4.165 , 0.263255109728613 , -- 4.17 , 0.35752664561249 , -- 4.175 , 0.378805103678297 , -- 4.18 , 0.323547996037049 , -- 4.185 , 0.206516861655614 , -- 4.19 , 5.649526699216110E-02 , -- 4.195 , -9.378626227851780E-02 , -- 4.2 , -0.21317600878937 , -- 4.205 , -0.27287940125587 , -- 4.21 , -0.25114165876958 , -- 4.215 , -0.14168231890677 , -- 4.22 , 4.361065500048250E-02 , -- 4.225 , 0.279918937448746 , -- 4.23 , 0.535273378579502 , -- 4.235 , 0.773588682574221 , -- 4.24 , 0.958219914615338 , -- 4.245 , 1.05647251768057 , -- 4.25 , 1.0429998608356 , -- 4.255 , 0.904048723430757 , -- 4.26 , 0.64342045751792 , -- 4.265 , 0.283827852947311 , -- 4.27 , -0.13946358577039 , -- 4.275 , -0.58422822501242 , -- 4.28 , -1.00040723456331 , -- 4.285 , -1.33261766567896 , -- 4.29 , -1.53443838788264 , -- 4.295 , -1.58333249912622 , -- 4.3 , -1.48186835325815 , -- 4.305 , -1.25134227914383 , -- 4.31 , -0.93134131663624 , -- 4.315 , -0.58023320392854 , -- 4.32 , -0.263068523183 , -- 4.325 , -3.234875382342560E-02 , -- 4.33 , 8.104457813070970E-02 , -- 4.335 , 6.646358030000100E-02 , -- 4.34 , -6.520527065940920E-02 , -- 4.345 , -0.27865084678943 , -- 4.35 , -0.52301393304868 , -- 4.355 , -0.75029273588902 , -- 4.36 , -0.92586132464525 , -- 4.365 , -1.02745479977821 , -- 4.37 , -1.045887182644 , -- 4.375 , -0.98998208526761 , -- 4.38 , -0.88247620098788 , -- 4.385 , -0.74513807964771 , -- 4.39 , -0.589693305748 , -- 4.395 , -0.4218623825717 , -- 4.4 , -0.24559350524832 , -- 4.405 , -5.960463612956680E-02 , -- 4.41 , 0.142717207535869 , -- 4.415 , 0.362879306116347 , -- 4.42 , 0.588751862423607 , -- 4.425 , 0.799650310566393 , -- 4.43 , 0.976747652586761 , -- 4.435 , 1.1062713323933 , -- 4.44 , 1.17888982115871 , -- 4.445 , 1.19440253536595 , -- 4.45 , 1.16760308413961 , -- 4.455 , 1.12503563953872 , -- 4.46 , 1.09428815021162 , -- 4.465 , 1.09605242115199 , -- 4.47 , 1.141397648121 , -- 4.475 , 1.22879693707608 , -- 4.48 , 1.34085300252377 , -- 4.485 , 1.44734590197994 , -- 4.49 , 1.51600244532524 , -- 4.495 , 1.52347176965462 , -- 4.5 , 1.4600805519962 , -- 4.505 , 1.32990917025988 , -- 4.51 , 1.15031027736352 , -- 4.515 , 0.950259774927611 , -- 4.52 , 0.764000212508228 , -- 4.525 , 0.620467212343643 , -- 4.53 , 0.53443313966959 , -- 4.535 , 0.504324479922065 , -- 4.54 , 0.515518988342075 , -- 4.545 , 0.5449123033391 , -- 4.55 , 0.565643760216133 , -- 4.555 , 0.553361701085439 , -- 4.56 , 0.492730481489852 , -- 4.565 , 0.380543114015636 , -- 4.57 , 0.224809165664267 , -- 4.575 , 4.198032082290820E-02 , -- 4.58 , -0.14747370012324 , -- 4.585 , -0.32583933056166 , -- 4.59 , -0.48349824002692 , -- 4.595 , -0.61801754775951 , -- 4.6 , -0.72971208292477 , -- 4.605 , -0.82083468227042 , -- 4.61 , -0.89775066250987 , -- 4.615 , -0.96888908984926 , -- 4.62 , -1.0384220049282 , -- 4.625 , -1.10412227179889 , -- 4.63 , -1.16142632685637 , -- 4.635 , -1.20605223114456 , -- 4.64 , -1.23228150965333 , -- 4.645 , -1.2330625103562 , -- 4.65 , -1.20312802686153 , -- 4.655 , -1.13793589958523 , -- 4.66 , -1.0287141764878 , -- 4.665 , -0.8641100498206 , -- 4.67 , -0.63938852378214 , -- 4.675 , -0.35979779312165 , -- 4.68 , -3.418457890781780E-02 , -- 4.685 , 0.32663500010105 , -- 4.69 , 0.70029027164172 , -- 4.695 , 1.04848934874391 , -- 4.7 , 1.32926995685333 , -- 4.705 , 1.5103149027497 , -- 4.71 , 1.56674966292037 , -- 4.715 , 1.47490809529175 , -- 4.72 , 1.22042977817102 , -- 4.725 , 0.812026061087399 , -- 4.73 , 0.280340511193259 , -- 4.735 , -0.25291232049697 , -- 4.74 , -0.74295446485739 , -- 4.745 , -1.21402870653543 , -- 4.75 , -1.61401924449385 , -- 4.755 , -1.89622337299338 , -- 4.76 , -2.02674956179211 , -- 4.765 , -1.98422913056168 , -- 4.77 , -1.76288837183623 , -- 4.775 , -1.38094808362694 , -- 4.78 , -0.88180280078288 , -- 4.785 , -0.32340693878301 , -- 4.79 , 0.309775095794083 , -- 4.795 , 0.96398882181726 , -- 4.8 , 1.46521480566007 , -- 4.805 , 1.77054065361263 , -- 4.81 , 1.87515908448363 , -- 4.815 , 1.80763374123846 , -- 4.82 , 1.61871625340312 , -- 4.825 , 1.37383254873989 , -- 4.83 , 1.14323155673988 , -- 4.835 , 0.984115330306988 , -- 4.84 , 0.925398091665492 , -- 4.845 , 0.966346779872473 , -- 4.85 , 1.08319151549769 , -- 4.855 , 1.23351422222229 , -- 4.86 , 1.36203968864373 , -- 4.865 , 1.41500821627328 , -- 4.87 , 1.35632626255014 , -- 4.875 , 1.17338649661648 , -- 4.88 , 0.873766424591019 , -- 4.885 , 0.482332773802851 , -- 4.89 , 3.923546396876550E-02 , -- 4.895 , -0.22463035892901 , -- 4.9 , -0.44775774321397 , -- 4.905 , -0.63337252960387 , -- 4.91 , -0.77214474283379 , -- 4.915 , -0.86139644715887 , -- 4.92 , -0.90539713757332 , -- 4.925 , -0.91457475953945 , -- 4.93 , -0.90292943826226 , -- 4.935 , -0.88570153051275 , -- 4.94 , -0.87839307255918 , -- 4.945 , -0.89582516241653 , -- 4.95 , -0.95014576706764 , -- 4.955 , -1.0485044185337 , -- 4.96 , -1.1912694657772 , -- 4.965 , -1.3708025639651 , -- 4.97 , -1.57077187288448 , -- 4.975 , -1.76663217835511 , -- 4.98 , -1.92803570312605 , -- 4.985 , -2.02359808191781 , -- 4.99 , -2.0273751484136 , -- 4.995 , -1.9250033514058 , -- 5.0 , -1.71741034508892 , -- 5.005 , -1.42182210128631 , -- 5.01 , -1.07072647445332 , -- 5.015 , -0.70800393596021 , -- 5.02 , -0.38102872779966 , -- 5.025 , -0.13042197488723 , -- 5.03 , 3.718076749748670E-02 , -- 5.035 , 0.111181074997115 , -- 5.04 , 1.189110285104030E-02 , -- 5.045 , -0.20207868848779 , -- 5.05 , -0.44910010485315 , -- 5.055 , -0.64276640560255 , -- 5.06 , -0.71152270492906 , -- 5.065 , -0.61247600528197 , -- 5.07 , -0.33784697642092 , -- 5.075 , 8.416359716705800E-02 , -- 5.08 , 0.593871386434318 , -- 5.085 , 1.11066790591664 , -- 5.09 , 1.547857061782 , -- 5.095 , 1.82798847499016 , -- 5.1 , 1.89521989018272 , -- 5.105 , 1.72255076224409 , -- 5.11 , 1.31357650362981 , -- 5.115 , 0.700681089848237 , -- 5.12 , -3.944101274735180E-02 , -- 5.125 , -0.57538253938727 , -- 5.13 , -1.09801528037525 , -- 5.135 , -1.54898464132246 , -- 5.14 , -1.87419746618154 , -- 5.145 , -2.02778376701628 , -- 5.15 , -1.97724411607912 , -- 5.155 , -1.70971194891691 , -- 5.16 , -1.23638258073101 , -- 5.165 , -0.59315494390597 , -- 5.17 , 0.111368648891046 , -- 5.175 , 0.663169389460638 , -- 5.18 , 1.18144631611042 , -- 5.185 , 1.60890018466206 , -- 5.19 , 1.8979822410482 , -- 5.195 , 2.01808652053979 , -- 5.2 , 1.96085818554624 , -- 5.205 , 1.74218321821589 , -- 5.21 , 1.39935953655912 , -- 5.215 , 0.984200755295425 , -- 5.22 , 0.55469135825056 , -- 5.225 , 0.166760087786826 , -- 5.23 , -0.29010383111112 , -- 5.235 , -0.69805571505204 , -- 5.24 , -0.82852798007756 , -- 5.245 , -0.70078564730017 , -- 5.25 , -0.3628421318389 , -- 5.255 , 7.584234896818380E-02 , -- 5.26 , 0.43610921884854 , -- 5.265 , 0.80338816570313 , -- 5.27 , 1.14583363535399 , -- 5.275 , 1.44233546379898 , -- 5.28 , 1.68096745166101 , -- 5.285 , 1.85664177773435 , -- 5.29 , 1.96856248638458 , -- 5.295 , 2.01783075579683 , -- 5.3 , 2.00659270193592 , -- 5.305 , 1.93938767266716 , -- 5.31 , 1.82500672559004 , -- 5.315 , 1.67686130322037 , -- 5.32 , 1.5118566159347 , -- 5.325 , 1.34860724410237 , -- 5.33 , 1.20475926474899 , -- 5.335 , 1.09288033252557 , -- 5.34 , 1.01607186043109 , -- 5.345 , 0.965585517364128 , -- 5.35 , 0.921875442510843 , -- 5.355 , 0.858856383267098 , -- 5.36 , 0.750174073799282 , -- 5.365 , 0.575950824274314 , -- 5.37 , 0.328597045194569 , -- 5.375 , 1.652082973209100E-02 , -- 5.38 , -0.50276970745072 , -- 5.385 , -1.03563631031452 , -- 5.39 , -1.50490953601753 , -- 5.395 , -1.84994677847168 , -- 5.4 , -2.02843329407602 , -- 5.405 , -2.02545789978173 , -- 5.41 , -1.85714442697612 , -- 5.415 , -1.56774223620682 , -- 5.42 , -1.22052435654413 , -- 5.425 , -0.88506969766425 , -- 5.43 , -0.62375651367727 , -- 5.435 , -0.47941781141452 , -- 5.44 , -0.46672787176114 , -- 5.445 , -0.57069258501391 , -- 5.45 , -0.75256544897363 , -- 5.455 , -0.95943306586182 , -- 5.46 , -1.13415327472143 , -- 5.465 , -1.22591171353667 , -- 5.47 , -1.2008821223853 , -- 5.475 , -1.04867466773548 , -- 5.48 , -0.7816480899877 , -- 5.485 , -0.43025221187204 , -- 5.49 , -3.849293308865140E-02 , -- 5.495 , 0.351248620973817 , -- 5.5 , 0.678851223955433 , -- 5.505 , 0.903561274568929 , -- 5.51 , 1.000825087451 , -- 5.515 , 0.960934560706297 , -- 5.52 , 0.78992867723245 , -- 5.525 , 0.511317876998132 , -- 5.53 , 0.162760320816359 , -- 5.535 , -0.15233717951736 , -- 5.54 , -0.408210240848 , -- 5.545 , -0.62888561745421 , -- 5.55 , -0.79619865273995 , -- 5.555 , -0.90334422649211 , -- 5.56 , -0.957273231721 , -- 5.565 , -0.97632112916908 , -- 5.57 , -0.98529324126005 , -- 5.575 , -1.01088001195299 , -- 5.58 , -1.07663632540647 , -- 5.585 , -1.1964450302827 , -- 5.59 , -1.36885544627383 , -- 5.595 , -1.57548223311668 , -- 5.6 , -1.78343920945552 , -- 5.605 , -1.94998845541488 , -- 5.61 , -2.02894698358654 , -- 5.615 , -1.97893684719994 , -- 5.62 , -1.77192812280346 , -- 5.625 , -1.39963819951885 , -- 5.63 , -0.87646499571534 , -- 5.635 , -0.23861147042705 , -- 5.64 , 0.336218007155657 , -- 5.645 , 0.847327478768983 , -- 5.65 , 1.30857622082849 , -- 5.655 , 1.67664606685409 , -- 5.66 , 1.91879317489308 , -- 5.665 , 2.01692172130926 , -- 5.67 , 1.96853013034153 , -- 5.675 , 1.78510825075991 , -- 5.68 , 1.4896405295593 , -- 5.685 , 1.11350916384325 , -- 5.69 , 0.692073407024996 , -- 5.695 , 0.259804585073245 , -- 5.7 , -0.24312332096602 , -- 5.705 , -0.83740028991543 , -- 5.71 , -1.32862161402076 , -- 5.715 , -1.69669262414581 , -- 5.72 , -1.93128745142237 , -- 5.725 , -2.02921997287969 , -- 5.73 , -1.99337280480397 , -- 5.735 , -1.83373410433008 , -- 5.74 , -1.56747293050187 , -- 5.745 , -1.21724094498849 , -- 5.75 , -0.81052148648056 , -- 5.755 , -0.38038326455022 , -- 5.76 , 4.429619989889450E-02 , -- 5.765 , 0.482041333875258 , -- 5.77 , 0.827113852485307 , -- 5.775 , 1.05562255275457 , -- 5.78 , 1.15574510229285 , -- 5.785 , 1.13102185729002 , -- 5.79 , 1.00111402711585 , -- 5.795 , 0.796402227894675 , -- 5.8 , 0.550299036643284 , -- 5.805 , 0.294746376632263 , -- 5.81 , 5.779627739619110E-02 , -- 5.815 , -0.14033970324891 , -- 5.82 , -0.29057904479289 , -- 5.825 , -0.39279585396293 , -- 5.83 , -0.4494482504971 , -- 5.835 , -0.46100119177358 , -- 5.84 , -0.42521937611264 , -- 5.845 , -0.3375317644422 , -- 5.85 , -0.19158847654649 , -- 5.855 , 1.752214546441880E-02 , -- 5.86 , 0.287160001209617 , -- 5.865 , 0.602028255467961 , -- 5.87 , 0.933254236049531 , -- 5.875 , 1.24149905843902 , -- 5.88 , 1.48303299176761 , -- 5.885 , 1.61843953382086 , -- 5.89 , 1.62241665153411 , -- 5.895 , 1.49156853196882 , -- 5.9 , 1.24765942303674 , -- 5.905 , 0.935345755846739 , -- 5.91 , 0.614175990416646 , -- 5.915 , 0.345931028275661 , -- 5.92 , 0.180659960734569 , -- 5.925 , 0.145383600846828 , -- 5.93 , 0.237765412366942 , -- 5.935 , 0.425793201109318 , -- 5.94 , 0.654468234473261 , -- 5.945 , 0.858677159866798 , -- 5.95 , 0.978207334350809 , -- 5.955 , 0.970329031591707 , -- 5.96 , 0.818026030367143 , -- 5.965 , 0.533251338659083 , -- 5.97 , 0.15356868640373 , -- 5.975 , -0.26839144886352 , -- 5.98 , -0.67878215135657 , -- 5.985 , -1.03400683986537 , -- 5.99 , -1.3073585979251 , -- 5.995 , -1.49178002375022 , -- 6.0 , -1.59881218617846 , -- 6.005 , -1.65263612785215 , -- 6.01 , -1.68040775595467 , -- 6.015 , -1.70326118069031 , -- 6.02 , -1.73147514087517 , -- 6.025 , -1.76409391726272 , -- 6.03 , -1.79154678107851 , -- 6.035 , -1.80004486312369 , -- 6.04 , -1.77657113231061 , -- 6.045 , -1.71309083748955 , -- 6.05 , -1.60890845106533 , -- 6.055 , -1.47045377157793 , -- 6.06 , -1.30823176663841 , -- 6.065 , -1.13218678075657 , -- 6.07 , -0.94831725641373 , -- 6.075 , -0.7582938943429 , -- 6.08 , -0.56105916215743 , -- 6.085 , -0.35465660035081 , -- 6.09 , -0.1384716720616 , -- 6.095 , 8.181401775998960E-02 , -- 6.1 , 0.295120583821675 , -- 6.105 , 0.488813785339096 , -- 6.11 , 0.645978019217284 , -- 6.115 , 0.751956445909178 , -- 6.12 , 0.797070178696218 , -- 6.125 , 0.778938415578525 , -- 6.13 , 0.703933126539259 , -- 6.135 , 0.586193282063444 , -- 6.14 , 0.444346814137257 , -- 6.145 , 0.29825595848257 , -- 6.15 , 0.16716086262001 , -- 6.155 , 6.845201123569530E-02 , -- 6.16 , 1.638790200297000E-02 , -- 6.165 , 2.138979757918980E-02 , -- 6.17 , 9.013446340544370E-02 , -- 6.175 , 0.225364316943996 , -- 6.18 , 0.424627726925139 , -- 6.185 , 0.678666340108451 , -- 6.19 , 0.970459569802561 , -- 6.195 , 1.27533903222018 , -- 6.2 , 1.56265390764561 , -- 6.205 , 1.79967884086063 , -- 6.21 , 1.95730777614782 , -- 6.215 , 2.01568092318868 , -- 6.22 , 1.9680798901563 , -- 6.225 , 1.82260275300508 , -- 6.23 , 1.6012628707179 , -- 6.235 , 1.33584067303513 , -- 6.24 , 1.06088096670087 , -- 6.245 , 0.806020651973241 , -- 6.25 , 0.590240383625112 , -- 6.255 , 0.419170058894404 , -- 6.26 , 0.285567810216695 , -- 6.265 , 0.172882474189092 , -- 6.27 , 6.141521693570270E-02 , -- 6.275 , -4.100655746000240E-02 , -- 6.28 , -0.12748144658853 , -- 6.285 , -0.22402606929835 , -- 6.29 , -0.32266457931099 , -- 6.295 , -0.41245768954213 , -- 6.3 , -0.48300494677694 , -- 6.305 , -0.5281469572368 , -- 6.31 , -0.54867239852271 , -- 6.315 , -0.55291028225442 , -- 6.32 , -0.55498836852966 , -- 6.325 , -0.57168033795742 , -- 6.33 , -0.61890124937392 , -- 6.335 , -0.70832720330432 , -- 6.34 , -0.8444688842815 , -- 6.345 , -1.02312789012362 , -- 6.35 , -1.23201420479741 , -- 6.355 , -1.45302869056683 , -- 6.36 , -1.66483750094807 , -- 6.365 , -1.84512502578643 , -- 6.37 , -1.97287391729285 , -- 6.375 , -2.03065548439675 , -- 6.38 , -2.00620454087577 , -- 6.385 , -1.89315139172675 , -- 6.39 , -1.69175663119939 , -- 6.395 , -1.40995495579992 , -- 6.4 , -1.06376441111769 , -- 6.405 , -0.67620069765757 , -- 6.41 , -0.27510795942141 , -- 6.415 , 0.196812130002227 , -- 6.42 , 0.789662759769171 , -- 6.425 , 1.26662960840841 , -- 6.43 , 1.6072638071671 , -- 6.435 , 1.81182394487741 , -- 6.44 , 1.89972228643561 , -- 6.445 , 1.9047619217593 , -- 6.45 , 1.86751034078394 , -- 6.455 , 1.8254292028055 , -- 6.46 , 1.80357147143536 , -- 6.465 , 1.80953648503866 , -- 6.47 , 1.83384689586528 , -- 6.475 , 1.8545291406415 , -- 6.48 , 1.84468010904891 , -- 6.485 , 1.78185447755559 , -- 6.49 , 1.65634384795161 , -- 6.495 , 1.47475850013982 , -- 6.5 , 1.25778784095604 , -- 6.505 , 1.03382280148781 , -- 6.51 , 0.830377669084782 , -- 6.515 , 0.664847688813952 , -- 6.52 , 0.537441337312092 , -- 6.525 , 0.429805314578715 , -- 6.53 , 0.31046587513464 , -- 6.535 , 0.1447657890999 , -- 6.54 , -9.382243026102850E-02 , -- 6.545 , -0.41334712070585 , -- 6.55 , -0.79651775006838 , -- 6.555 , -1.20028045361043 , -- 6.56 , -1.56291508214219 , -- 6.565 , -1.81661688690887 , -- 6.57 , -1.90206035531056 , -- 6.575 , -1.7817477770441 , -- 6.58 , -1.44921463753588 , -- 6.585 , -0.93148892423534 , -- 6.59 , -0.28406148521622 , -- 6.595 , 0.323315074176515 , -- 6.6 , 0.852343584238104 , -- 6.605 , 1.31274405752464 , -- 6.61 , 1.66746511449112 , -- 6.615 , 1.89908333611956 , -- 6.62 , 2.00928735485692 , -- 6.625 , 2.01484159347826 , -- 6.63 , 1.94157792559844 , -- 6.635 , 1.81783611017065 , -- 6.64 , 1.66894503437948 , -- 6.645 , 1.51424202651612 , -- 6.65 , 1.36676756429498 , -- 6.655 , 1.23440796614096 , -- 6.66 , 1.12141683734346 , -- 6.665 , 1.03005163859298 , -- 6.67 , 0.961856012808879 , -- 6.675 , 0.917594207115419 , -- 6.68 , 0.895802572654735 , -- 6.685 , 0.891399934871178 , -- 6.69 , 0.895639060058472 , -- 6.695 , 0.897175457172006 , -- 6.7 , 0.883661601343515 , -- 6.705 , 0.844008961722013 , -- 6.71 , 0.77132601406367 , -- 6.715 , 0.665213447750178 , -- 6.72 , 0.531957875807601 , -- 6.725 , 0.382692370009228 , -- 6.73 , 0.230704777961798 , -- 6.735 , 8.848409780228460E-02 , -- 6.74 , -4.320967298403890E-02 , -- 6.745 , -0.1762892860789 , -- 6.75 , -0.28784586821218 , -- 6.755 , -0.38905860495499 , -- 6.76 , -0.49291382383649 , -- 6.765 , -0.61009214038178 , -- 6.77 , -0.74528548081034 , -- 6.775 , -0.89462751554703 , -- 6.78 , -1.04544755808821 , -- 6.785 , -1.17892732569852 , -- 6.79 , -1.27460153013389 , -- 6.795 , -1.31507899117539 , -- 6.8 , -1.28996744751844 , -- 6.805 , -1.19853880216558 , -- 6.81 , -1.0504463612584 , -- 6.815 , -0.86390673664632 , -- 6.82 , -0.66172430237656 , -- 6.825 , -0.46650461944826 , -- 6.83 , -0.29641016005237 , -- 6.835 , -0.16215486668974 , -- 6.84 , -6.552041776213589E-02 , -- 6.845 , 2.987151640449150E-04 , -- 6.85 , 4.839493719297370E-02 , -- 6.855 , 9.446598470843660E-02 , -- 6.86 , 0.152946671436979 , -- 6.865 , 0.234067255310907 , -- 6.87 , 0.342244784612781 , -- 6.875 , 0.475796904621799 , -- 6.88 , 0.627950076248601 , -- 6.885 , 0.788973056491094 , -- 6.89 , 0.948691666991149 , -- 6.895 , 1.09834384227231 , -- 6.9 , 1.23115050816982 , -- 6.905 , 1.34171557597024 , -- 6.91 , 1.42465179927775 , -- 6.915 , 1.47287601846948 , -- 6.92 , 1.47626092610496 , -- 6.925 , 1.42154296744535 , -- 6.93 , 1.29406455566583 , -- 6.935 , 1.08117541948277 , -- 6.94 , 0.776554035067551 , -- 6.945 , 0.384383520531035 , -- 6.95 , -7.294167926560280E-02 , -- 6.955 , -0.53864400514197 , -- 6.96 , -1.00153859379899 , -- 6.965 , -1.41800783516812 , -- 6.97 , -1.7468581519585 , -- 6.975 , -1.95670089086248 , -- 6.98 , -2.03182599021495 , -- 6.985 , -1.97504743961906 , -- 6.99 , -1.80676558399137 , -- 6.995 , -1.5604834986916 , -- 7.0 , -1.27576644446333 , -- 7.005 , -0.9903221748174 , -- 7.01 , -0.73330353810734 , -- 7.015 , -0.52160326879535 , -- 7.02 , -0.35985223488993 , -- 7.025 , -0.24369954400838 , -- 7.03 , -0.16525998770838 , -- 7.035 , -0.11901231195031 , -- 7.04 , -0.10598389561423 , -- 7.045 , -0.13446900972305 , -- 7.05 , -0.21699230917524 , -- 7.055 , -0.36458839091288 , -- 7.06 , -0.58005276943233 , -- 7.065 , -0.85208512054878 , -- 7.07 , -1.15259800704237 , -- 7.075 , -1.43896995914881 , -- 7.08 , -1.66118309359685 , -- 7.085 , -1.771927531099 , -- 7.09 , -1.73721975477998 , -- 7.095 , -1.54526433804976 , -- 7.1 , -1.21113953262348 , -- 7.105 , -0.7752249017621 , -- 7.11 , -0.29527299039846 , -- 7.115 , 0.173294693493191 , -- 7.12 , 0.57635137765972 , -- 7.125 , 0.862335395139578 , -- 7.13 , 1.01919271305477 , -- 7.135 , 1.06290746127159 , -- 7.14 , 1.03167712327493 , -- 7.145 , 0.975104812475545 , -- 7.15 , 0.94186991196106 , -- 7.155 , 0.968697291206275 , -- 7.16 , 1.07242991307441 , -- 7.165 , 1.24693307983413 , -- 7.17 , 1.46588613539846 , -- 7.175 , 1.69040391004537 , -- 7.18 , 1.87856926470802 , -- 7.185 , 1.9942412785979 , -- 7.19 , 2.01380495894182 , -- 7.195 , 1.93002933646123 , -- 7.2 , 1.75219708416187 , -- 7.205 , 1.50259348018555 , -- 7.21 , 1.21097997176944 , -- 7.215 , 0.908929916225265 , -- 7.22 , 0.624987318443838 , -- 7.225 , 0.380818385977012 , -- 7.23 , 0.188682790341481 , -- 7.235 , 5.054908150564660E-02 , -- 7.24 , -4.224733175465410E-02 , -- 7.245 , -0.10533217769884 , -- 7.25 , -0.15872049577028 , -- 7.255 , -0.22626933934594 , -- 7.26 , -0.32933473878503 , -- 7.265 , -0.48196141281812 , -- 7.27 , -0.68656470353389 , -- 7.275 , -0.93107691321487 , -- 7.28 , -1.18865855652987 , -- 7.285 , -1.420854392386 , -- 7.29 , -1.58410377773137 , -- 7.295 , -1.63852514448294 , -- 7.3 , -1.55725203777855 , -- 7.305 , -1.33440140393595 , -- 7.31 , -0.98961414150744 , -- 7.315 , -0.56741260276393 , -- 7.32 , -0.13082880911958 , -- 7.325 , 0.249583666745638 , -- 7.33 , 0.508940072170202 , -- 7.335 , 0.600662717049061 , -- 7.34 , 0.5059779991769 , -- 7.345 , 0.238142376340394 , -- 7.35 , -0.15979854274957 , -- 7.355 , -0.62330642360817 , -- 7.36 , -1.07861985315351 , -- 7.365 , -1.45613573961171 , -- 7.37 , -1.70221047327019 , -- 7.375 , -1.78733777799186 , -- 7.38 , -1.70935128300863 , -- 7.385 , -1.49139661468471 , -- 7.39 , -1.17576612947581 , -- 7.395 , -0.81553092872387 , -- 7.4 , -0.46579815462372 , -- 7.405 , -0.17584397718572 , -- 7.41 , 1.695055532407140E-02 , -- 7.415 , 9.080438530410280E-02 , -- 7.42 , 4.100203845188310E-02 , -- 7.425 , -0.12015714114647 , -- 7.43 , -0.36451642152235 , -- 7.435 , -0.65063615988914 , -- 7.44 , -0.92820901616803 , -- 7.445 , -1.14411024994249 , -- 7.45 , -1.2495457268474 , -- 7.455 , -1.20784941543681 , -- 7.46 , -1.00217372922289 , -- 7.465 , -0.64135799082343 , -- 7.47 , -0.16185956349448 , -- 7.475 , 0.375443341531982 , -- 7.48 , 0.893242359584305 , -- 7.485 , 1.30942170236106 , -- 7.49 , 1.55069511538195 , -- 7.495 , 1.56597687306026 , -- 7.5 , 1.33649434622083 , -- 7.505 , 0.880087983425295 , -- 7.51 , 0.248772549844589 , -- 7.515 , -0.36466467822546 , -- 7.52 , -0.91944206639744 , -- 7.525 , -1.41086648314942 , -- 7.53 , -1.78197182048109 , -- 7.535 , -1.99448021035504 , -- 7.54 , -2.03276742886028 , -- 7.545 , -1.9038540437772 , -- 7.55 , -1.63408290724591 , -- 7.555 , -1.26366851276266 , -- 7.56 , -0.84036300953546 , -- 7.565 , -0.41319072336647 , -- 7.57 , -2.695184824283270E-02 , -- 7.575 , 0.376706658165673 , -- 7.58 , 0.651108722060469 , -- 7.585 , 0.775943751253261 , -- 7.59 , 0.755597751751617 , -- 7.595 , 0.613374035034045 , -- 7.6 , 0.389100193892965 , -- 7.605 , 0.134140214335999 , -- 7.61 , -9.593512494436110E-02 , -- 7.615 , -0.25014262596395 , -- 7.62 , -0.29113724407252 , -- 7.625 , -0.20287737386171 , -- 7.63 , 5.024227092122790E-03 , -- 7.635 , 0.297903261089418 , -- 7.64 , 0.622107890736794 , -- 7.645 , 0.91558081793758 , -- 7.65 , 1.12076183929425 , -- 7.655 , 1.19700603742361 , -- 7.66 , 1.12967888152307 , -- 7.665 , 0.933743975370447 , -- 7.67 , 0.650793261469538 , -- 7.675 , 0.339973230252299 , -- 7.68 , 6.485809767286120E-02 , -- 7.685 , -0.12047151548951 , -- 7.69 , -0.18271341139574 , -- 7.695 , -0.11542038316497 , -- 7.7 , 6.117124311775080E-02 , -- 7.705 , 0.306221765396461 , -- 7.71 , 0.568625694223555 , -- 7.715 , 0.79886093305278 , -- 7.72 , 0.959184513633666 , -- 7.725 , 1.02975813458714 , -- 7.73 , 1.00975707269538 , -- 7.735 , 0.913870269761431 , -- 7.74 , 0.765608368548335 , -- 7.745 , 0.589594520216864 , -- 7.75 , 0.405299730586112 , -- 7.755 , 0.223985767660469 , -- 7.76 , 4.920974997763450E-02 , -- 7.765 , -0.11994024975627 , -- 7.77 , -0.28424112296356 , -- 7.775 , -0.43999294669787 , -- 7.78 , -0.57663798061898 , -- 7.785 , -0.67751213622858 , -- 7.79 , -0.72360079867587 , -- 7.795 , -0.69901457723046 , -- 7.8 , -0.59650776204881 , -- 7.805 , -0.42155886366402 , -- 7.81 , -0.19380300792328 , -- 7.815 , 5.489933475191600E-02 , -- 7.82 , 0.285466317840837 , -- 7.825 , 0.458377987772727 , -- 7.83 , 0.540543411689915 , -- 7.835 , 0.510857284716815 , -- 7.84 , 0.363486292918927 , -- 7.845 , 0.108336402431131 , -- 7.85 , -0.21209396424761 , -- 7.855 , -0.56957977141521 , -- 7.86 , -0.94077073678275 , -- 7.865 , -1.29262615047061 , -- 7.87 , -1.59622106208727 , -- 7.875 , -1.82918316989524 , -- 7.88 , -1.97699031089989 , -- 7.885 , -2.03327946447786 , -- 7.89 , -1.99933934346025 , -- 7.895 , -1.88300955675939 , -- 7.9 , -1.69721418310355 , -- 7.905 , -1.45829064978291 , -- 7.91 , -1.18410498022345 , -- 7.915 , -0.8919394708508 , -- 7.92 , -0.59649837620085 , -- 7.925 , -0.30856724453543 , -- 7.93 , -3.473084459177880E-02 , -- 7.935 , 0.243954038684612 , -- 7.94 , 0.505067577023267 , -- 7.945 , 0.74523171014185 , -- 7.95 , 0.961076322702563 , -- 7.955 , 1.14544017577101 , -- 7.96 , 1.28755260199966 , -- 7.965 , 1.37508301728453 , -- 7.97 , 1.39752728794968 , -- 7.975 , 1.35018389601987 , -- 7.98 , 1.23776787698572 , -- 7.985 , 1.07653932806098 , -- 7.99 , 0.893865005632781 , -- 7.995 , 0.724806073674302 , -- 8.0 , 0.606180934525952 , -- 8.005 , 0.569233587341791 , -- 8.01 , 0.632383043958699 , -- 8.015 , 0.795725327814524 , -- 8.02 , 1.03874194319127 , -- 8.025 , 1.32196705023762 , -- 8.03 , 1.59246805399968 , -- 8.035 , 1.79229440498998 , -- 8.04 , 1.86849022149291 , -- 8.045 , 1.78281948278322 , -- 8.05 , 1.51926230063055 , -- 8.055 , 1.08785213984058 , -- 8.06 , 0.524349594247236 , -- 8.065 , -0.1140897577962 , -- 8.07 , -0.75657207669552 , -- 8.075 , -1.32834364834345 , -- 8.08 , -1.76124306233852 , -- 8.085 , -2.00310207974856 , -- 8.09 , -2.02480910234302 , -- 8.095 , -1.82430118945956 , -- 8.1 , -1.42701906953591 , -- 8.105 , -0.88275056011672 , -- 8.11 , -0.25930710346958 , -- 8.115 , 0.36611395388268 , -- 8.12 , 0.916779579720004 , -- 8.125 , 1.32634332320688 , -- 8.13 , 1.54748990874522 , -- 8.135 , 1.55804957216978 , -- 8.14 , 1.36358979345776 , -- 8.145 , 0.996118542284482 , -- 8.15 , 0.509028622424576 , -- 8.155 , -3.108833671467930E-02 , -- 8.16 , -0.55458355458891 , -- 8.165 , -0.9992113406596 , -- 8.17 , -1.31909921378195 , -- 8.175 , -1.4907344205054 , -- 8.18 , -1.51500626604052 , -- 8.185 , -1.41506172917135 , -- 8.19 , -1.23045719608832 , -- 8.195 , -1.00875563741852 , -- 8.2 , -0.79618535909745 , -- 8.205 , -0.62910374181022 , -- 8.21 , -0.52781524086439 , -- 8.215 , -0.49375763302869 , -- 8.22 , -0.51036868088539 , -- 8.225 , -0.54721127046085 , -- 8.23 , -0.56640455149806 , -- 8.235 , -0.5300607346312 , -- 8.24 , -0.40739746710395 , -- 8.245 , -0.18031656379607 , -- 8.25 , 9.909295562647380E-02 , -- 8.255 , 0.384178096593259 , -- 8.26 , 0.711568797471058 , -- 8.265 , 1.05465985685733 , -- 8.27 , 1.38307322715161 , -- 8.275 , 1.66640133480447 , -- 8.28 , 1.87778042356214 , -- 8.285 , 1.99690726227749 , -- 8.29 , 2.01218574892656 , -- 8.295 , 1.9218468256107 , -- 8.3 , 1.73397654400921 , -- 8.305 , 1.4654715893691 , -- 8.31 , 1.14002097734659 , -- 8.315 , 0.785289540807961 , -- 8.32 , 0.429654714191936 , -- 8.325 , 9.887434390542030E-02 , -- 8.33 , -0.27373446466779 , -- 8.335 , -0.61453278823147 , -- 8.34 , -0.86361514651737 , -- 8.345 , -1.02764207046752 , -- 8.35 , -1.12312770730449 , -- 8.355 , -1.17242345160079 , -- 8.36 , -1.19890949112902 , -- 8.365 , -1.22231476786338 , -- 8.37 , -1.25506074091502 , -- 8.375 , -1.30037291926648 , -- 8.38 , -1.35246560106362 , -- 8.385 , -1.39867274893801 , -- 8.39 , -1.42300013455657 , -- 8.395 , -1.41027137760835 , -- 8.4 , -1.34988412628361 , -- 8.405 , -1.23833354826905 , -- 8.41 , -1.08003474781669 , -- 8.415 , -0.8863811686465 , -- 8.42 , -0.67334691448991 , -- 8.425 , -0.45824149658395 , -- 8.43 , -0.25648271091485 , -- 8.435 , -7.919497664086800E-02 , -- 8.44 , 6.790702566583660E-02 , -- 8.445 , 0.184336104551994 , -- 8.45 , 0.273607496426052 , -- 8.455 , 0.341427765954767 , -- 8.46 , 0.393859568348449 , -- 8.465 , 0.436054008314734 , -- 8.47 , 0.471822329873715 , -- 8.475 , 0.503940686983312 , -- 8.48 , 0.534766790770446 , -- 8.485 , 0.566720547413461 , -- 8.49 , 0.602204083610117 , -- 8.495 , 0.642759211345947 , -- 8.5 , 0.687546596661957 , -- 8.505 , 0.73161370540631 , -- 8.51 , 0.764633590722345 , -- 8.515 , 0.770779801924118 , -- 8.52 , 0.730226474533298 , -- 8.525 , 0.622364880535585 , -- 8.53 , 0.430299195926097 , -- 8.535 , 0.145690142921501 , -- 8.54 , -0.1875029917819 , -- 8.545 , -0.54835468448798 , -- 8.55 , -0.93829077724458 , -- 8.555 , -1.32093112448324 , -- 8.56 , -1.65568314187632 , -- 8.565 , -1.90374313930578 , -- 8.57 , -2.03414217931564 , -- 8.575 , -2.02871594615485 , -- 8.58 , -1.88502979034511 , -- 8.585 , -1.61666670363564 , -- 8.59 , -1.25090542907548 , -- 8.595 , -0.82439719072454 , -- 8.6 , -0.3777961843308 , -- 8.605 , 5.997342456618780E-02 , -- 8.61 , 0.498580351025926 , -- 8.615 , 0.848666797179574 , -- 8.62 , 1.09518857615416 , -- 8.625 , 1.23554791479412 , -- 8.63 , 1.2781763580922 , -- 8.635 , 1.2403900007702 , -- 8.64 , 1.14586627728766 , -- 8.645 , 1.02207806372073 , -- 8.65 , 0.897804023904626 , -- 8.655 , 0.800618191332478 , -- 8.66 , 0.754133205007585 , -- 8.665 , 0.775081318262375 , -- 8.67 , 0.87060821275674 , -- 8.675 , 1.03627950859147 , -- 8.68 , 1.25531150972849 , -- 8.685 , 1.49959206680695 , -- 8.69 , 1.73283203030496 , -- 8.695 , 1.91564235877547 , -- 8.7 , 2.01171708813146 , -- 8.705 , 1.99404478322172 , -- 8.71 , 1.85004122617725 , -- 8.715 , 1.5844790314963 , -- 8.72 , 1.21937543098226 , -- 8.725 , 0.790685383472318 , -- 8.73 , 0.34253999395618 , -- 8.735 , -8.315108890721259E-02 , -- 8.74 , -0.45782997432698 , -- 8.745 , -0.73560630397696 , -- 8.75 , -0.90358121095544 , -- 8.755 , -0.96494822819405 , -- 8.76 , -0.93630744097796 , -- 8.765 , -0.84299937779174 , -- 8.77 , -0.71350666162014 , -- 8.775 , -0.57402043454602 , -- 8.78 , -0.44427168990607 , -- 8.785 , -0.33542713208977 , -- 8.79 , -0.2501116833682 , -- 8.795 , -0.18401361018569 , -- 8.8 , -0.12842784460002 , -- 8.805 , -7.314603730146210E-02 , -- 8.81 , -9.074234322190291E-03 , -- 8.815 , 7.000693452309770E-02 , -- 8.82 , 0.166710878734688 , -- 8.825 , 0.280110709519932 , -- 8.83 , 0.406273894637497 , -- 8.835 , 0.539123020255816 , -- 8.84 , 0.671480131538164 , -- 8.845 , 0.796107038123461 , -- 8.85 , 0.906615981394394 , -- 8.855 , 0.998324490593576 , -- 8.86 , 1.0690620538107 , -- 8.865 , 1.11975528767815 , -- 8.87 , 1.15453246345251 , -- 8.875 , 1.18023682665442 , -- 8.88 , 1.20532586633037 , -- 8.885 , 1.23820591293966 , -- 8.89 , 1.28520280175297 , -- 8.895 , 1.3486570631952 , -- 8.9 , 1.42571219461991 , -- 8.905 , 1.50820033663049 , -- 8.91 , 1.58374708347145 , -- 8.915 , 1.63800541668437 , -- 8.92 , 1.65764589236558 , -- 8.925 , 1.63341505537543 , -- 8.93 , 1.5624359419512 , -- 8.935 , 1.44906883520367 , -- 8.94 , 1.30406714173948 , -- 8.945 , 1.14214506133789 , -- 8.95 , 0.97845385721763 , -- 8.955 , 0.824773099970328 , -- 8.96 , 0.686415293227468 , -- 8.965 , 0.560675032421674 , -- 8.97 , 0.437346493634863 , -- 8.975 , 0.301223152764708 , -- 8.98 , 0.136102516376474 , -- 8.985 , -7.065849555314389E-02 , -- 8.99 , -0.32407738413447 , -- 8.995 , -0.61898581453294 , -- 9.0 , -0.93960037368359 , -- 9.005 , -1.26143943272218 , -- 9.01 , -1.55516650644025 , -- 9.015 , -1.79156612412015 , -- 9.02 , -1.94652674681638 , -- 9.025 , -2.00503791616427 , -- 9.03 , -1.96340298656283 , -- 9.035 , -1.82929859570769 , -- 9.04 , -1.61975611512981 , -- 9.045 , -1.35763976380722 , -- 9.05 , -1.06749188919142 , -- 9.055 , -0.77165747380896 , -- 9.06 , -0.48743715471134 , -- 9.065 , -0.22573691716227 , -- 9.07 , 8.680561556133970E-03 , -- 9.075 , 0.215640087376458 , -- 9.08 , 0.397259171267499 , -- 9.085 , 0.555581085303924 , -- 9.09 , 0.690729679309828 , -- 9.095 , 0.800029757983254 , -- 9.1 , 0.878247351202657 , -- 9.105 , 0.91878759810445 , -- 9.11 , 0.915444383097841 , -- 9.115 , 0.864214490635585 , -- 9.12 , 0.76472553582975 , -- 9.125 , 0.620899809131162 , -- 9.13 , 0.440670714935382 , -- 9.135 , 0.234785445409552 , -- 9.14 , 1.501866477042620E-02 , -- 9.145 , -0.16256660035877 , -- 9.15 , -0.33008216119127 , -- 9.155 , -0.49037224168296 , -- 9.16 , -0.64324845085619 , -- 9.165 , -0.79113983805113 , -- 9.17 , -0.93796449486453 , -- 9.175 , -1.0876496844508 , -- 9.18 , -1.24257624122444 , -- 9.185 , -1.40228132491324 , -- 9.19 , -1.56269378306469 , -- 9.195 , -1.71610185022193 , -- 9.2 , -1.85187081485719 , -- 9.205 , -1.95781829391389 , -- 9.21 , -2.02202032577224 , -- 9.215 , -2.03476784125131 , -- 9.22 , -1.99032018745331 , -- 9.225 , -1.88813289198619 , -- 9.23 , -1.73333557866961 , -- 9.235 , -1.53634649422576 , -- 9.24 , -1.31166062827625 , -- 9.245 , -1.075970419663 , -- 9.25 , -0.84593818781158 , -- 9.255 , -0.63597140868637 , -- 9.26 , -0.4563931782957 , -- 9.265 , -0.31231411198407 , -- 9.27 , -0.20343660584305 , -- 9.275 , -0.12481923225902 , -- 9.28 , -6.848370877973950E-02 , -- 9.285 , -2.555427519972480E-02 , -- 9.29 , 1.844706127350420E-02 , -- 9.295 , 6.430221576072399E-02 , -- 9.3 , 0.10743778394149 , -- 9.305 , 0.141299341041405 , -- 9.31 , 0.154447624403715 , -- 9.315 , 0.133048252401135 , -- 9.32 , 6.418690106369780E-02 , -- 9.325 , -6.064647417949840E-02 , -- 9.33 , -0.24265292279827 , -- 9.335 , -0.47405842905361 , -- 9.34 , -0.73810449789487 , -- 9.345 , -1.0108148464089 , -- 9.35 , -1.26431984266432 , -- 9.355 , -1.47118757622947 , -- 9.36 , -1.60894844812626 , -- 9.365 , -1.66394726283033 , -- 9.37 , -1.63377593114862 , -- 9.375 , -1.52779564631775 , -- 9.38 , -1.36560192630373 , -- 9.385 , -1.17367488772945 , -- 9.39 , -0.98085465048613 , -- 9.395 , -0.81346133563023 , -- 9.4 , -0.6909389063025 , -- 9.405 , -0.62276084953816 , -- 9.41 , -0.607149409463 , -- 9.415 , -0.63177724383888 , -- 9.42 , -0.67625991576389 , -- 9.425 , -0.71589163373072 , -- 9.43 , -0.72595664968346 , -- 9.435 , -0.68589387170155 , -- 9.44 , -0.58268627289106 , -- 9.445 , -0.412930213848 , -- 9.45 , -0.18338626940602 , -- 9.455 , 8.998844390524470E-02 , -- 9.46 , 0.384209486902062 , -- 9.465 , 0.672301526951598 , -- 9.47 , 0.926752158620487 , -- 9.475 , 1.12295373373336 , -- 9.48 , 1.24217806572443 , -- 9.485 , 1.27378905610875 , -- 9.49 , 1.21646747255966 , -- 9.495 , 1.07838936456105 , -- 9.5 , 0.876298148043991 , -- 9.505 , 0.633562127434793 , -- 9.51 , 0.377406516734523 , -- 9.515 , 0.135641869430563 , -- 9.52 , -6.672476216219871E-02 , -- 9.525 , -0.21056458019019 , -- 9.53 , -0.28496091918619 , -- 9.535 , -0.28841969553759 , -- 9.54 , -0.2287139810782 , -- 9.545 , -0.12132500570029 , -- 9.55 , 7.625888610971770E-03 , -- 9.555 , 0.116222883261377 , -- 9.56 , 0.213774951165706 , -- 9.565 , 0.289397517200485 , -- 9.57 , 0.338281477903747 , -- 9.575 , 0.362345137379695 , -- 9.58 , 0.369650428641696 , -- 9.585 , 0.372716892921114 , -- 9.59 , 0.386055603509022 , -- 9.595 , 0.423398634616031 , -- 9.6 , 0.495129281552051 , -- 9.605 , 0.60639781396735 , -- 9.61 , 0.756225797586165 , -- 9.615 , 0.937731164545477 , -- 9.62 , 1.13931299682061 , -- 9.625 , 1.34651259505288 , -- 9.63 , 1.54413547032879 , -- 9.635 , 1.71824818793864 , -- 9.64 , 1.85768676819293 , -- 9.645 , 1.95489941817505 , -- 9.65 , 2.00610002856624 , -- 9.655 , 2.01090936461916 , -- 9.66 , 1.97169865125757 , -- 9.665 , 1.89287748522473 , -- 9.67 , 1.78030387269109 , -- 9.675 , 1.64090911938383 , -- 9.68 , 1.48250660526215 , -- 9.685 , 1.31363233674109 , -- 9.69 , 1.14327915207579 , -- 9.695 , 0.980390644995991 , -- 9.7 , 0.833122502994828 , -- 9.705 , 0.707943691566063 , -- 9.71 , 0.608782533951479 , -- 9.715 , 0.536448337875884 , -- 9.72 , 0.488573445463521 , -- 9.725 , 0.46016643878741 , -- 9.73 , 0.444740766028055 , -- 9.735 , 0.435798656192539 , -- 9.74 , 0.428373605655483 , -- 9.745 , 0.420256963476142 , -- 9.75 , 0.412594868385096 , -- 9.755 , 0.409674164332935 , -- 9.76 , 0.417930829751558 , -- 9.765 , 0.444371250852317 , -- 9.77 , 0.494775704856077 , -- 9.775 , 0.572057120950962 , -- 9.78 , 0.675155981128035 , -- 9.785 , 0.798679222993941 , -- 9.79 , 0.933324321352313 , -- 9.795 , 1.06694698775423 , -- 9.8 , 1.18603236012388 , -- 9.805 , 1.27724967196587 , -- 9.81 , 1.32882747232424 , -- 9.815 , 1.33155990686688 , -- 9.82 , 1.27942417786924 , -- 9.825 , 1.16984949079063 , -- 9.83 , 1.00375336219652 , -- 9.835 , 0.78541101181126 , -- 9.84 , 0.522229879372249 , -- 9.845 , 0.224363288427596 , -- 9.85 , -7.544298823405959E-02 , -- 9.855 , -0.32414911077947 , -- 9.86 , -0.56925067043303 , -- 9.865 , -0.80153173249929 , -- 9.87 , -1.01385881998571 , -- 9.875 , -1.20197758458175 , -- 9.88 , -1.36481009682394 , -- 9.885 , -1.50413197543959 , -- 9.89 , -1.62360229940215 , -- 9.895 , -1.72737604935286 , -- 9.9 , -1.81858556613035 , -- 9.905 , -1.89811306323292 , -- 9.91 , -1.96399286416952 , -- 9.915 , -2.01169321437822 , -- 9.92 , -2.03524420540911 , -- 9.925 , -2.02897089319518 , -- 9.93 , -1.9893635845244 , -- 9.935 , -1.91657784009958 , -- 9.94 , -1.81508296294018 , -- 9.945 , -1.69320466339342 , -- 9.95 , -1.56159803137893 , -- 9.955 , -1.4309899156992 , -- 9.96 , -1.309755744458 , -- 9.965 , -1.20194945689331 , -- 9.97 , -1.10635858004562 , -- 9.975 , -1.01686709903203 , -- 9.98 , -0.92410491644605 , -- 9.985 , -0.81798616411117 , -- 9.99 , -0.69053338279253 , -- 9.995 , -0.53828091954851 , -- 10.0 , -0.36368359344091 , -- 10.005 , -0.17516204935777 , -- 10.01 , 3.283892190983560E-02 , -- 10.015 , 0.330694200317556 , -- 10.02 , 0.577629318788318 , -- 10.025 , 0.752762239562344 , -- 10.03 , 0.843359973197779 , -- 10.035 , 0.846296788144704 , -- 10.04 , 0.767736310318568 , -- 10.045 , 0.621457280597053 , -- 10.05 , 0.426437216065522 , -- 10.055 , 0.204358996732675 , -- 10.06 , -2.248438925201870E-02 , -- 10.065 , -0.23266656596899 , -- 10.07 , -0.40662586629101 , -- 10.075 , -0.52750200085185 , -- 10.08 , -0.58215648669077 , -- 10.085 , -0.56248497246021 , -- 10.09 , -0.4669190429802 , -- 10.095 , -0.30169803576621 , -- 10.1 , -8.141467321068210E-02 , -- 10.105 , 0.171736188042055 , -- 10.11 , 0.430255910671489 , -- 10.115 , 0.665052841920839 , -- 10.12 , 0.849933032813423 , -- 10.125 , 0.965995866692921 , -- 10.13 , 1.00493830188015 , -- 10.135 , 0.970469370709915 , -- 10.14 , 0.877402798238989 , -- 10.145 , 0.748601808713132 , -- 10.15 , 0.610481808617733 , -- 10.155 , 0.488130421487012 , -- 10.16 , 0.401133125757128 , -- 10.165 , 0.360990723458034 , -- 10.17 , 0.370538085006636 , -- 10.175 , 0.425250483406994 , -- 10.18 , 0.515772332268937 , -- 10.185 , 0.630771503752903 , -- 10.19 , 0.759255763887151 , -- 10.195 , 0.891778215264391 , -- 10.2 , 1.02038573505463 , -- 10.205 , 1.13765165967161 , -- 10.21 , 1.2354498601353 , -- 10.215 , 1.30423925529986 , -- 10.22 , 1.3333818353705 , -- 10.225 , 1.31262109496076 , -- 10.23 , 1.23439607687214 , -- 10.235 , 1.09630588839482 , -- 10.24 , 0.902881246184685 , -- 10.245 , 0.665930257015006 , -- 10.25 , 0.403145595569434 , -- 10.255 , 0.135167464543167 , -- 10.26 , -0.1181889683435 , -- 10.265 , -0.34158112353947 , -- 10.27 , -0.5266606974231 , -- 10.275 , -0.67279436439978 , -- 10.28 , -0.78577175818034 , -- 10.285 , -0.87491503414711 , -- 10.29 , -0.94943871678613 , -- 10.295 , -1.01514749755514 , -- 10.3 , -1.07240552249575 , -- 10.305 , -1.1159454664886 , -- 10.31 , -1.13652214942974 , -- 10.315 , -1.12387719989209 , -- 10.32 , -1.07009467236169 , -- 10.325 , -0.9723415710773 , -- 10.33 , -0.83421714797159 , -- 10.335 , -0.66537603566363 , -- 10.34 , -0.47961924019497 , -- 10.345 , -0.29207437055768 , -- 10.35 , -0.11633661841191 , -- 10.355 , 3.762456752764130E-02 , -- 10.36 , 0.164274796553055 , -- 10.365 , 0.262005149857291 , -- 10.37 , 0.331666422264028 , -- 10.375 , 0.374819782001995 , -- 10.38 , 0.392377294442122 , -- 10.385 , 0.384141260826285 , -- 10.39 , 0.34936414194296 , -- 10.395 , 0.288052561776111 , -- 10.4 , 0.20242178785536 , -- 10.405 , 9.785306567479871E-02 , -- 10.41 , -1.713557520971730E-02 , -- 10.415 , -0.13204374310037 , -- 10.42 , -0.23639873810073 , -- 10.425 , -0.32201635263159 , -- 10.43 , -0.38475152712529 , -- 10.435 , -0.4251245384254 , -- 10.44 , -0.44753546126283 , -- 10.445 , -0.45825628870499 , -- 10.45 , -0.46279334754373 , -- 10.455 , -0.46346276944743 , -- 10.46 , -0.45799981189361 , -- 10.465 , -0.43972280992741 , -- 10.47 , -0.39929302861398 , -- 10.475 , -0.32758719542718 , -- 10.48 , -0.21885278786041 , -- 10.485 , -7.315503161217039E-02 , -- 10.49 , 0.102651407152514 , -- 10.495 , 0.295816563735959 , -- 10.5 , 0.490226934148564 , -- 10.505 , 0.669891810457828 , -- 10.51 , 0.82237594525252 , -- 10.515 , 0.941216017829958 , -- 10.52 , 1.02661998674533 , -- 10.525 , 1.08430529858058 , -- 10.53 , 1.12286636573309 , -- 10.535 , 1.15051988582967 , -- 10.54 , 1.17222128266484 , -- 10.545 , 1.18801420247095 , -- 10.55 , 1.19307665922947 , -- 10.555 , 1.17938295001738 , -- 10.56 , 1.13840303313913 , -- 10.565 , 1.06394181580147 , -- 10.57 , 0.95422952397942 , -- 10.575 , 0.812611611237298 , -- 10.58 , 0.646677789199809 , -- 10.585 , 0.466152014272008 , -- 10.59 , 0.280289725059773 , -- 10.595 , 9.565146176778430E-02 , -- 10.6 , -8.499446193837400E-02 , -- 10.605 , -0.26230216706899 , -- 10.61 , -0.4386137767682 , -- 10.615 , -0.6154630451662 , -- 10.62 , -0.79113786663093 , -- 10.625 , -0.9591661750224 , -- 10.63 , -1.10826769502301 , -- 10.635 , -1.22391556601366 , -- 10.64 , -1.29112533315649 , -- 10.645 , -1.29775475114347 , -- 10.65 , -1.23742365152054 , -- 10.655 , -1.11129656465532 , -- 10.66 , -0.9282894842173 , -- 10.665 , -0.70371663339333 , -- 10.67 , -0.45680011277455 , -- 10.675 , -0.20771128037236 , -- 10.68 , 2.512459612945220E-02 , -- 10.685 , 0.226918245807304 , -- 10.69 , 0.387350552286146 , -- 10.695 , 0.500473670939197 , -- 10.7 , 0.564029266358019 , -- 10.705 , 0.578637288901258 , -- 10.71 , 0.547211894628189 , -- 10.715 , 0.474757060973486 , -- 10.72 , 0.368436624005821 , -- 10.725 , 0.237615830995378 , -- 10.73 , 9.352792827951401E-02 , -- 10.735 , -5.167273774008210E-02 , -- 10.74 , -0.18646809540466 , -- 10.745 , -0.30187135567744 , -- 10.75 , -0.39316916542135 , -- 10.755 , -0.46096802891446 , -- 10.76 , -0.51111268636195 , -- 10.765 , -0.55334646668629 , -- 10.77 , -0.59891300067983 , -- 10.775 , -0.65764678122702 , -- 10.78 , -0.73525453842381 , -- 10.785 , -0.83150017185443 , -- 10.79 , -0.93976747420304 , -- 10.795 , -1.04812248595262 , -- 10.8 , -1.14160318244191 , -- 10.805 , -1.2051488991501 , -- 10.81 , -1.22646384585139 , -- 10.815 , -1.19814339245798 , -- 10.82 , -1.11865520710004 , -- 10.825 , -0.9920714349609 , -- 10.83 , -0.82681485385664 , -- 10.835 , -0.63386505629908 , -- 10.84 , -0.42496268277971 , -- 10.845 , -0.21119376102165 , -- 10.85 , -2.191019852703480E-03 , -- 10.855 , 0.194127641793734 , -- 10.86 , 0.371466018382975 , -- 10.865 , 0.525035130835761 , -- 10.87 , 0.651602813791636 , -- 10.875 , 0.749803994860723 , -- 10.88 , 0.820544481310922 , -- 10.885 , 0.867273287648818 , -- 10.89 , 0.895807866624117 , -- 10.895 , 0.913572593095597 , -- 10.9 , 0.928236729298366 , -- 10.905 , 0.946014350836689 , -- 10.91 , 0.970040868532415 , -- 10.915 , 0.999311930164329 , -- 10.92 , 1.02854682988849 , -- 10.925 , 1.04913139979 , -- 10.93 , 1.05098941441043 , -- 10.935 , 1.02499491482512 , -- 10.94 , 0.965351048328359 , -- 10.945 , 0.871370473531725 , -- 10.95 , 0.748233229517312 , -- 10.955 , 0.606563895886194 , -- 10.96 , 0.460955473292802 , -- 10.965 , 0.327805324612049 , -- 10.97 , 0.222950093923078 , -- 10.975 , 0.159562148201255 , -- 10.98 , 0.146631988185719 , -- 10.985 , 0.188170103964573 , -- 10.99 , 0.283066815855546 , -- 10.995 , 0.425428418732869 , -- 11.0 , 0.605185596503197 , -- 11.005 , 0.808842841129001 , -- 11.01 , 1.0203252588096 , -- 11.015 , 1.22200011907392 , -- 11.02 , 1.39594474367148 , -- 11.025 , 1.52549944650203 , -- 11.03 , 1.59700049844879 , -- 11.035 , 1.60145576944865 , -- 11.04 , 1.53581761942562 , -- 11.045 , 1.4034930323483 , -- 11.05 , 1.2138831423925 , -- 11.055 , 0.980912371026411 , -- 11.06 , 0.720812505576093 , -- 11.065 , 0.449601892036102 , -- 11.07 , 0.180857582628542 , -- 11.075 , -7.573381698891210E-02 , -- 11.08 , -0.31470812975405 , -- 11.085 , -0.53405962087938 , -- 11.09 , -0.73364261678681 , -- 11.095 , -0.91330540113887 , -- 11.1 , -1.07132417643687 , -- 11.105 , -1.20365312210336 , -- 11.11 , -1.30419832213249 , -- 11.115 , -1.36604239161232 , -- 11.12 , -1.38321880818252 , -- 11.125 , -1.35249870150789 , -- 11.13 , -1.27462783831177 , -- 11.135 , -1.15465182792767 , -- 11.14 , -1.00123343402233 , -- 11.145 , -0.82518952456788 , -- 11.15 , -0.63769529339716 , -- 11.155 , -0.44866816516864 , -- 11.16 , -0.26576203055682 , -- 11.165 , -9.416463454136630E-02 , -- 11.17 , 6.287575092606090E-02 , -- 11.175 , 0.203141505865471 , -- 11.18 , 0.324579712695666 , -- 11.185 , 0.424889751727608 , -- 11.19 , 0.501750804315283 , -- 11.195 , 0.5536421159011 , -- 11.2 , 0.580921794960766 , -- 11.205 , 0.586704260853481 , -- 11.21 , 0.5770850470881 , -- 11.215 , 0.560449668733132 , -- 11.22 , 0.545887300846328 , -- 11.225 , 0.541047479949923 , -- 11.23 , 0.549990662947013 , -- 11.235 , 0.571663114185204 , -- 11.24 , 0.599500251771258 , -- 11.245 , 0.62236878054162 , -- 11.25 , 0.626713322562836 , -- 11.255 , 0.599434772191117 , -- 11.26 , 0.530838614269415 , -- 11.265 , 0.416951659398843 , -- 11.27 , 0.26068866151549 , -- 11.275 , 7.163385796821510E-02 , -- 11.28 , -0.13542954911164 , -- 11.285 , -0.34285006284799 , -- 11.29 , -0.53271798082564 , -- 11.295 , -0.68922055953639 , -- 11.3 , -0.80031992822441 , -- 11.305 , -0.85859556643174 , -- 11.31 , -0.86132208764303 , -- 11.315 , -0.81002406922002 , -- 11.32 , -0.70979684966059 , -- 11.325 , -0.56862676261062 , -- 11.33 , -0.39681435075012 , -- 11.335 , -0.20645292887016 , -- 11.34 , -1.082875708200500E-02 , -- 11.345 , 0.176412752549899 , -- 11.35 , 0.342376371445806 , -- 11.355 , 0.476235796330172 , -- 11.36 , 0.570527791788077 , -- 11.365 , 0.622137109693916 , -- 11.37 , 0.632674434445817 , -- 11.375 , 0.608089217990313 , -- 11.38 , 0.557537864431003 , -- 11.385 , 0.491727720373806 , -- 11.39 , 0.421100488617183 , -- 11.395 , 0.35424883871057 , -- 11.4 , 0.296898598214297 , -- 11.405 , 0.251615782949777 , -- 11.41 , 0.218205567537362 , -- 11.415 , 0.194575186033259 , -- 11.42 , 0.177750889222743 , -- 11.425 , 0.164739545969125 , -- 11.43 , 0.153046754059915 , -- 11.435 , 0.140795993214209 , -- 11.44 , 0.12656443411951 , -- 11.445 , 0.109119048772985 , -- 11.45 , 8.726746617413900E-02 , -- 11.455 , 5.991980120903190E-02 , -- 11.46 , 2.635460927914640E-02 , -- 11.465 , -1.345275150280380E-02 , -- 11.47 , -5.863610709200840E-02 , -- 11.475 , -0.10755044102404 , -- 11.48 , -0.15824658177879 , -- 11.485 , -0.20921212071436 , -- 11.49 , -0.26013226175091 , -- 11.495 , -0.31237245530863 , -- 11.5 , -0.36890715351072 , -- 11.505 , -0.43358437734804 , -- 11.51 , -0.50981957766845 , -- 11.515 , -0.59903776556946 , -- 11.52 , -0.69931194037806 , -- 11.525 , -0.80465691443919 , -- 11.53 , -0.90529166691289 , -- 11.535 , -0.98894889157901 , -- 11.54 , -1.0430005689334 , -- 11.545 , -1.05693388169808 , -- 11.55 , -1.0245796623575 , -- 11.555 , -0.94554374723514 , -- 11.56 , -0.82548253167239 , -- 11.565 , -0.67515951222416 , -- 11.57 , -0.50853411181021 , -- 11.575 , -0.34035152824456 , -- 11.58 , -0.18380744340702 , -- 11.585 , -4.877605466847740E-02 , -- 11.59 , 5.909608053637810E-02 , -- 11.595 , 0.138405652647701 , -- 11.6 , 0.191311518017365 , -- 11.605 , 0.222508949979136 , -- 11.61 , 0.238194003082017 , -- 11.615 , 0.245269919971124 , -- 11.62 , 0.250838712250952 , -- 11.625 , 0.261870016704265 , -- 11.63 , 0.284836510438269 , -- 11.635 , 0.325131372886616 , -- 11.64 , 0.386198740355232 , -- 11.645 , 0.468513501462264 , -- 11.65 , 0.568696341674455 , -- 11.655 , 0.679148315040223 , -- 11.66 , 0.788508513966795 , -- 11.665 , 0.883056182933764 , -- 11.67 , 0.948906416298242 , -- 11.675 , 0.974570797520427 , -- 11.68 , 0.953277599477234 , -- 11.685 , 0.884438058167201 , -- 11.69 , 0.77382364723826 , -- 11.695 , 0.632334566850428 , -- 11.7 , 0.473622939615698 , -- 11.705 , 0.311143111887763 , -- 11.71 , 0.15539149490874 , -- 11.715 , 1.204008787083370E-02 , -- 11.72 , -0.1185541756946 , -- 11.725 , -0.24038836981401 , -- 11.73 , -0.35969118541412 , -- 11.735 , -0.48228327823872 , -- 11.74 , -0.61114632720659 , -- 11.745 , -0.74488165421895 , -- 11.75 , -0.87742903375438 , -- 11.755 , -0.9990735442117 , -- 11.76 , -1.09838127444184 , -- 11.765 , -1.16449496867241 , -- 11.77 , -1.18914405096313 , -- 11.775 , -1.1678940579368 , -- 11.78 , -1.10040933370095 , -- 11.785 , -0.98984205208497 , -- 11.79 , -0.8417105178341 , -- 11.795 , -0.66273801588279 , -- 11.8 , -0.46007426875265 , -- 11.805 , -0.24109784101173 , -- 11.81 , -1.376424841735200E-02 , -- 11.815 , 0.212820798236347 , -- 11.82 , 0.428004774853851 , -- 11.825 , 0.61976809620263 , -- 11.83 , 0.775664732827253 , -- 11.835 , 0.884459785072971 , -- 11.84 , 0.938105319486098 , -- 11.845 , 0.933533376809836 , -- 11.85 , 0.873720830366818 , -- 11.855 , 0.767639484838718 , -- 11.86 , 0.628977669852066 , -- 11.865 , 0.4738539721813 , -- 11.87 , 0.31801589351757 , -- 11.875 , 0.174157204161953 , -- 11.88 , 4.995725310342680E-02 , -- 11.885 , -5.275216941488590E-02 , -- 11.89 , -0.13756423084181 , -- 11.895 , -0.2120196831066 , -- 11.9 , -0.28548456301669 , -- 11.905 , -0.36691840941378 , -- 11.91 , -0.46300320666114 , -- 11.915 , -0.57696070561373 , -- 11.92 , -0.70814553643099 , -- 11.925 , -0.85232717509853 , -- 11.93 , -1.00241060096662 , -- 11.935 , -1.14936568830572 , -- 11.94 , -1.28315120023664 , -- 11.945 , -1.39356260774938 , -- 11.95 , -1.47101607033074 , -- 11.955 , -1.5073448490242 , -- 11.96 , -1.4966490584904 , -- 11.965 , -1.43616086274327 , -- 11.97 , -1.32698077186283 , -- 11.975 , -1.17446433758603 , -- 11.98 , -0.98804059864846 , -- 11.985 , -0.78032474331784 , -- 11.99 , -0.56556840849598 , -- 11.995 , -0.35765933543277 , -- 12.0 , -0.16807550799874 , -- 12.005 , -4.227255766186140E-03 , -- 12.01 , 0.131383604645629 , -- 12.015 , 0.240987503608671 , -- 12.02 , 0.330348730788584 , -- 12.025 , 0.406826008170448 , -- 12.03 , 0.477144240124697 , -- 12.035 , 0.545422501700242 , -- 12.04 , 0.611915404843405 , -- 12.045 , 0.672755857445556 , -- 12.05 , 0.720723072194553 , -- 12.055 , 0.746832365003761 , -- 12.06 , 0.742346946489963 , -- 12.065 , 0.700760339032901 , -- 12.07 , 0.619339003519911 , -- 12.075 , 0.499959785870592 , -- 12.08 , 0.349159304278182 , -- 12.085 , 0.177470223182518 , -- 12.09 , -1.753350545225190E-03 , -- 12.095 , -0.17379950342875 , -- 12.1 , -0.32413511149758 , -- 12.105 , -0.43987021437218 , -- 12.11 , -0.51104917071923 , -- 12.115 , -0.53171143244092 , -- 12.12 , -0.50064639271511 , -- 12.125 , -0.42174741533336 , -- 12.13 , -0.30385287601246 , -- 12.135 , -0.1599770009419 , -- 12.14 , -5.916472086063350E-03 , -- 12.145 , 0.141672124157728 , -- 12.15 , 0.267467136745314 , -- 12.155 , 0.359599717485464 , -- 12.16 , 0.411271872916484 , -- 12.165 , 0.421529890421321 , -- 12.17 , 0.394986365391134 , -- 12.175 , 0.340522937951077 , -- 12.18 , 0.269238562662315 , -- 12.185 , 0.19209641315972 , -- 12.19 , 0.11779958413244 , -- 12.195 , 5.136625423508250E-02 , -- 12.2 , -6.300947873046220E-03 , -- 12.205 , -5.782223054975370E-02 , -- 12.21 , -0.10793985148095 , -- 12.215 , -0.16174127408618 , -- 12.22 , -0.22298866763169 , -- 12.225 , -0.2929886222154 , -- 12.23 , -0.37024238871399 , -- 12.235 , -0.45090142997871 , -- 12.24 , -0.52980992267136 , -- 12.245 , -0.60178949630599 , -- 12.25 , -0.66276746147737 , -- 12.255 , -0.71046604589472 , -- 12.26 , -0.74450641227213 , -- 12.265 , -0.76599806365513 , -- 12.27 , -0.77681628816103 , -- 12.275 , -0.77885826543421 , -- 12.28 , -0.77352755022123 , -- 12.285 , -0.76159237398235 , -- 12.29 , -0.74340951487468 , -- 12.295 , -0.7193684533261 , -- 12.3 , -0.69033859752466 , -- 12.305 , -0.65790529310338 , -- 12.31 , -0.62427337609045 , -- 12.315 , -0.59183465481714 , -- 12.32 , -0.5625391602505 , -- 12.325 , -0.53727609431785 , -- 12.33 , -0.51549939568466 , -- 12.335 , -0.49523027754421 , -- 12.34 , -0.47348196058407 , -- 12.345 , -0.44699386193397 , -- 12.35 , -0.41308162478787 , -- 12.355 , -0.37035623858392 , -- 12.36 , -0.31912406711736 , -- 12.365 , -0.26136188585533 , -- 12.37 , -0.20030871435109 , -- 12.375 , -0.13979053261561 , -- 12.38 , -8.348819445843680E-02 , -- 12.385 , -3.432412971860200E-02 , -- 12.39 , 5.898257672503130E-03 , -- 12.395 , 3.658675251617240E-02 , -- 12.4 , 5.823490831704580E-02 , -- 12.405 , 7.220973009677149E-02 , -- 12.41 , 8.054556791305920E-02 , -- 12.415 , 8.583652449551200E-02 , -- 12.42 , 9.119751190995400E-02 , -- 12.425 , 0.10022495276452 , -- 12.43 , 0.116830802684467 , -- 12.435 , 0.144865533553475 , -- 12.44 , 0.187496464655846 , -- 12.445 , 0.246429769927851 , -- 12.45 , 0.321134575890146 , -- 12.455 , 0.408310004218564 , -- 12.46 , 0.501792671730819 , -- 12.465 , 0.593049206029892 , -- 12.47 , 0.672237912914609 , -- 12.475 , 0.729699407315016 , -- 12.48 , 0.757595593934302 , -- 12.485 , 0.751370987649759 , -- 12.49 , 0.710716591717499 , -- 12.495 , 0.639832178015772 , -- 12.5 , 0.546914264636683 , -- 12.505 , 0.442962983193198 , -- 12.51 , 0.340141957400465 , -- 12.515 , 0.249991895482425 , -- 12.52 , 0.181816356681784 , -- 12.525 , 0.14149413564273 , -- 12.53 , 0.130883062190031 , -- 12.535 , 0.147852731887966 , -- 12.54 , 0.186894240935408 , -- 12.545 , 0.240161777063203 , -- 12.55 , 0.298772249040031 , -- 12.555 , 0.3541646202598 , -- 12.56 , 0.399336722395081 , -- 12.565 , 0.429803491932159 , -- 12.57 , 0.444142296553351 , -- 12.575 , 0.444055340271153 , -- 12.58 , 0.433919042501565 , -- 12.585 , 0.41987739717275 , -- 12.59 , 0.408602791719151 , -- 12.595 , 0.405932599777175 , -- 12.6 , 0.415626645287793 , -- 12.605 , 0.438500795189521 , -- 12.61 , 0.47213105784221 , -- 12.615 , 0.511225323925744 , -- 12.62 , 0.548612052766521 , -- 12.625 , 0.576660272126196 , -- 12.63 , 0.588829953918048 , -- 12.635 , 0.581021197761628 , -- 12.64 , 0.552418992096461 , -- 12.645 , 0.505653719521126 , -- 12.65 , 0.446259700593861 , -- 12.655 , 0.381569197808235 , -- 12.66 , 0.319325454510432 , -- 12.665 , 0.266332799357825 , -- 12.67 , 0.227442179455834 , -- 12.675 , 0.20505248099 , -- 12.68 , 0.199165657452942 , -- 12.685 , 0.207885677656546 , -- 12.69 , 0.228151213713856 , -- 12.695 , 0.256464303289308 , -- 12.7 , 0.289423464944378 , -- 12.705 , 0.323974105633788 , -- 12.71 , 0.357399971553342 , -- 12.715 , 0.387180213631022 , -- 12.72 , 0.410871216078733 , -- 12.725 , 0.426149440224674 , -- 12.73 , 0.431066724422046 , -- 12.735 , 0.424468610875424 , -- 12.74 , 0.40643852414304 , -- 12.745 , 0.378585136191504 , -- 12.75 , 0.344023630341179 , -- 12.755 , 0.306976904799534 , -- 12.76 , 0.272045167670388 , -- 12.765 , 0.243295410789869 , -- 12.77 , 0.223399948751481 , -- 12.775 , 0.213036444793139 , -- 12.78 , 0.210713889469279 , -- 12.785 , 0.213057227036913 , -- 12.79 , 0.21547276609123 , -- 12.795 , 0.213006795751766 , -- 12.8 , 0.201182178134479 , -- 12.805 , 0.176611102924828 , -- 12.81 , 0.137299208402565 , -- 12.815 , 8.261651333889580E-02 , -- 12.82 , 1.306254997938910E-02 , -- 12.825 , -7.003874532972119E-02 , -- 12.83 , -0.16475325893821 , -- 12.835 , -0.26859374971277 , -- 12.84 , -0.37841766630558 , -- 12.845 , -0.49027765178853 , -- 12.85 , -0.59935591527846 , -- 12.855 , -0.70013189417767 , -- 12.86 , -0.78683177941038 , -- 12.865 , -0.85412623949955 , -- 12.87 , -0.89792127381358 , -- 12.875 , -0.91603916182254 , -- 12.88 , -0.90857357773468 , -- 12.885 , -0.87778714750083 , -- 12.89 , -0.8275372966502 , -- 12.895 , -0.76235786224487 , -- 12.9 , -0.68643393291051 , -- 12.905 , -0.60274756840487 , -- 12.91 , -0.51264247885951 , -- 12.915 , -0.41593073711012 , -- 12.92 , -0.3115269410358 , -- 12.925 , -0.19842747985447 , -- 12.93 , -7.676760694603291E-02 , -- 12.935 , 5.135539420685220E-02 , -- 12.94 , 0.181528383908596 , -- 12.945 , 0.307260660414741 , -- 12.95 , 0.420769213103223 , -- 12.955 , 0.514139979660135 , -- 12.96 , 0.580592682156079 , -- 12.965 , 0.615578076246798 , -- 12.97 , 0.617476907926892 , -- 12.975 , 0.587799377315074 , -- 12.98 , 0.530889280436902 , -- 12.985 , 0.453243660311424 , -- 12.99 , 0.362622392194437 , -- 12.995 , 0.2671120583141 , -- 13.0 , 0.174286119779362 , -- 13.005 , 9.052797178882990E-02 , -- 13.01 , 2.054498441234870E-02 , -- 13.015 , -3.294702871288870E-02 , -- 13.02 , -6.937300005549160E-02 , -- 13.025 , -9.028206231971420E-02 , -- 13.03 , -9.913110412573760E-02 , -- 13.035 , -0.10083734030815 , -- 13.04 , -0.10108450259662 , -- 13.045 , -0.1054266897417 , -- 13.05 , -0.1182915683999 , -- 13.055 , -0.14205888957835 , -- 13.06 , -0.17640190935702 , -- 13.065 , -0.21806865581631 , -- 13.07 , -0.26120089347156 , -- 13.075 , -0.29817769418101 , -- 13.08 , -0.32085004389739 , -- 13.085 , -0.32193831070962 , -- 13.09 , -0.29631759697471 , -- 13.095 , -0.24193696858333 , -- 13.1 , -0.16019970762232 , -- 13.105 , -5.574993867029920E-02 , -- 13.11 , 6.425618048517991E-02 , -- 13.115 , 0.19122987419663 , -- 13.12 , 0.316346629224766 , -- 13.125 , 0.431653751489729 , -- 13.13 , 0.530914954469608 , -- 13.135 , 0.610121196882937 , -- 13.14 , 0.667657470309265 , -- 13.145 , 0.704186599565721 , -- 13.15 , 0.722325191446681 , -- 13.155 , 0.726186367330791 , -- 13.16 , 0.720836106520834 , -- 13.165 , 0.711688820321258 , -- 13.17 , 0.703862564199362 , -- 13.175 , 0.701524520420123 , -- 13.18 , 0.707294612263167 , -- 13.185 , 0.721797723723084 , -- 13.19 , 0.743474213000332 , -- 13.195 , 0.768726481461021 , -- 13.2 , 0.792431876186836 , -- 13.205 , 0.808764824723334 , -- 13.21 , 0.812196723822406 , -- 13.215 , 0.798471820125594 , -- 13.22 , 0.765360902698407 , -- 13.225 , 0.713020417223642 , -- 13.23 , 0.643892155196421 , -- 13.235 , 0.562167990243985 , -- 13.24 , 0.472970245560551 , -- 13.245 , 0.381438619514679 , -- 13.25 , 0.291951206368075 , -- 13.255 , 0.20762340636979 , -- 13.26 , 0.130166940321081 , -- 13.265 , 6.006289386634430E-02 , -- 13.27 , -3.060365982684810E-03 , -- 13.275 , -6.001488208941340E-02 , -- 13.28 , -0.11173380533579 , -- 13.285 , -0.15914104631288 , -- 13.29 , -0.20317809418618 , -- 13.295 , -0.24493336090531 , -- 13.3 , -0.28573011925772 , -- 13.305 , -0.32707569024184 , -- 13.31 , -0.37040876594875 , -- 13.315 , -0.41668833903021 , -- 13.32 , -0.46592656198441 , -- 13.325 , -0.51683388329442 , -- 13.33 , -0.56671530350641 , -- 13.335 , -0.61172427575717 , -- 13.34 , -0.64745289857378 , -- 13.345 , -0.66975635467017 , -- 13.35 , -0.67561421984368 , -- 13.355 , -0.66382212752523 , -- 13.36 , -0.63533221269618 , -- 13.365 , -0.59315990071751 , -- 13.37 , -0.54187928568118 , -- 13.375 , -0.48684683870894 , -- 13.38 , -0.43334458417513 , -- 13.385 , -0.38584852580448 , -- 13.39 , -0.34757223717143 , -- 13.395 , -0.32034609191295 , -- 13.4 , -0.30479305822331 , -- 13.405 , -0.30068667519817 , -- 13.41 , -0.30734431404504 , -- 13.415 , -0.32393187524719 , -- 13.42 , -0.3496124571983 , -- 13.425 , -0.38355062958007 , -- 13.43 , -0.42483772740574 , -- 13.435 , -0.47243959941852 , -- 13.44 , -0.52523698989138 , -- 13.445 , -0.58218855059142 , -- 13.45 , -0.64255715702482 , -- 13.455 , -0.70611547192509 , -- 13.46 , -0.77319959733532 , -- 13.465 , -0.84453581144061 , -- 13.47 , -0.9208154277502 , -- 13.475 , -1.00210330165744 , -- 13.48 , -1.08722318257344 , -- 13.485 , -1.17331384017982 , -- 13.49 , -1.25571905330723 , -- 13.495 , -1.32830569669314 , -- 13.5 , -1.38419198321401 , -- 13.505 , -1.41674939954092 , -- 13.51 , -1.42066916256513 , -- 13.515 , -1.39284912504276 , -- 13.52 , -1.33290856588875 , -- 13.525 , -1.24321481899912 , -- 13.53 , -1.12845482092199 , -- 13.535 , -0.994859301148 , -- 13.54 , -0.84929200472393 , -- 13.545 , -0.69840229944309 , -- 13.55 , -0.5480171915834 , -- 13.555 , -0.40283245150506 , -- 13.56 , -0.26639859300057 , -- 13.565 , -0.1412841699847 , -- 13.57 , -2.930752910284020E-02 , -- 13.575 , 6.831031669366761E-02 , -- 13.58 , 0.150909902638648 , -- 13.585 , 0.218485436556094 , -- 13.59 , 0.271817772885176 , -- 13.595 , 0.312563547048263 , -- 13.6 , 0.343197563758831 , -- 13.605 , 0.366784232668975 , -- 13.61 , 0.386577813348275 , -- 13.615 , 0.405567940703392 , -- 13.62 , 0.426060284638387 , -- 13.625 , 0.449416325446865 , -- 13.63 , 0.476003373865086 , -- 13.635 , 0.505362938780156 , -- 13.64 , 0.536518767578895 , -- 13.645 , 0.568328300506654 , -- 13.65 , 0.599754845087405 , -- 13.655 , 0.630000025300325 , -- 13.66 , 0.6584695973929 , -- 13.665 , 0.68462841460832 , -- 13.67 , 0.70782686172262 , -- 13.675 , 0.727203534668359 , -- 13.68 , 0.741722744375036 , -- 13.685 , 0.750362416108883 , -- 13.69 , 0.752392406085506 , -- 13.695 , 0.747650040601305 , -- 13.7 , 0.736696231685042 , -- 13.705 , 0.720777621636586 , -- 13.71 , 0.701571294344929 , -- 13.715 , 0.680769236869278 , -- 13.72 , 0.659613778989939 , -- 13.725 , 0.638519591968826 , -- 13.73 , 0.616905016742059 , -- 13.735 , 0.593283746255628 , -- 13.74 , 0.565603855337414 , -- 13.745 , 0.531733554716355 , -- 13.75 , 0.489962659748419 , -- 13.755 , 0.439375608243233 , -- 13.76 , 0.380009446404367 , -- 13.765 , 0.312773129830936 , -- 13.77 , 0.239195423372873 , -- 13.775 , 0.16110638214858 , -- 13.78 , 8.038995906805420E-02 , -- 13.785 , -1.102897232504770E-03 , -- 13.79 , -8.144778281704360E-02 , -- 13.795 , -0.15840843583426 , -- 13.8 , -0.22917659635052 , -- 13.805 , -0.29024518206889 , -- 13.81 , -0.33752175024298 , -- 13.815 , -0.36674198188098 , -- 13.82 , -0.37413071891857 , -- 13.825 , -0.35717935529397 , -- 13.83 , -0.31535074520267 , -- 13.835 , -0.25052105857336 , -- 13.84 , -0.16702284226815 , -- 13.845 , -7.124636094412699E-02 , -- 13.85 , 2.913353087510890E-02 , -- 13.855 , 0.126149325078345 , -- 13.86 , 0.212544685340441 , -- 13.865 , 0.282593826653342 , -- 13.87 , 0.33259342353236 , -- 13.875 , 0.360977014896564 , -- 13.88 , 0.368090497895831 , -- 13.885 , 0.355740094833499 , -- 13.89 , 0.326653538417733 , -- 13.895 , 0.283980395609887 , -- 13.9 , 0.230911938687721 , -- 13.905 , 0.170438689852821 , -- 13.91 , 0.105217955743757 , -- 13.915 , 3.748846121428490E-02 , -- 13.92 , -3.100811006762060E-02 , -- 13.925 , -9.912461677678459E-02 , -- 13.93 , -0.16638732593593 , -- 13.935 , -0.23301599989748 , -- 13.94 , -0.29981098203477 , -- 13.945 , -0.36788336374228 , -- 13.95 , -0.43823790831234 , -- 13.955 , -0.51128976367887 , -- 13.96 , -0.58642827752511 , -- 13.965 , -0.66176331535379 , -- 13.97 , -0.7341480161194 , -- 13.975 , -0.79952454249667 , -- 13.98 , -0.85353878258576 , -- 13.985 , -0.89230509468498 , -- 13.99 , -0.9131476514604 , -- 13.995 , -0.91514375354423 , -- 14.0 , -0.8993367487938 , -- 14.005 , -0.86856422332842 , -- 14.01 , -0.82694415950239 , -- 14.015 , -0.77913771351111 , -- 14.02 , -0.72955729658514 , -- 14.025 , -0.68168905647206 , -- 14.03 , -0.63766151216947 , -- 14.035 , -0.59811504505913 , -- 14.04 , -0.56235853309889 , -- 14.045 , -0.52872726325526 , -- 14.05 , -0.49503897771436 , -- 14.055 , -0.45902725746187 , -- 14.06 , -0.41868594009816 , -- 14.065 , -0.37248337306763 , -- 14.07 , -0.31947100513302 , -- 14.075 , -0.25931189817463 , -- 14.08 , -0.19228261646431 , -- 14.085 , -0.11925792681763 , -- 14.09 , -4.169532968283350E-02 , -- 14.095 , 3.843303316390890E-02 , -- 14.1 , 0.118775003838835 , -- 14.105 , 0.196837583343436 , -- 14.11 , 0.270307193173439 , -- 14.115 , 0.337420184008135 , -- 14.12 , 0.397291393971841 , -- 14.125 , 0.450126440210993 , -- 14.13 , 0.497226657276013 , -- 14.135 , 0.540774142842358 , -- 14.14 , 0.58340264798186 , -- 14.145 , 0.627643304621108 , -- 14.15 , 0.675349975738562 , -- 14.155 , 0.727241025622671 , -- 14.16 , 0.782651129746367 , -- 14.165 , 0.839560451090441 , -- 14.17 , 0.894881294455553 , -- 14.175 , 0.944955884798899 , -- 14.18 , 0.986144014351956 , -- 14.185 , 1.015390719979 , -- 14.19 , 1.0306572943892 , -- 14.195 , 1.03115234481902 , -- 14.2 , 1.01733343986871 , -- 14.205 , 0.990709541557108 , -- 14.21 , 0.953502790822332 , -- 14.215 , 0.908254264710393 , -- 14.22 , 0.857454756635746 , -- 14.225 , 0.803265224100822 , -- 14.23 , 0.74737385316121 , -- 14.235 , 0.690995601525318 , -- 14.24 , 0.635005073529152 , -- 14.245 , 0.580160133049894 , -- 14.25 , 0.527369694111442 , -- 14.255 , 0.477938039158216 , -- 14.26 , 0.433728338232803 , -- 14.265 , 0.397194149800069 , -- 14.27 , 0.371248511478309 , -- 14.275 , 0.358963505823744 , -- 14.28 , 0.363137797938165 , -- 14.285 , 0.385787231840523 , -- 14.29 , 0.427657749130475 , -- 14.295 , 0.487849697242734 , -- 14.3 , 0.563646552494242 , -- 14.305 , 0.650598748291401 , -- 14.31 , 0.742869615401765 , -- 14.315 , 0.833794067276776 , -- 14.32 , 0.916556460872168 , -- 14.325 , 0.984863842045941 , -- 14.33 , 1.0335040976667 , -- 14.335 , 1.05869041827564 , -- 14.34 , 1.05816644274048 , -- 14.345 , 1.03108361491544 , -- 14.35 , 0.977735351761127 , -- 14.355 , 0.899232930675646 , -- 14.36 , 0.797237214065439 , -- 14.365 , 0.673796884116058 , -- 14.37 , 0.531337867932015 , -- 14.375 , 0.372747573641774 , -- 14.38 , 0.20150981243218 , -- 14.385 , 2.178427411223690E-02 , -- 14.39 , -0.16161383529816 , -- 14.395 , -0.34339606863716 , -- 14.4 , -0.5181084642692 , -- 14.405 , -0.68053644448525 , -- 14.41 , -0.826088703855 , -- 14.415 , -0.95112570187104 , -- 14.42 , -1.05313423965707 , -- 14.425 , -1.13075625342751 , -- 14.43 , -1.18366851217429 , -- 14.435 , -1.21238579974723 , -- 14.44 , -1.21803310838506 , -- 14.445 , -1.20215241564511 , -- 14.45 , -1.16656016251128 , -- 14.455 , -1.113269900772 , -- 14.46 , -1.04444581397611 , -- 14.465 , -0.96236345544593 , -- 14.47 , -0.86935386142724 , -- 14.475 , -0.76773118679175 , -- 14.48 , -0.65972693552001 , -- 14.485 , -0.54746173019692 , -- 14.49 , -0.43299292085595 , -- 14.495 , -0.3184397215422 , -- 14.5 , -0.20616849862018 , -- 14.505 , -9.897318159698620E-02 , -- 14.51 , -1.803143023172810E-04 , -- 14.515 , 8.640194233650360E-02 , -- 14.52 , 0.156727372406871 , -- 14.525 , 0.206940131693837 , -- 14.53 , 0.233914703352716 , -- 14.535 , 0.235793875210402 , -- 14.54 , 0.212387260096523 , -- 14.545 , 0.165314426336394 , -- 14.55 , 9.783758697368690E-02 , -- 14.555 , 1.439534230634960E-02 , -- 14.56 , -8.005859022341789E-02 , -- 14.565 , -0.18076618261283 , -- 14.57 , -0.28374454180973 , -- 14.575 , -0.38610798365218 , -- 14.58 , -0.48605081190961 , -- 14.585 , -0.58252398542127 , -- 14.59 , -0.67470367132805 , -- 14.595 , -0.76142935693159 , -- 14.6 , -0.8407780560685 , -- 14.605 , -0.90992374040628 , -- 14.61 , -0.96532870247995 , -- 14.615 , -1.00324396367882 , -- 14.62 , -1.02038773635927 , -- 14.625 , -1.01463341589249 , -- 14.63 , -0.98552757460307 , -- 14.635 , -0.93450835223946 , -- 14.64 , -0.86477120783303 , -- 14.645 , -0.78081893710178 , -- 14.65 , -0.68781873202676 , -- 14.655 , -0.59091719649253 , -- 14.66 , -0.49467793607145 , -- 14.665 , -0.40274402274473 , -- 14.67 , -0.31777533615604 , -- 14.675 , -0.24161241000393 , -- 14.68 , -0.17557875216008 , -- 14.685 , -0.12078750746673 , -- 14.69 , -7.835224295217311E-02 , -- 14.695 , -4.942101977486440E-02 , -- 14.7 , -3.503749471905150E-02 , -- 14.705 , -3.587495731215070E-02 , -- 14.71 , -5.194398103175540E-02 , -- 14.715 , -8.236828155631780E-02 , -- 14.72 , -0.12531697112263 , -- 14.725 , -0.17812203875209 , -- 14.73 , -0.23756805254037 , -- 14.735 , -0.30028601265584 , -- 14.74 , -0.36316012018238 , -- 14.745 , -0.42365909583363 , -- 14.75 , -0.48002335079991 , -- 14.755 , -0.53128602795839 , -- 14.76 , -0.57714447879069 , -- 14.765 , -0.61773654874064 , -- 14.77 , -0.65338922947777 , -- 14.775 , -0.68440719071073 , -- 14.78 , -0.71094150841826 , -- 14.785 , -0.73295383213119 , -- 14.79 , -0.75025831938642 , -- 14.795 , -0.76260438890415 , -- 14.8 , -0.76975912976851 , -- 14.805 , -0.77155180131721 , -- 14.81 , -0.76787415141689 , -- 14.815 , -0.75863134459094 , -- 14.82 , -0.74368104295612 , -- 14.825 , -0.72278322433993 , -- 14.83 , -0.69560054902327 , -- 14.835 , -0.66175375591306 , -- 14.84 , -0.62093898535516 , -- 14.845 , -0.57306913773937 , -- 14.85 , -0.51841917741191 , -- 14.855 , -0.45771315164191 , -- 14.86 , -0.392137917305 , -- 14.865 , -0.3232532945768 , -- 14.87 , -0.25282156152333 , -- 14.875 , -0.18257072630809 , -- 14.88 , -0.11395570313114 , -- 14.885 , -4.795078990473090E-02 , -- 14.89 , 1.505030752196730E-02 , -- 14.895 , 7.523505899511330E-02 , -- 14.9 , 0.133241663209769 , -- 14.905 , 0.189946958395501 , -- 14.91 , 0.246204884243539 , -- 14.915 , 0.302617865301028 , -- 14.92 , 0.359383341937356 , -- 14.925 , 0.416272256914715 , -- 14.93 , 0.472730379837134 , -- 14.935 , 0.528097455638089 , -- 14.94 , 0.581866656852053 , -- 14.945 , 0.633923511292493 , -- 14.95 , 0.684671503159956 , -- 14.955 , 0.735006617044871 , -- 14.96 , 0.78610900707482 , -- 14.965 , 0.839096114213373 , -- 14.97 , 0.894592925855566 , -- 14.975 , 0.952340646800937 , -- 14.98 , 1.0109322862822 , -- 14.985 , 1.06776815099708 , -- 14.99 , 1.11925763952313 , -- 14.995 , 1.16125733848899 , -- 15.0 , 1.18965840938029 , -- 15.005 , 1.20101711803106 , -- 15.01 , 1.19309156203439 , -- 15.015 , 1.16518353563898 , -- 15.02 , 1.11821232455035 , -- 15.025 , 1.0545184865003 , -- 15.03 , 0.977448615628865 , -- 15.035 , 0.890815252481333 , -- 15.04 , 0.798354444510221 , -- 15.045 , 0.703279494461959 , -- 15.05 , 0.60801847543151 , -- 15.055 , 0.514150357593879 , -- 15.06 , 0.422530486995826 , -- 15.065 , 0.333543044544543 , -- 15.07 , 0.247413880227417 , -- 15.075 , 0.164505011560775 , -- 15.08 , 8.554502116652860E-02 , -- 15.085 , 1.176008397877900E-02 , -- 15.09 , -5.508991016794810E-02 , -- 15.095 , -0.11277329041032 , -- 15.1 , -0.15872202731611 , -- 15.105 , -0.19023769676271 , -- 15.11 , -0.20475543680883 , -- 15.115 , -0.20016459209247 , -- 15.12 , -0.17515953672649 , -- 15.125 , -0.1295909322101 , -- 15.13 , -6.475341455153370E-02 , -- 15.135 , 1.645644779243700E-02 , -- 15.14 , 0.109582085491203 , -- 15.145 , 0.208891920094615 , -- 15.15 , 0.307902347961824 , -- 15.155 , 0.400086953541137 , -- 15.16 , 0.479656312478387 , -- 15.165 , 0.54227026093024 , -- 15.17 , 0.585531391323096 , -- 15.175 , 0.60915577781107 , -- 15.18 , 0.614771789148716 , -- 15.185 , 0.605386403919845 , -- 15.19 , 0.584635659710548 , -- 15.195 , 0.555987240463961 , -- 15.2 , 0.522078576056577 , -- 15.205 , 0.484332615313383 , -- 15.21 , 0.44293940454718 , -- 15.215 , 0.397175120559912 , -- 15.22 , 0.345968006972672 , -- 15.225 , 0.288543030116857 , -- 15.23 , 0.224972791486283 , -- 15.235 , 0.156481408793171 , -- 15.24 , 8.542958350357370E-02 , -- 15.245 , 1.498370477529230E-02 , -- 15.25 , -5.142934425176120E-02 , -- 15.255 , -0.1107437937938 , -- 15.26 , -0.16078441017566 , -- 15.265 , -0.20057844669055 , -- 15.27 , -0.23037829970624 , -- 15.275 , -0.2514154045316 , -- 15.28 , -0.26546110414046 , -- 15.285 , -0.27433386226401 , -- 15.29 , -0.27947343680654 , -- 15.295 , -0.28170382574971 , -- 15.3 , -0.28121922535055 , -- 15.305 , -0.27778333156123 , -- 15.31 , -0.27106104276765 , -- 15.315 , -0.26098347288903 , -- 15.32 , -0.2480337104626 , -- 15.325 , -0.23338239832851 , -- 15.33 , -0.21883669131141 , -- 15.335 , -0.20662723365469 , -- 15.34 , -0.19908795725974 , -- 15.345 , -0.1983095632208 , -- 15.35 , -0.20583511356768 , -- 15.355 , -0.22245388077999 , -- 15.36 , -0.24810721805446 , -- 15.365 , -0.28190022979588 , -- 15.37 , -0.32218399867655 , -- 15.375 , -0.36668187000496 , -- 15.38 , -0.41262893144551 , -- 15.385 , -0.4569195252945 , -- 15.39 , -0.49626700745835 , -- 15.395 , -0.52739011070132 , -- 15.4 , -0.54723474350703 , -- 15.405 , -0.55322582044501 , -- 15.41 , -0.54352567312437 , -- 15.415 , -0.51725918301048 , -- 15.42 , -0.47466073347181 , -- 15.425 , -0.41710230560527 , -- 15.43 , -0.34698928139492 , -- 15.435 , -0.26752756403572 , -- 15.44 , -0.18240759770015 , -- 15.445 , -9.545429827632960E-02 , -- 15.45 , -1.031774321012660E-02 , -- 15.455 , 6.975569716684001E-02 , -- 15.46 , 0.142031815271298 , -- 15.465 , 0.204287600135245 , -- 15.47 , 0.254724524020873 , -- 15.475 , 0.291852234959508 , -- 15.48 , 0.314393966922164 , -- 15.485 , 0.321257693596354 , -- 15.49 , 0.311592647764159 , -- 15.495 , 0.284924209311069 , -- 15.5 , 0.241333574629117 , -- 15.505 , 0.181630984411648 , -- 15.51 , 0.107473789318163 , -- 15.515 , 2.138659993284420E-02 , -- 15.52 , -7.333294612818740E-02 , -- 15.525 , -0.17281819572361 , -- 15.53 , -0.2729111163528 , -- 15.535 , -0.36947452952708 , -- 15.54 , -0.45868092644508 , -- 15.545 , -0.53724054983261 , -- 15.55 , -0.60253835404275 , -- 15.555 , -0.65267651763316 , -- 15.56 , -0.6864354117723 , -- 15.565 , -0.70318229683703 , -- 15.57 , -0.70276183568102 , -- 15.575 , -0.68540176686393 , -- 15.58 , -0.6516520838685 , -- 15.585 , -0.60236502510189 , -- 15.59 , -0.538706492591 , -- 15.595 , -0.46217410897888 , -- 15.6 , -0.37460077533887 , -- 15.605 , -0.27810973417383 , -- 15.61 , -0.17502716813551 , -- 15.615 , -6.773228527287170E-02 , -- 15.62 , 4.151501433409210E-02 , -- 15.625 , 0.150751860185515 , -- 15.63 , 0.258442092002889 , -- 15.635 , 0.363538574930614 , -- 15.64 , 0.465442765332169 , -- 15.645 , 0.563876126508653 , -- 15.65 , 0.658665592231715 , -- 15.655 , 0.749509291460253 , -- 15.66 , 0.835755718589599 , -- 15.665 , 0.916264699152492 , -- 15.67 , 0.989375816925145 , -- 15.675 , 1.05301420158238 , -- 15.68 , 1.10490739292059 , -- 15.685 , 1.14288462647541 , -- 15.69 , 1.16518849553063 , -- 15.695 , 1.1707464912492 , -- 15.7 , 1.15934157640063 , -- 15.705 , 1.13165264409975 , -- 15.71 , 1.08916287801769 , -- 15.715 , 1.03396048449819 , -- 15.72 , 0.968480895649285 , -- 15.725 , 0.895239610317516 , -- 15.73 , 0.816614791244956 , -- 15.735 , 0.734699276030846 , -- 15.74 , 0.651241095374945 , -- 15.745 , 0.567649521370319 , -- 15.75 , 0.485049163207599 , -- 15.755 , 0.404335549986381 , -- 15.76 , 0.326219056425138 , -- 15.765 , 0.251231356865374 , -- 15.77 , 0.179720965294244 , -- 15.775 , 0.111831041730238 , -- 15.78 , 4.750476279777080E-02 , -- 15.785 , -1.347798247405040E-02 , -- 15.79 , -7.141356069694010E-02 , -- 15.795 , -0.12656450883031 , -- 15.8 , -0.1790372399842 , -- 15.805 , -0.2286955113047 , -- 15.81 , -0.27512243015728 , -- 15.815 , -0.31766447732324 , -- 15.82 , -0.3555388110919 , -- 15.825 , -0.38798921520158 , -- 15.83 , -0.41444221410296 , -- 15.835 , -0.43463094635962 , -- 15.84 , -0.44864369112348 , -- 15.845 , -0.4568931292131 , -- 15.85 , -0.46000160926806 , -- 15.855 , -0.45865250041628 , -- 15.86 , -0.45343877892519 , -- 15.865 , -0.44476504067162 , -- 15.87 , -0.43283082098116 , -- 15.875 , -0.41771237775514 , -- 15.88 , -0.3995214147592 , -- 15.885 , -0.37860415544342 , -- 15.89 , -0.35572212713179 , -- 15.895 , -0.33216132888134 , -- 15.9 , -0.30972572285948 , -- 15.905 , -0.29059799700979 , -- 15.91 , -0.27708096353175 , -- 15.915 , -0.27126155854412 , -- 15.92 , -0.2746590319597 , -- 15.925 , -0.28792675974919 , -- 15.93 , -0.31066689274262 , -- 15.935 , -0.34140077106906 , -- 15.94 , -0.3777039602476 , -- 15.945 , -0.41648665097944 , -- 15.95 , -0.45437291128764 , -- 15.955 , -0.48811381404708 , -- 15.96 , -0.51496612193939 , -- 15.965 , -0.5329765854495 , -- 15.97 , -0.54113053164364 , -- 15.975 , -0.53935053269995 , -- 15.98 , -0.52835825596445 , -- 15.985 , -0.50943591924887 , -- 15.99 , -0.48413923071434 , -- 15.995 , -0.45401661733085 , -- 16.0 , -0.42038541841803 , -- 16.005 , -0.38419449756936 , -- 16.01 , -0.34598883075877 , -- 16.015 , -0.30596135684737 , -- 16.02 , -0.26406862723475 , -- 16.025 , -0.22017134269813 , -- 16.03 , -0.17416871222392 , -- 16.035 , -0.12609398639317 , -- 16.04 , -7.616580091339020E-02 , -- 16.045 , -2.479105816937940E-02 , -- 16.05 , 2.745737110728120E-02 , -- 16.055 , 7.987861751112391E-02 , -- 16.06 , 0.131672708259285 , -- 16.065 , 0.181958505928516 , -- 16.07 , 0.229779175022502 , -- 16.075 , 0.274114727562895 , -- 16.08 , 0.313912537790184 , -- 16.085 , 0.348155259464482 , -- 16.09 , 0.375959714090624 , -- 16.095 , 0.396703409827832 , -- 16.1 , 0.410143539243666 , -- 16.105 , 0.416499539855543 , -- 16.11 , 0.416464899336383 , -- 16.115 , 0.411132431725026 , -- 16.12 , 0.401834694221056 , -- 16.125 , 0.389926331168038 , -- 16.13 , 0.376552509432684 , -- 16.135 , 0.362455371415181 , -- 16.14 , 0.347864663265341 , -- 16.145 , 0.332498409591647 , -- 16.15 , 0.315673926599289 , -- 16.155 , 0.296498803516978 , -- 16.16 , 0.274095775096738 , -- 16.165 , 0.247800859489553 , -- 16.17 , 0.217295286911219 , -- 16.175 , 0.182636701553898 , -- 16.18 , 0.144199700257594 , -- 16.185 , 0.102548913123023 , -- 16.19 , 5.829530297192130E-02 , -- 16.195 , 1.197592728082750E-02 , -- 16.2 , -3.600290534227300E-02 , -- 16.205 , -8.535615468618291E-02 , -- 16.21 , -0.13584918811621 , -- 16.215 , -0.18721153582539 , -- 16.22 , -0.23906457716721 , -- 16.225 , -0.29090350734869 , -- 16.23 , -0.34213587188623 , -- 16.235 , -0.392170780993 , -- 16.24 , -0.44051591221236 , -- 16.245 , -0.48684480865516 , -- 16.25 , -0.53098857668878 , -- 16.255 , -0.57284978382707 , -- 16.26 , -0.61224319073572 , -- 16.265 , -0.64871598685836 , -- 16.27 , -0.68140334352395 , -- 16.275 , -0.70898222576025 , -- 16.28 , -0.7297595947791 , -- 16.285 , -0.7418948815967 , -- 16.29 , -0.74371891027858 , -- 16.295 , -0.73407611710958 , -- 16.3 , -0.71260329024102 , -- 16.305 , -0.67986749030603 , -- 16.31 , -0.63732240300856 , -- 16.315 , -0.58707824160675 , -- 16.32 , -0.53154405116823 , -- 16.325 , -0.47301455154914 , -- 16.33 , -0.41331652122001 , -- 16.335 , -0.35357961212191 , -- 16.34 , -0.29419497300413 , -- 16.345 , -0.23495140181355 , -- 16.35 , -0.17531083484956 , -- 16.355 , -0.11473456907756 , -- 16.36 , -5.298091218194400E-02 , -- 16.365 , 9.709062607778981E-03 , -- 16.37 , 7.256409889259650E-02 , -- 16.375 , 0.134384503385863 , -- 16.38 , 0.193739454595389 , -- 16.385 , 0.24920525086789 , -- 16.39 , 0.299568602241651 , -- 16.395 , 0.343956956389216 , -- 16.4 , 0.381866908791684 , -- 16.405 , 0.413114650618461 , -- 16.41 , 0.437733369467239 , -- 16.415 , 0.455877974867213 , -- 16.42 , 0.46776384132681 , -- 16.425 , 0.473663922748246 , -- 16.43 , 0.47395074709205 , -- 16.435 , 0.469159269294089 , -- 16.44 , 0.460028874160481 , -- 16.445 , 0.447496145434672 , -- 16.45 , 0.43262324571891 , -- 16.455 , 0.416476298710912 , -- 16.46 , 0.39998487143001 , -- 16.465 , 0.383825594174033 , -- 16.47 , 0.368369873101624 , -- 16.475 , 0.353714574674185 , -- 16.48 , 0.339789306901935 , -- 16.485 , 0.326509782519242 , -- 16.49 , 0.313927074313828 , -- 16.495 , 0.302325131506492 , -- 16.5 , 0.292230126681682 , -- 16.505 , 0.284323481848275 , -- 16.51 , 0.279278430837744 , -- 16.515 , 0.277565991023392 , -- 16.52 , 0.27928378094795 , -- 16.525 , 0.284059216918989 , -- 16.53 , 0.291055442661278 , -- 16.535 , 0.299081158427955 , -- 16.54 , 0.306775986803293 , -- 16.545 , 0.312824550426672 , -- 16.55 , 0.316148133716397 , -- 16.555 , 0.316029035226392 , -- 16.56 , 0.31215069004257 , -- 16.565 , 0.304553318859 , -- 16.57 , 0.293538129439739 , -- 16.575 , 0.279551088336509 , -- 16.58 , 0.263087654869009 , -- 16.585 , 0.244637877428558 , -- 16.59 , 0.224678132698894 , -- 16.595 , 0.203690933512921 , -- 16.6 , 0.182189070638557 , -- 16.605 , 0.160712533967535 , -- 16.61 , 0.139788985048289 , -- 16.615 , 0.119849630257617 , -- 16.62 , 0.101127004531768 , -- 16.625 , 8.356184746823360E-02 , -- 16.63 , 6.675788773408831E-02 , -- 16.635 , 5.000422430522750E-02 , -- 16.64 , 3.237781788478290E-02 , -- 16.645 , 1.290492007865870E-02 , -- 16.65 , -9.242841522190411E-03 , -- 16.655 , -3.457307113926180E-02 , -- 16.66 , -6.315044794397080E-02 , -- 16.665 , -9.456431033805510E-02 , -- 16.67 , -0.12798945588883 , -- 16.675 , -0.16233338586658 , -- 16.68 , -0.19643231791386 , -- 16.685 , -0.22926030484873 , -- 16.69 , -0.26010137973961 , -- 16.695 , -0.28866176894499 , -- 16.7 , -0.31509595200913 , -- 16.705 , -0.33995273832631 , -- 16.71 , -0.36405095016433 , -- 16.715 , -0.38831357635509 , -- 16.72 , -0.41358504112542 , -- 16.725 , -0.44046253469103 , -- 16.73 , -0.46915752304 , -- 16.735 , -0.49941060932339 , -- 16.74 , -0.53046223395319 , -- 16.745 , -0.56108536534834 , -- 16.75 , -0.58967419378453 , -- 16.755 , -0.61438209498106 , -- 16.76 , -0.63329121107995 , -- 16.765 , -0.64459684400811 , -- 16.77 , -0.64678096256853 , -- 16.775 , -0.63875489537808 , -- 16.78 , -0.61995220147847 , -- 16.785 , -0.59036060295097 , -- 16.79 , -0.55049669392639 , -- 16.795 , -0.50133039140924 , -- 16.8 , -0.44418245956687 , -- 16.805 , -0.38061075875138 , -- 16.81 , -0.31231562731901 , -- 16.815 , -0.24106197922092 , -- 16.82 , -0.1686326543263 , -- 16.825 , -9.679598568714549E-02 , -- 16.83 , -2.728380092511400E-02 , -- 16.835 , 3.824293020108400E-02 , -- 16.84 , 9.824002683071940E-02 , -- 16.845 , 0.151346034414838 , -- 16.85 , 0.196448639221428 , -- 16.855 , 0.232748834021365 , -- 16.86 , 0.259798117288868 , -- 16.865 , 0.277506221603702 , -- 16.87 , 0.286111918797314 , -- 16.875 , 0.286131733842289 , -- 16.88 , 0.278296735618878 , -- 16.885 , 0.263498277115562 , -- 16.89 , 0.24274886174333 , -- 16.895 , 0.217166404345327 , -- 16.9 , 0.187968246853482 , -- 16.905 , 0.156461968787081 , -- 16.91 , 0.124015045694316 , -- 16.915 , 9.199139026589789E-02 , -- 16.92 , 6.165693925050090E-02 , -- 16.925 , 3.406870712543500E-02 , -- 16.93 , 9.974305988061479E-03 , -- 16.935 , -1.024803512308630E-02 , -- 16.94 , -2.658403019625520E-02 , -- 16.945 , -3.930334521456180E-02 , -- 16.95 , -4.881605741987730E-02 , -- 16.955 , -5.549717708582600E-02 , -- 16.96 , -5.952392534556360E-02 , -- 16.965 , -6.076975805147920E-02 , -- 16.97 , -5.879314030308780E-02 , -- 16.975 , -5.292859848425780E-02 , -- 16.98 , -4.246799585244240E-02 , -- 16.985 , -2.689000147691090E-02 , -- 16.99 , -6.084643377645750E-03 , -- 16.995 , 1.948494890135070E-02 , -- 17.0 , 4.872381188647930E-02 , -- 17.005 , 7.996838345792370E-02 , -- 17.01 , 0.111158477862087 , -- 17.015 , 0.140083752196672 , -- 17.02 , 0.164651035916986 , -- 17.025 , 0.18312224741681 , -- 17.03 , 0.194279612887888 , -- 17.035 , 0.197502657429334 , -- 17.04 , 0.192756670137177 , -- 17.045 , 0.180518699701142 , -- 17.05 , 0.161669903280425 , -- 17.055 , 0.137385815960322 , -- 17.06 , 0.109043393552795 , -- 17.065 , 7.814867623624100E-02 , -- 17.07 , 4.627753286711330E-02 , -- 17.075 , 1.501227171733180E-02 , -- 17.08 , -1.413775130832270E-02 , -- 17.085 , -3.983793711438840E-02 , -- 17.09 , -6.104036519750250E-02 , -- 17.095 , -7.708842285673501E-02 , -- 17.1 , -8.778382263463140E-02 , -- 17.105 , -9.339483606844121E-02 , -- 17.11 , -9.459269265106150E-02 , -- 17.115 , -9.232223501388739E-02 , -- 17.12 , -8.763025422153840E-02 , -- 17.125 , -8.148499770125020E-02 , -- 17.13 , -7.462775457220110E-02 , -- 17.135 , -6.748324353623050E-02 , -- 17.14 , -6.014609852966310E-02 , -- 17.145 , -5.243702915474610E-02 , -- 17.15 , -4.400785444844100E-02 , -- 17.155 , -3.446180958692290E-02 , -- 17.16 , -2.345792198001310E-02 , -- 17.165 , -1.077394978512690E-02 , -- 17.17 , 3.679128728274960E-03 , -- 17.175 , 1.988574043577430E-02 , -- 17.18 , 3.777667605297300E-02 , -- 17.185 , 5.727939847072780E-02 , -- 17.19 , 7.834501552629659E-02 , -- 17.195 , 0.100944016898245 , -- 17.2 , 0.125030824710985 , -- 17.205 , 0.150493723897266 , -- 17.21 , 0.177105725250697 , -- 17.215 , 0.204499198588219 , -- 17.22 , 0.232171627050269 , -- 17.225 , 0.259522952289019 , -- 17.23 , 0.28591162656688 , -- 17.235 , 0.310713017545991 , -- 17.24 , 0.333360202463241 , -- 17.245 , 0.353356491062333 , -- 17.25 , 0.370257070307643 , -- 17.255 , 0.383631410780558 , -- 17.26 , 0.393022771718625 , -- 17.265 , 0.397924531915073 , -- 17.27 , 0.397789484581034 , -- 17.275 , 0.392075448648513 , -- 17.28 , 0.380321842357972 , -- 17.285 , 0.362236624526743 , -- 17.29 , 0.337775799625786 , -- 17.295 , 0.307187618217491 , -- 17.3 , 0.271012952518342 , -- 17.305 , 0.230034748672592 , -- 17.31 , 0.185192192119736 , -- 17.315 , 0.1374724900416 , -- 17.32 , 8.781061932229070E-02 , -- 17.325 , 3.701123827098990E-02 , -- 17.33 , -1.428322820528750E-02 , -- 17.335 , -6.558572925239700E-02 , -- 17.34 , -0.11651660768663 , -- 17.345 , -0.16673628393002 , -- 17.35 , -0.21587015869355 , -- 17.355 , -0.26345095520442 , -- 17.36 , -0.30888431890374 , -- 17.365 , -0.35145163113226 , -- 17.37 , -0.39033885127352 , -- 17.375 , -0.42469770664605 , -- 17.38 , -0.45371821850159 , -- 17.385 , -0.4767087589838 , -- 17.39 , -0.49316630884791 , -- 17.395 , -0.50283205552792 , -- 17.4 , -0.50572081737774 , -- 17.405 , -0.50212196719028 , -- 17.41 , -0.49256808518885 , -- 17.415 , -0.47777707225688 , -- 17.42 , -0.45857357564831 , -- 17.425 , -0.43580164741667 , -- 17.43 , -0.41024501009179 , -- 17.435 , -0.3825675139441 , -- 17.44 , -0.35328788816102 , -- 17.445 , -0.32279085797443 , -- 17.45 , -0.29137731320226 , -- 17.455 , -0.25933449326509 , -- 17.46 , -0.2270143702293 , -- 17.465 , -0.19489381305459 , -- 17.47 , -0.16360264699467 , -- 17.475 , -0.1339028594142 , -- 17.48 , -0.1066224111889 , -- 17.485 , -8.254834652459410E-02 , -- 17.49 , -6.230534889079800E-02 , -- 17.495 , -4.623541755964700E-02 , -- 17.5 , -3.430878641434340E-02 , -- 17.505 , -2.607920373761460E-02 , -- 17.51 , -2.069570607448080E-02 , -- 17.515 , -1.696571448514850E-02 , -- 17.52 , -1.346258488402600E-02 , -- 17.525 , -8.657687814216761E-03 , -- 17.53 , -1.066706267368470E-03 , -- 17.535 , 1.061426833550790E-02 , -- 17.54 , 2.738663947692650E-02 , -- 17.545 , 4.985546977711610E-02 , -- 17.55 , 7.816411304470480E-02 , -- 17.555 , 0.111966131087412 , -- 17.56 , 0.150434055062022 , -- 17.565 , 0.19231308509617 , -- 17.57 , 0.236013378779133 , -- 17.575 , 0.279746002917216 , -- 17.58 , 0.321684272405146 , -- 17.585 , 0.360138883852544 , -- 17.59 , 0.393718048669997 , -- 17.595 , 0.421452589177563 , -- 17.6 , 0.442859042866297 , -- 17.605 , 0.457932285135102 , -- 17.61 , 0.467063199142238 , -- 17.615 , 0.470901203329776 , -- 17.62 , 0.470183933061112 , -- 17.625 , 0.465570499510758 , -- 17.63 , 0.457509881267887 , -- 17.635 , 0.446170505322342 , -- 17.64 , 0.431441044905879 , -- 17.645 , 0.412997059132728 , -- 17.65 , 0.390417907394592 , -- 17.655 , 0.363320032948617 , -- 17.66 , 0.331482683771369 , -- 17.665 , 0.294935652090983 , -- 17.67 , 0.254001046090184 , -- 17.675 , 0.209280977845859 , -- 17.68 , 0.161607754445718 , -- 17.685 , 0.111965960430188 , -- 17.69 , 6.141586922651330E-02 , -- 17.695 , 1.102093548815530E-02 , -- 17.7 , -3.820203658969610E-02 , -- 17.705 , -8.531704155098779E-02 , -- 17.71 , -0.1294862669167 , -- 17.715 , -0.16998594459785 , -- 17.72 , -0.20622064042651 , -- 17.725 , -0.23774591935919 , -- 17.73 , -0.26428840511531 , -- 17.735 , -0.28576606331927 , -- 17.74 , -0.30229286763517 , -- 17.745 , -0.31416772926296 , -- 17.75 , -0.3218406535065 , -- 17.755 , -0.3258645654062 , -- 17.76 , -0.32683843068621 , -- 17.765 , -0.32535588224289 , -- 17.77 , -0.32196457829868 , -- 17.775 , -0.31715006731732 , -- 17.78 , -0.31133941077337 , -- 17.785 , -0.30492235408688 , -- 17.79 , -0.29827929738639 , -- 17.795 , -0.29180571311681 , -- 17.8 , -0.2859227673159 , -- 17.805 , -0.2810686116836 , -- 17.81 , -0.27767024271612 , -- 17.815 , -0.27609995179852 , -- 17.82 , -0.27662600365925 , -- 17.825 , -0.27936632736658 , -- 17.83 , -0.28425416349301 , -- 17.835 , -0.29102164261339 , -- 17.84 , -0.29920350847177 , -- 17.845 , -0.30815897987418 , -- 17.85 , -0.31710995942421 , -- 17.855 , -0.32518836729579 , -- 17.86 , -0.33149006868417 , -- 17.865 , -0.33512980995752 , -- 17.87 , -0.33529555909469 , -- 17.875 , -0.3312973400369 , -- 17.88 , -0.32261024125577 , -- 17.885 , -0.30890529900639 , -- 17.89 , -0.290070720818 , -- 17.895 , -0.26621431048452 , -- 17.9 , -0.23765242692415 , -- 17.905 , -0.20488114286083 , -- 17.91 , -0.16853769940936 , -- 17.915 , -0.12935252659241 , -- 17.92 , -8.810348127193721E-02 , -- 17.925 , -4.557141302171240E-02 , -- 17.93 , -2.513356389291560E-03 , -- 17.935 , 4.035724323904150E-02 , -- 17.94 , 8.237249752346711E-02 , -- 17.945 , 0.122904827481364 , -- 17.95 , 0.16135335850423 , -- 17.955 , 0.197135089796928 , -- 17.96 , 0.229680590055412 , -- 17.965 , 0.258445542327015 , -- 17.97 , 0.282931564681535 , -- 17.975 , 0.3027256078172 , -- 17.98 , 0.317544225316334 , -- 17.985 , 0.327282981257925 , -- 17.99 , 0.332055566875123 , -- 17.995 , 0.332219078215985 , -- 18.0 , 0.328372664764279 , -- 18.005 , 0.321327968541342 , -- 18.01 , 0.312046315167661 , -- 18.015 , 0.301552393558308 , -- 18.02 , 0.29083015000257 , -- 18.025 , 0.280717140577436 , -- 18.03 , 0.271812862742294 , -- 18.035 , 0.264416834319869 , -- 18.04 , 0.258507921567912 , -- 18.045 , 0.25377043717894 , -- 18.05 , 0.249664740892512 , -- 18.055 , 0.245531784942376 , -- 18.06 , 0.240715666971269 , -- 18.065 , 0.234683989615924 , -- 18.07 , 0.227126896191005 , -- 18.075 , 0.218018915200585 , -- 18.08 , 0.207635259720329 , -- 18.085 , 0.196519817484055 , -- 18.09 , 0.185413864456323 , -- 18.095 , 0.175156074068905 , -- 18.1 , 0.166570903921847 , -- 18.105 , 0.160362276331594 , -- 18.11 , 0.157026715204937 , -- 18.115 , 0.156797444080986 , -- 18.12 , 0.159624455669982 , -- 18.125 , 0.16519187224497 , -- 18.13 , 0.172968089200864 , -- 18.135 , 0.1822813476427 , -- 18.14 , 0.192409206882619 , -- 18.145 , 0.202670276399768 , -- 18.15 , 0.212504752944377 , -- 18.155 , 0.221533110089593 , -- 18.16 , 0.229583054017435 , -- 18.165 , 0.236681693233947 , -- 18.17 , 0.24301317231324 , -- 18.175 , 0.248850323481097 , -- 18.18 , 0.254471744041749 , -- 18.185 , 0.260080804366178 , -- 18.19 , 0.265741889443548 , -- 18.195 , 0.27134643214208 , -- 18.2 , 0.276614811069614 , -- 18.205 , 0.281132591864889 , -- 18.21 , 0.284412543870369 , -- 18.215 , 0.285966261493111 , -- 18.22 , 0.28537109719781 , -- 18.225 , 0.282316011041418 , -- 18.23 , 0.276621372715182 , -- 18.235 , 0.268228573189369 , -- 18.24 , 0.257171332184819 , -- 18.245 , 0.243536231265936 , -- 18.25 , 0.227433656521336 , -- 18.255 , 0.208982058948683 , -- 18.26 , 0.188316971988387 , -- 18.265 , 0.165617801602736 , -- 18.27 , 0.141146408794358 , -- 18.275 , 0.115280086715596 , -- 18.28 , 8.852986599304000E-02 , -- 18.285 , 6.153122175946150E-02 , -- 18.29 , 3.501087677361560E-02 , -- 18.295 , 9.728375745511450E-03 , -- 18.3 , -1.358945599970610E-02 , -- 18.305 , -3.431372431462720E-02 , -- 18.31 , -5.195992570184670E-02 , -- 18.315 , -6.621459033346280E-02 , -- 18.32 , -7.693590669330690E-02 , -- 18.325 , -8.413813135115721E-02 , -- 18.33 , -8.796246104481401E-02 , -- 18.335 , -8.865026558137970E-02 , -- 18.34 , -8.651948855745679E-02 , -- 18.345 , -8.194991749053140E-02 , -- 18.35 , -7.537263942731640E-02 , -- 18.355 , -6.726122085666700E-02 , -- 18.36 , -5.811712688388060E-02 , -- 18.365 , -4.844978592925620E-02 , -- 18.37 , -3.874961154322750E-02 , -- 18.375 , -2.946321539637920E-02 , -- 18.38 , -2.097389378477130E-02 , -- 18.385 , -1.359774681728760E-02 , -- 18.39 , -7.592927023032140E-03 , -- 18.395 , -3.182771456432360E-03 , -- 18.4 , -5.797783397815400E-04 , -- 18.405 , -3.403899532317900E-06 , -- 18.41 , -1.673453644507240E-03 , -- 18.415 , -5.782448384807060E-03 , -- 18.42 , -1.244176672900140E-02 , -- 18.425 , -2.161800758848600E-02 , -- 18.43 , -3.307323100644420E-02 , -- 18.435 , -4.633260284878780E-02 , -- 18.44 , -6.069252068692880E-02 , -- 18.445 , -7.527964829315580E-02 , -- 18.45 , -8.915230216299309E-02 , -- 18.455 , -0.10143296879817 , -- 18.46 , -0.11144311748952 , -- 18.465 , -0.11881688272356 , -- 18.47 , -0.12356683521081 , -- 18.475 , -0.12609239258508 , -- 18.48 , -0.12712667509216 , -- 18.485 , -0.12763705192334 , -- 18.49 , -0.12869455777906 , -- 18.495 , -0.13134291006952 , -- 18.5 , -0.13648385782305 , -- 18.505 , -0.14479654925278 , -- 18.51 , -0.15669435068272 , -- 18.515 , -0.17231899455012 , -- 18.52 , -0.19156053351027 , -- 18.525 , -0.2140948418449 , -- 18.53 , -0.23942532421762 , -- 18.535 , -0.26692808116807 , -- 18.54 , -0.29589366741626 , -- 18.545 , -0.32556987300455 , -- 18.55 , -0.35520167089443 , -- 18.555 , -0.38407157568151 , -- 18.56 , -0.41153207462536 , -- 18.565 , -0.43702839771631 , -- 18.57 , -0.46010162556848 , -- 18.575 , -0.4803753536196 , -- 18.58 , -0.49752469104796 , -- 18.585 , -0.51123932275576 , -- 18.59 , -0.52119100580172 , -- 18.595 , -0.52702031860061 , -- 18.6 , -0.52835074084744 , -- 18.605 , -0.52483178107225 , -- 18.61 , -0.51620504117931 , -- 18.615 , -0.50237569943468 , -- 18.62 , -0.4834730346886 , -- 18.625 , -0.45987873870396 , -- 18.63 , -0.43221396453591 , -- 18.635 , -0.40128199130244 , -- 18.64 , -0.36797809251035 , -- 18.645 , -0.33318247540211 , -- 18.65 , -0.2976655847206 , -- 18.655 , -0.26201863587465 , -- 18.66 , -0.22662902367112 , -- 18.665 , -0.19169728326541 , -- 18.67 , -0.15729264669158 , -- 18.675 , -0.1234229501959 , -- 18.68 , -9.010582719609091E-02 , -- 18.685 , -5.741817970014060E-02 , -- 18.69 , -2.552248385036910E-02 , -- 18.695 , 5.339196527069970E-03 , -- 18.7 , 3.486712311982680E-02 , -- 18.705 , 6.273660435450590E-02 , -- 18.71 , 8.862290998998250E-02 , -- 18.715 , 0.112218745947816 , -- 18.72 , 0.133237764611335 , -- 18.725 , 0.151417354399901 , -- 18.73 , 0.166520793732197 , -- 18.735 , 0.178358092928635 , -- 18.74 , 0.186819039757722 , -- 18.745 , 0.191918879888126 , -- 18.75 , 0.193841382081441 , -- 18.755 , 0.192966026117615 , -- 18.76 , 0.189861849245228 , -- 18.765 , 0.185243424802453 , -- 18.77 , 0.179886808055877 , -- 18.775 , 0.174523130427245 , -- 18.78 , 0.169727209876345 , -- 18.785 , 0.165828266795135 , -- 18.79 , 0.162860717438664 , -- 18.795 , 0.160568509105303 , -- 18.8 , 0.158460262202499 , -- 18.805 , 0.155903588032585 , -- 18.81 , 0.152236721793017 , -- 18.815 , 0.146874335438137 , -- 18.82 , 0.139388100075902 , -- 18.825 , 0.129551248829624 , -- 18.83 , 0.117346184292776 , -- 18.835 , 0.102944396398025 , -- 18.84 , 8.667203203856250E-02 , -- 18.845 , 6.897292950992250E-02 , -- 18.85 , 5.037981195577830E-02 , -- 18.855 , 3.149222301298260E-02 , -- 18.86 , 1.295788909713510E-02 , -- 18.865 , -4.552694712540460E-03 , -- 18.87 , -2.038471143298640E-02 , -- 18.875 , -3.395374370024890E-02 , -- 18.88 , -4.480974308295430E-02 , -- 18.885 , -5.269874412847760E-02 , -- 18.89 , -5.760475116618620E-02 , -- 18.895 , -5.975782869643340E-02 , -- 18.9 , -5.959990728708000E-02 , -- 18.905 , -5.771202182665640E-02 , -- 18.91 , -5.471620957553570E-02 , -- 18.915 , -5.117481281717030E-02 , -- 18.92 , -4.751155121434680E-02 , -- 18.925 , -4.397377050356170E-02 , -- 18.93 , -4.064613036051550E-02 , -- 18.935 , -3.750986634275660E-02 , -- 18.94 , -3.453164301123860E-02 , -- 18.945 , -3.175456679161500E-02 , -- 18.95 , -2.936540580184520E-02 , -- 18.955 , -2.771540773125420E-02 , -- 18.96 , -2.728673446781490E-02 , -- 18.965 , -2.860928038065850E-02 , -- 18.97 , -3.214733887015950E-02 , -- 18.975 , -3.818284412564310E-02 , -- 18.98 , -4.672302188795090E-02 , -- 18.985 , -5.745461744704080E-02 , -- 18.99 , -6.975424591801779E-02 , -- 18.995 , -8.275205425474760E-02 , -- 19.0 , -9.543348500501039E-02 , -- 19.005 , -0.10675671144965 , -- 19.01 , -0.11576388175306 , -- 19.015 , -0.12166743333762 , -- 19.02 , -0.12390264431233 , -- 19.025 , -0.12214656117846 , -- 19.03 , -0.11631154879176 , -- 19.035 , -0.10652423304446 , -- 19.04 , -9.310118520163460E-02 , -- 19.045 , -7.652590539072700E-02 , -- 19.05 , -5.743089586506230E-02 , -- 19.055 , -3.657596705689010E-02 , -- 19.06 , -1.481925977005460E-02 , -- 19.065 , 6.926924474783110E-03 , -- 19.07 , 2.775463368340260E-02 , -- 19.075 , 4.683156424739500E-02 , -- 19.08 , 6.347270763070770E-02 , -- 19.085 , 7.720227146370970E-02 , -- 19.09 , 8.779042470764520E-02 , -- 19.095 , 9.526029188212271E-02 , -- 19.1 , 9.986040447199600E-02 , -- 19.105 , 0.102009856725406 , -- 19.11 , 0.102225525300876 , -- 19.115 , 0.101047428528718 , -- 19.12 , 9.897427931868839E-02 , -- 19.125 , 9.642072648080460E-02 , -- 19.13 , 9.369918170530429E-02 , -- 19.135 , 9.102713402201090E-02 , -- 19.14 , 8.855073690832560E-02 , -- 19.145 , 8.637784747202421E-02 , -- 19.15 , 8.460889194052530E-02 , -- 19.155 , 8.335969452805890E-02 , -- 19.16 , 8.277035792073900E-02 , -- 19.165 , 8.300094888178290E-02 , -- 19.17 , 8.421449446395760E-02 , -- 19.175 , 8.655290215462839E-02 , -- 19.18 , 9.010941198122500E-02 , -- 19.185 , 9.490288969345520E-02 , -- 19.19 , 0.100856185025776 , -- 19.195 , 0.107783589409055 , -- 19.2 , 0.115386291208123 , -- 19.205 , 0.123260349877366 , -- 19.21 , 0.130913935378 , -- 19.215 , 0.137796521245135 , -- 19.22 , 0.143335849367096 , -- 19.225 , 0.14698030532155 , -- 19.23 , 0.148242029288944 , -- 19.235 , 0.146735661784648 , -- 19.24 , 0.142208324703231 , -- 19.245 , 0.134556865273917 , -- 19.25 , 0.123832305128576 , -- 19.255 , 0.110231039547548 , -- 19.26 , 9.407703422254150E-02 , -- 19.265 , 7.579763962651660E-02 , -- 19.27 , 5.589930332000480E-02 , -- 19.275 , 3.494345559651580E-02 , -- 19.28 , 1.352655612925890E-02 , -- 19.285 , -7.738281430620860E-03 , -- 19.29 , -2.823640126172170E-02 , -- 19.295 , -4.736851280459840E-02 , -- 19.3 , -6.456726778946650E-02 , -- 19.305 , -7.931522042729799E-02 , -- 19.31 , -9.116146754991310E-02 , -- 19.315 , -9.973543395603350E-02 , -- 19.32 , -0.10475595669325 , -- 19.325 , -0.10603430822357 , -- 19.33 , -0.10347284701214 , -- 19.335 , -9.706124752024230E-02 , -- 19.34 , -8.687430152469530E-02 , -- 19.345 , -7.307405512475940E-02 , -- 19.35 , -5.591887411984520E-02 , -- 19.355 , -3.577706479529710E-02 , -- 19.36 , -1.314335388833300E-02 , -- 19.365 , 1.134983613684490E-02 , -- 19.37 , 3.693079681400050E-02 , -- 19.375 , 6.270474265740390E-02 , -- 19.38 , 8.768905345507640E-02 , -- 19.385 , 0.1108686368144 , -- 19.39 , 0.1312644416171 , -- 19.395 , 0.148009041167522 , -- 19.4 , 0.160416739422417 , -- 19.405 , 0.168040427167663 , -- 19.41 , 0.170704607506662 , -- 19.415 , 0.168512624998284 , -- 19.42 , 0.161826470167071 , -- 19.425 , 0.151223327305197 , -- 19.43 , 0.137436526462059 , -- 19.435 , 0.12128787067038 , -- 19.44 , 0.103621500126964 , -- 19.445 , 8.524411667406280E-02 , -- 19.45 , 6.687930552254420E-02 , -- 19.455 , 4.913589731864990E-02 , -- 19.46 , 3.249281642772610E-02 , -- 19.465 , 1.729796363375550E-02 , -- 19.47 , 3.779772699936010E-03 , -- 19.475 , -7.933453913126739E-03 , -- 19.48 , -1.778837362450150E-02 , -- 19.485 , -2.578180319663970E-02 , -- 19.49 , -3.193743546434960E-02 , -- 19.495 , -3.628975661666560E-02 , -- 19.5 , -3.887558954382360E-02 , -- 19.505 , -3.973470241057670E-02 , -- 19.51 , -3.891788867951480E-02 , -- 19.515 , -3.649986139114820E-02 , -- 19.52 , -3.259249709820460E-02 , -- 19.525 , -2.735427053548850E-02 , -- 19.53 , -2.099133842643200E-02 , -- 19.535 , -1.374830536741160E-02 , -- 19.54 , -5.887877188928280E-03 , -- 19.545 , 2.336959611728440E-03 , -- 19.55 , 1.071436148192050E-02 , -- 19.555 , 1.910203440373310E-02 , -- 19.56 , 2.744608047788240E-02 , -- 19.565 , 3.578603089731680E-02 , -- 19.57 , 4.424249115467690E-02 , -- 19.575 , 5.298918396292150E-02 , -- 19.58 , 6.221237826554930E-02 , -- 19.585 , 7.206505940082400E-02 , -- 19.59 , 8.262287004060030E-02 , -- 19.595 , 9.385089818082880E-02 , -- 19.6 , 0.105586535210159 , -- 19.605 , 0.117542979202558 , -- 19.61 , 0.129332330456747 , -- 19.615 , 0.140505656304056 , -- 19.62 , 0.150602470682144 , -- 19.625 , 0.159201510072528 , -- 19.63 , 0.165963272203869 , -- 19.635 , 0.170657754779367 , -- 19.64 , 0.173171986392552 , -- 19.645 , 0.173497060176099 , -- 19.65 , 0.171698563869022 , -- 19.655 , 0.167877117650055 , -- 19.66 , 0.162128958008132 , -- 19.665 , 0.154515020640188 , -- 19.67 , 0.145047978425579 , -- 19.675 , 0.133699089240968 , -- 19.68 , 0.120425826006013 , -- 19.685 , 0.105211954035009 , -- 19.69 , 8.811482794436119E-02 , -- 19.695 , 6.930362885349300E-02 , -- 19.7 , 4.908317786948910E-02 , -- 19.705 , 2.789284466062680E-02 , -- 19.71 , 6.282684187232620E-03 , -- 19.715 , -1.513293891731910E-02 , -- 19.72 , -3.573219349475490E-02 , -- 19.725 , -5.494565996060560E-02 , -- 19.73 , -7.230331792209500E-02 , -- 19.735 , -8.746611435403620E-02 , -- 19.74 , -0.10023408196077 , -- 19.745 , -0.11053680897542 , -- 19.75 , -0.11840927699064 , -- 19.755 , -0.12396609115553 , -- 19.76 , -0.12737940482213 , -- 19.765 , -0.12886942680431 , -- 19.77 , -0.12870508549978 , -- 19.775 , -0.12721486235372 , -- 19.78 , -0.12479696224801 , -- 19.785 , -0.12192134851853 , -- 19.79 , -0.11911512331687 , -- 19.795 , -0.11692852296234 , -- 19.8 , -0.1158828122011 , -- 19.805 , -0.11640862718208 , -- 19.81 , -0.11878469144379 , -- 19.815 , -0.12309145404105 , -- 19.82 , -0.12918833366224 , -- 19.825 , -0.13672125838288 , -- 19.83 , -0.14515938284391 , -- 19.835 , -0.15385497532022 , -- 19.84 , -0.16211467849934 , -- 19.845 , -0.16927092799142 , -- 19.85 , -0.1747405815055 , -- 19.855 , -0.17806542050622 , -- 19.86 , -0.17893075004105 , -- 19.865 , -0.17716517197334 , -- 19.87 , -0.1727273398208 , -- 19.875 , -0.16568659834495 , -- 19.88 , -0.15620370102824 , -- 19.885 , -0.14451379659869 , -- 19.89 , -0.13091402606184 , -- 19.895 , -0.11575112780621 , -- 19.9 , -9.940839096806510E-02 , -- 19.905 , -8.228798219382000E-02 , -- 19.91 , -6.479104079602420E-02 , -- 19.915 , -4.729626907194930E-02 , -- 19.92 , -3.014389625728430E-02 , -- 19.925 , -1.362770379699480E-02 , -- 19.93 , 1.998432435284760E-03 , -- 19.935 , 1.650283145918720E-02 , -- 19.94 , 2.964895620060110E-02 , -- 19.945 , 4.116860136833410E-02 , -- 19.95 , 5.074351304162170E-02 , -- 19.955 , 5.800645031803000E-02 , -- 19.96 , 6.256532313956960E-02 , -- 19.965 , 6.405233292472851E-02 , -- 19.97 , 6.218959865152200E-02 , -- 19.975 , 5.686184515599930E-02 , -- 19.98 , 4.817972906533240E-02 , -- 19.985 , 3.651967859402010E-02 , -- 19.99 , 2.252985493696160E-02 , -- 19.995 , 7.097071756102240E-03 , -- 20.0 , -8.721812839652310E-03 , -- 20.005 , -2.379447424676810E-02 , -- 20.01 , -3.701839037090120E-02 , -- 20.015 , -4.742092878891140E-02 , -- 20.02 , -5.423951270215350E-02 , -- 20.025 , -5.697258922350620E-02 , -- 20.03 , -5.539776158916270E-02 , -- 20.035 , -4.956057087520670E-02 , -- 20.04 , -3.974179526714170E-02 , -- 20.045 , -2.641288342533750E-02 , -- 20.05 , -1.019081782994870E-02 , -- 20.055 , 8.202447545571230E-03 , -- 20.06 , 2.797116679219240E-02 , -- 20.065 , 4.827036868959560E-02 , -- 20.07 , 6.822566739672180E-02 , -- 20.075 , 8.695562572496580E-02 , -- 20.08 , 0.103598292547575 , -- 20.085 , 0.117345557097572 , -- 20.09 , 0.127481089438341 , -- 20.095 , 0.133420394415517 , -- 20.1 , 0.134744188882336 , -- 20.105 , 0.131221676654994 , -- 20.11 , 0.122818973076751 , -- 20.115 , 0.109691680974573 , -- 20.12 , 9.216522604322611E-02 , -- 20.125 , 7.070600814518090E-02 , -- 20.13 , 4.589147778332150E-02 , -- 20.135 , 1.838180387523030E-02 , -- 20.14 , -1.110108370552780E-02 , -- 20.145 , -4.178877084026370E-02 , -- 20.15 , -7.287571484484311E-02 , -- 20.155 , -0.10352963470195 , -- 20.16 , -0.13290387884342 , -- 20.165 , -0.16015839093613 , -- 20.17 , -0.18448715088686 , -- 20.175 , -0.20515328670567 , -- 20.18 , -0.22152568111903 , -- 20.185 , -0.23311328473587 , -- 20.19 , -0.23959100455607 , -- 20.195 , -0.24081433909493 , -- 20.2 , -0.23682050088862 , -- 20.205 , -0.22781739014645 , -- 20.21 , -0.21416412518464 , -- 20.215 , -0.19634582016096 , -- 20.22 , -0.17494767238438 , -- 20.225 , -0.15062916150452 , -- 20.23 , -0.12410162176008 , -- 20.235 , -9.610482601536199E-02 , -- 20.24 , -6.738446390246500E-02 , -- 20.245 , -3.866506506796110E-02 , -- 20.25 , -1.062408132283030E-02 , -- 20.255 , 1.613821656425260E-02 , -- 20.26 , 4.112363448240460E-02 , -- 20.265 , 6.395563455415000E-02 , -- 20.27 , 8.438638743734070E-02 , -- 20.275 , 0.10229225024046 , -- 20.28 , 0.11765525248804 , -- 20.285 , 0.13053719119583 , -- 20.29 , 0.141047644803831 , -- 20.295 , 0.14931741898274 , -- 20.3 , 0.155478926240496 , -- 20.305 , 0.159660339201315 , -- 20.31 , 0.161990227205732 , -- 20.315 , 0.162612590283051 , -- 20.32 , 0.161703234926074 , -- 20.325 , 0.159483350064339 , -- 20.33 , 0.156221155279841 , -- 20.335 , 0.152221918187124 , -- 20.34 , 0.147804677752111 , -- 20.345 , 0.143271172359312 , -- 20.35 , 0.138873332096741 , -- 20.355 , 0.134787926819641 , -- 20.36 , 0.131103697853831 , -- 20.365 , 0.127825557460833 , -- 20.37 , 0.12489405648423 , -- 20.375 , 0.122216684366155 , -- 20.38 , 0.119703338338164 , -- 20.385 , 0.117298332826065 , -- 20.39 , 0.115002111347558 , -- 20.395 , 0.1128792665639 , -- 20.4 , 0.111051600017025 , -- 20.405 , 0.109680624221402 , -- 20.41 , 0.108942958893076 , -- 20.415 , 0.109006468464252 , -- 20.42 , 0.110010955231372 , -- 20.425 , 0.112056904842183 , -- 20.43 , 0.115202427994996 , -- 20.435 , 0.119466647868312 , -- 20.44 , 0.124835559019734 , -- 20.445 , 0.131267773242386 , -- 20.45 , 0.138696105432056 , -- 20.455 , 0.14702533406325 , -- 20.46 , 0.156125727838975 , -- 20.465 , 0.165825042690333 , -- 20.47 , 0.0 , -- ), -- INTERPOL='LIN', -- PROL_DROITE='CONSTANT', -- PROL_GAUCHE='EXCLU',); -- -- --ACCELV1=DEFI_FONCTION(NOM_PARA='INST', -- VALE= --( -- 0.0 , 0.0 , -- 1.000000000000000E-02 , 1.310000000000000E-03 , -- 2.000000000000000E-02 , 7.200000000000000E-04 , -- 3.000000000000000E-02 , -1.160000000000000E-03 , -- 4.000000000000000E-02 , -4.010000000000000E-03 , -- 5.000000000000000E-02 , -8.580000000000001E-03 , -- 6.000000000000000E-02 , -1.459000000000000E-02 , -- 7.000000000000001E-02 , -1.920000000000000E-02 , -- 8.000000000000000E-02 , -1.947000000000000E-02 , -- 9.000000000000000E-02 , -1.781000000000000E-02 , -- 0.1 , -1.970000000000000E-02 , -- 0.11 , -2.520000000000000E-02 , -- 0.12 , -3.281000000000000E-02 , -- 0.13 , -4.377000000000000E-02 , -- 0.14 , -5.504000000000000E-02 , -- 0.15 , -5.797000000000000E-02 , -- 0.16 , -4.627000000000000E-02 , -- 0.17 , -2.536000000000000E-02 , -- 0.18 , -6.700000000000000E-03 , -- 0.19 , 7.849999999999999E-03 , -- 0.2 , 2.168000000000000E-02 , -- 0.21 , 3.643000000000000E-02 , -- 0.22 , 5.686000000000000E-02 , -- 0.23 , 8.019999999999999E-02 , -- 0.24 , 8.942000000000000E-02 , -- 0.25 , 7.790000000000000E-02 , -- 0.26 , 6.301000000000000E-02 , -- 0.27 , 5.860000000000000E-02 , -- 0.28 , 5.444000000000000E-02 , -- 0.29 , 3.314000000000000E-02 , -- 0.3 , -4.730000000000000E-03 , -- 0.31 , -3.492000000000000E-02 , -- 0.32 , -3.413000000000000E-02 , -- 0.33 , -7.530000000000000E-03 , -- 0.34 , 1.991000000000000E-02 , -- 0.35 , 2.983000000000000E-02 , -- 0.36 , 2.482000000000000E-02 , -- 0.37 , 1.676000000000000E-02 , -- 0.38 , 4.890000000000000E-03 , -- 0.39 , -1.521000000000000E-02 , -- 0.4 , -3.575000000000000E-02 , -- 0.41 , -5.053000000000000E-02 , -- 0.42 , -6.325000000000000E-02 , -- 0.43 , -7.273000000000000E-02 , -- 0.44 , -7.520000000000000E-02 , -- 0.45 , -8.463000000000000E-02 , -- 0.46 , -0.11597 , -- 0.47 , -0.1564 , -- 0.48 , -0.18027 , -- 0.49 , -0.17201 , -- 0.5 , -0.13845 , -- 0.51 , -0.1016 , -- 0.52 , -6.390999999999999E-02 , -- 0.53 , -1.035000000000000E-02 , -- 0.54 , 5.961000000000000E-02 , -- 0.55 , 0.12972 , -- 0.56 , 0.18788 , -- 0.57 , 0.23015 , -- 0.58 , 0.23082 , -- 0.59 , 0.1643 , -- 0.6 , 6.750000000000000E-02 , -- 0.61 , 7.450000000000000E-03 , -- 0.62 , 1.664000000000000E-02 , -- 0.63 , 8.058000000000000E-02 , -- 0.64 , 0.15546 , -- 0.65 , 0.2133 , -- 0.66 , 0.24265 , -- 0.67 , 0.21922 , -- 0.68 , 0.1295 , -- 0.69 , 1.220000000000000E-03 , -- 0.7 , -0.12397 , -- 0.71 , -0.1882 , -- 0.72 , -0.17059 , -- 0.73 , -0.11119 , -- 0.74 , -9.375000000000000E-02 , -- 0.75 , -0.15419 , -- 0.76 , -0.21371 , -- 0.77 , -0.19269 , -- 0.78 , -0.12556 , -- 0.79 , -8.054000000000000E-02 , -- 0.8 , -5.658000000000000E-02 , -- 0.81 , -2.563000000000000E-02 , -- 0.82 , -1.082000000000000E-02 , -- 0.83 , -6.067000000000000E-02 , -- 0.84 , -0.16876 , -- 0.85 , -0.26933 , -- 0.86 , -0.31693 , -- 0.87 , -0.3189 , -- 0.88 , -0.31999 , -- 0.89 , -0.32387 , -- 0.9 , -0.35623 , -- 0.91 , -0.38483 , -- 0.92 , -0.36307 , -- 0.93 , -0.29278 , -- 0.94 , -0.18821 , -- 0.95 , -6.119000000000000E-02 , -- 0.96 , 3.932000000000000E-02 , -- 0.97 , 7.092000000000000E-02 , -- 0.98 , 3.394000000000000E-02 , -- 0.99 , 1.056000000000000E-02 , -- 1.0 , 3.006000000000000E-02 , -- 1.01 , 4.384000000000000E-02 , -- 1.02 , 1.582000000000000E-02 , -- 1.03 , -2.452000000000000E-02 , -- 1.04 , -3.991000000000000E-02 , -- 1.05 , -4.053000000000000E-02 , -- 1.06 , -4.416000000000000E-02 , -- 1.07 , -6.185000000000000E-02 , -- 1.08 , -0.10165 , -- 1.09 , -0.13542 , -- 1.1 , -0.142 , -- 1.11 , -0.13819 , -- 1.12 , -0.13187 , -- 1.13 , -0.11765 , -- 1.14 , -8.853000000000000E-02 , -- 1.15 , -4.957000000000000E-02 , -- 1.16 , -2.751000000000000E-02 , -- 1.17 , -4.837000000000000E-02 , -- 1.18 , -0.11303 , -- 1.19 , -0.16115 , -- 1.2 , -0.1365 , -- 1.21 , -9.369000000000000E-02 , -- 1.22 , -0.10681 , -- 1.23 , -0.16911 , -- 1.24 , -0.23593 , -- 1.25 , -0.27067 , -- 1.26 , -0.27471 , -- 1.27 , -0.25731 , -- 1.28 , -0.19103 , -- 1.29 , -7.716000000000001E-02 , -- 1.3 , 1.100000000000000E-03 , -- 1.31 , -4.582000000000000E-02 , -- 1.32 , -0.19352 , -- 1.33 , -0.32144 , -- 1.34 , -0.37399 , -- 1.35 , -0.40308 , -- 1.36 , -0.45452 , -- 1.37 , -0.51071 , -- 1.38 , -0.52231 , -- 1.39 , -0.45018 , -- 1.4 , -0.30537 , -- 1.41 , -0.15517 , -- 1.42 , -7.362000000000000E-02 , -- 1.43 , -9.615000000000000E-02 , -- 1.44 , -0.17148 , -- 1.45 , -0.17476 , -- 1.46 , -8.399000000000000E-02 , -- 1.47 , -2.696000000000000E-02 , -- 1.48 , -6.808000000000000E-02 , -- 1.49 , -0.12817 , -- 1.5 , -0.12265 , -- 1.51 , -6.149000000000000E-02 , -- 1.52 , -8.380000000000000E-03 , -- 1.53 , 1.139000000000000E-02 , -- 1.54 , 5.830000000000000E-03 , -- 1.55 , -2.002000000000000E-02 , -- 1.56 , -3.584000000000000E-02 , -- 1.57 , -1.060000000000000E-03 , -- 1.58 , 6.028000000000000E-02 , -- 1.59 , 8.509000000000000E-02 , -- 1.6 , 9.515000000000000E-02 , -- 1.61 , 0.14372 , -- 1.62 , 0.17863 , -- 1.63 , 0.16098 , -- 1.64 , 0.15227 , -- 1.65 , 0.16265 , -- 1.66 , 0.1009 , -- 1.67 , -8.347000000000000E-02 , -- 1.68 , -0.28571 , -- 1.69 , -0.3845 , -- 1.7 , -0.42649 , -- 1.71 , -0.48045 , -- 1.72 , -0.48546 , -- 1.73 , -0.34744 , -- 1.74 , -4.460000000000000E-02 , -- 1.75 , 0.31704 , -- 1.76 , 0.56244 , -- 1.77 , 0.61288 , -- 1.78 , 0.56235 , -- 1.79 , 0.56046 , -- 1.8 , 0.58601 , -- 1.81 , 0.50428 , -- 1.82 , 0.34783 , -- 1.83 , 0.2707 , -- 1.84 , 0.32579 , -- 1.85 , 0.43838 , -- 1.86 , 0.49734 , -- 1.87 , 0.46993 , -- 1.88 , 0.42104 , -- 1.89 , 0.39656 , -- 1.9 , 0.37011 , -- 1.91 , 0.3211 , -- 1.92 , 0.27122 , -- 1.93 , 0.2175 , -- 1.94 , 0.1251 , -- 1.95 , 3.090000000000000E-03 , -- 1.96 , -9.401000000000000E-02 , -- 1.97 , -0.13751 , -- 1.98 , -0.12623 , -- 1.99 , -3.147000000000000E-02 , -- 2.0 , 0.15999 , -- 2.01 , 0.39077 , -- 2.02 , 0.57348 , -- 2.03 , 0.61086 , -- 2.04 , 0.4807 , -- 2.05 , 0.29864 , -- 2.06 , 0.18108 , -- 2.07 , 0.167 , -- 2.08 , 0.23579 , -- 2.09 , 0.28543 , -- 2.1 , 0.21887 , -- 2.11 , 6.136000000000000E-02 , -- 2.12 , -8.754000000000001E-02 , -- 2.13 , -0.18795 , -- 2.14 , -0.28217 , -- 2.15 , -0.39328 , -- 2.16 , -0.47351 , -- 2.17 , -0.45659 , -- 2.18 , -0.38611 , -- 2.19 , -0.40359 , -- 2.2 , -0.49671 , -- 2.21 , -0.47831 , -- 2.22 , -0.24834 , -- 2.23 , 9.692000000000001E-02 , -- 2.24 , 0.36832 , -- 2.25 , 0.49779 , -- 2.26 , 0.55588 , -- 2.27 , 0.55074 , -- 2.28 , 0.47652 , -- 2.29 , 0.42596 , -- 2.3 , 0.45439 , -- 2.31 , 0.4758 , -- 2.32 , 0.36011 , -- 2.33 , 9.916999999999999E-02 , -- 2.34 , -0.22081 , -- 2.35 , -0.53559 , -- 2.36 , -0.73055 , -- 2.37 , -0.68219 , -- 2.38 , -0.46512 , -- 2.39 , -0.29795 , -- 2.4 , -0.29155 , -- 2.41 , -0.37205 , -- 2.42 , -0.45321 , -- 2.43 , -0.52678 , -- 2.44 , -0.53549 , -- 2.45 , -0.39903 , -- 2.46 , -0.17073 , -- 2.47 , 4.007000000000000E-02 , -- 2.48 , 0.19098 , -- 2.49 , 0.23016 , -- 2.5 , 0.11487 , -- 2.51 , -3.277000000000000E-02 , -- 2.52 , -2.678000000000000E-02 , -- 2.53 , 0.14456 , -- 2.54 , 0.33564 , -- 2.55 , 0.43459 , -- 2.56 , 0.47636 , -- 2.57 , 0.56106 , -- 2.58 , 0.69871 , -- 2.59 , 0.78021 , -- 2.6 , 0.69033 , -- 2.61 , 0.48738 , -- 2.62 , 0.37542 , -- 2.63 , 0.44792 , -- 2.64 , 0.63115 , -- 2.65 , 0.80303 , -- 2.66 , 0.86913 , -- 2.67 , 0.81861 , -- 2.68 , 0.67639 , -- 2.69 , 0.44981 , -- 2.7 , 0.19577 , -- 2.71 , 1.762000000000000E-02 , -- 2.72 , -7.475000000000000E-02 , -- 2.73 , -0.18543 , -- 2.74 , -0.31712 , -- 2.75 , -0.30763 , -- 2.76 , -5.022000000000000E-02 , -- 2.77 , 0.36264 , -- 2.78 , 0.71418 , -- 2.79 , 0.86474 , -- 2.8 , 0.91391 , -- 2.81 , 0.97578 , -- 2.82 , 0.99997 , -- 2.83 , 0.90663 , -- 2.84 , 0.71448 , -- 2.85 , 0.55982 , -- 2.86 , 0.55183 , -- 2.87 , 0.63744 , -- 2.88 , 0.70292 , -- 2.89 , 0.68299 , -- 2.9 , 0.58616 , -- 2.91 , 0.47484 , -- 2.92 , 0.38822 , -- 2.93 , 0.3229 , -- 2.94 , 0.25296 , -- 2.95 , 0.16705 , -- 2.96 , 0.10044 , -- 2.97 , 7.353000000000000E-02 , -- 2.98 , 4.790000000000000E-02 , -- 2.99 , -3.974000000000000E-02 , -- 3.0 , -0.21989 , -- 3.01 , -0.43388 , -- 3.02 , -0.59094 , -- 3.03 , -0.68752 , -- 3.04 , -0.77344 , -- 3.05 , -0.84165 , -- 3.06 , -0.87592 , -- 3.07 , -0.92165 , -- 3.08 , -0.98681 , -- 3.09 , -0.9813 , -- 3.1 , -0.85134 , -- 3.11 , -0.71226 , -- 3.12 , -0.70318 , -- 3.13 , -0.73062 , -- 3.14 , -0.63434 , -- 3.15 , -0.49621 , -- 3.16 , -0.46434 , -- 3.17 , -0.4895 , -- 3.18 , -0.43989 , -- 3.19 , -0.297 , -- 3.2 , -0.12264 , -- 3.21 , 5.685000000000000E-02 , -- 3.22 , 0.20721 , -- 3.23 , 0.29127 , -- 3.24 , 0.37167 , -- 3.25 , 0.47314 , -- 3.26 , 0.48428 , -- 3.27 , 0.34199 , -- 3.28 , 0.14378 , -- 3.29 , 2.014000000000000E-02 , -- 3.3 , -3.310000000000000E-03 , -- 3.31 , 3.046000000000000E-02 , -- 3.32 , 7.851000000000000E-02 , -- 3.33 , 0.1222 , -- 3.34 , 0.19291 , -- 3.35 , 0.2916 , -- 3.36 , 0.38011 , -- 3.37 , 0.46514 , -- 3.38 , 0.52328 , -- 3.39 , 0.51669 , -- 3.4 , 0.4727 , -- 3.41 , 0.38682 , -- 3.42 , 0.22939 , -- 3.43 , 1.800000000000000E-02 , -- 3.44 , -0.199 , -- 3.45 , -0.40018 , -- 3.46 , -0.5733 , -- 3.47 , -0.72332 , -- 3.48 , -0.82419 , -- 3.49 , -0.83348 , -- 3.5 , -0.74258 , -- 3.51 , -0.61694 , -- 3.52 , -0.56099 , -- 3.53 , -0.61112 , -- 3.54 , -0.71023 , -- 3.55 , -0.78959 , -- 3.56 , -0.85129 , -- 3.57 , -0.93566 , -- 3.58 , -0.99997 , -- 3.59 , -0.92052 , -- 3.6 , -0.6664 , -- 3.61 , -0.3873 , -- 3.62 , -0.25033 , -- 3.63 , -0.24161 , -- 3.64 , -0.18701 , -- 3.65 , 9.379999999999999E-03 , -- 3.66 , 0.11381 , -- 3.67 , 0.16743 , -- 3.68 , 0.16297 , -- 3.69 , 0.1216 , -- 3.7 , 5.279000000000000E-02 , -- 3.71 , -9.607000000000000E-02 , -- 3.72 , -0.30972 , -- 3.73 , -0.35938 , -- 3.74 , -0.19296 , -- 3.75 , 6.919000000000000E-02 , -- 3.76 , 0.27173 , -- 3.77 , 0.34172 , -- 3.78 , 0.31251 , -- 3.79 , 0.24099 , -- 3.8 , 0.15009 , -- 3.81 , 0.10136 , -- 3.82 , 0.18046 , -- 3.83 , 0.36244 , -- 3.84 , 0.47034 , -- 3.85 , 0.36939 , -- 3.86 , 0.15689 , -- 3.87 , 1.108000000000000E-02 , -- 3.88 , 3.990000000000000E-03 , -- 3.89 , 0.11976 , -- 3.9 , 0.24956 , -- 3.91 , 0.21477 , -- 3.92 , -3.172000000000000E-02 , -- 3.93 , -0.24232 , -- 3.94 , -0.1514 , -- 3.95 , 0.12645 , -- 3.96 , 0.3411 , -- 3.97 , 0.48457 , -- 3.98 , 0.61705 , -- 3.99 , 0.70283 , -- 4.0 , 0.70328 , -- 4.01 , 0.62998 , -- 4.02 , 0.53518 , -- 4.03 , 0.44668 , -- 4.04 , 0.36172 , -- 4.05 , 0.31406 , -- 4.06 , 0.32888 , -- 4.07 , 0.35459 , -- 4.08 , 0.32512 , -- 4.09 , 0.25195 , -- 4.1 , 0.20405 , -- 4.11 , 0.22648 , -- 4.12 , 0.30571 , -- 4.13 , 0.37309 , -- 4.14 , 0.35283 , -- 4.15 , 0.24118 , -- 4.16 , 0.11162 , -- 4.17 , 1.458000000000000E-02 , -- 4.18 , -7.364000000000000E-02 , -- 4.19 , -0.1521 , -- 4.2 , -0.14128 , -- 4.21 , 2.440000000000000E-02 , -- 4.22 , 0.2852 , -- 4.23 , 0.45129 , -- 4.24 , 0.38982 , -- 4.25 , 0.15588 , -- 4.26 , -0.11495 , -- 4.27 , -0.31375 , -- 4.28 , -0.42086 , -- 4.29 , -0.48904 , -- 4.3 , -0.52097 , -- 4.31 , -0.49168 , -- 4.32 , -0.4234 , -- 4.33 , -0.36559 , -- 4.34 , -0.36994 , -- 4.35 , -0.42675 , -- 4.36 , -0.45696 , -- 4.37 , -0.39583 , -- 4.38 , -0.24523 , -- 4.39 , -7.371999999999999E-02 , -- 4.4 , 5.577000000000000E-02 , -- 4.41 , 0.13029 , -- 4.42 , 0.17 , -- 4.43 , 0.21223 , -- 4.44 , 0.25214 , -- 4.45 , 0.25221 , -- 4.46 , 0.20971 , -- 4.47 , 0.15915 , -- 4.48 , 0.13965 , -- 4.49 , 0.1015 , -- 4.5 , -5.693000000000000E-02 , -- 4.51 , -0.30165 , -- 4.52 , -0.49413 , -- 4.53 , -0.5601 , -- 4.54 , -0.5473 , -- 4.55 , -0.52318 , -- 4.56 , -0.43186 , -- 4.57 , -0.21177 , -- 4.58 , 5.701000000000000E-02 , -- 4.59 , 0.26717 , -- 4.6 , 0.3673 , -- 4.61 , 0.3813 , -- 4.62 , 0.40079 , -- 4.63 , 0.39365 , -- 4.64 , 0.18973 , -- 4.65 , -0.17373 , -- 4.66 , -0.40285 , -- 4.67 , -0.36957 , -- 4.68 , -0.23873 , -- 4.69 , -0.13623 , -- 4.7 , -1.420000000000000E-02 , -- 4.71 , 0.15954 , -- 4.72 , 0.31583 , -- 4.73 , 0.4076 , -- 4.74 , 0.44925 , -- 4.75 , 0.43323 , -- 4.76 , 0.36783 , -- 4.77 , 0.32597 , -- 4.78 , 0.34835 , -- 4.79 , 0.36693 , -- 4.8 , 0.28138 , -- 4.81 , 0.11386 , -- 4.82 , -4.390000000000000E-02 , -- 4.83 , -0.20925 , -- 4.84 , -0.42702 , -- 4.85 , -0.62277 , -- 4.86 , -0.72429 , -- 4.87 , -0.7462 , -- 4.88 , -0.75887 , -- 4.89 , -0.77194 , -- 4.9 , -0.72951 , -- 4.91 , -0.66245 , -- 4.92 , -0.67709 , -- 4.93 , -0.80669 , -- 4.94 , -0.95972 , -- 4.95 , -0.99997 , -- 4.96 , -0.88454 , -- 4.97 , -0.69049 , -- 4.98 , -0.52094 , -- 4.99 , -0.3957 , -- 5.0 , -0.24286 , -- 5.01 , -3.739000000000000E-02 , -- 5.02 , 0.10577 , -- 5.03 , 0.17347 , -- 5.04 , 0.16886 , -- 5.05 , 0.14491 , -- 5.06 , 0.14907 , -- 5.07 , 0.17361 , -- 5.08 , 0.20083 , -- 5.09 , 0.21954 , -- 5.1 , 0.2328 , -- 5.11 , 0.2575 , -- 5.12 , 0.28932 , -- 5.13 , 0.31126 , -- 5.14 , 0.29244 , -- 5.15 , 0.19772 , -- 5.16 , 5.796000000000000E-02 , -- 5.17 , -6.429000000000000E-02 , -- 5.18 , -5.218000000000000E-02 , -- 5.19 , 9.539000000000000E-02 , -- 5.2 , 0.20966 , -- 5.21 , 0.15862 , -- 5.22 , 1.473000000000000E-02 , -- 5.23 , -3.926000000000000E-02 , -- 5.24 , 8.541000000000000E-02 , -- 5.25 , 0.31423 , -- 5.26 , 0.44181 , -- 5.27 , 0.30949 , -- 5.28 , -4.230000000000000E-03 , -- 5.29 , -0.32893 , -- 5.3 , -0.59096 , -- 5.31 , -0.72514 , -- 5.32 , -0.65562 , -- 5.33 , -0.42079 , -- 5.34 , -0.1588 , -- 5.35 , 2.904000000000000E-02 , -- 5.36 , 0.10308 , -- 5.37 , 4.177000000000000E-02 , -- 5.38 , -6.319000000000000E-02 , -- 5.39 , -4.705000000000000E-02 , -- 5.4 , 9.604000000000000E-02 , -- 5.41 , 0.24518 , -- 5.42 , 0.30632 , -- 5.43 , 0.23914 , -- 5.44 , 9.232000000000000E-02 , -- 5.45 , -1.776000000000000E-02 , -- 5.46 , -7.690000000000000E-03 , -- 5.47 , 7.241000000000000E-02 , -- 5.48 , 9.512000000000000E-02 , -- 5.49 , 8.989000000000000E-02 , -- 5.5 , 0.19384 , -- 5.51 , 0.35667 , -- 5.52 , 0.38627 , -- 5.53 , 0.27202 , -- 5.54 , 0.22809 , -- 5.55 , 0.35372 , -- 5.56 , 0.49889 , -- 5.57 , 0.54618 , -- 5.58 , 0.55561 , -- 5.59 , 0.6075 , -- 5.6 , 0.65833 , -- 5.61 , 0.62315 , -- 5.62 , 0.54314 , -- 5.63 , 0.5024 , -- 5.64 , 0.49951 , -- 5.65 , 0.50238 , -- 5.66 , 0.459 , -- 5.67 , 0.32065 , -- 5.68 , 0.12297 , -- 5.69 , -4.304000000000000E-02 , -- 5.7 , -0.12348 , -- 5.71 , -0.16939 , -- 5.72 , -0.26337 , -- 5.73 , -0.37116 , -- 5.74 , -0.40828 , -- 5.75 , -0.39748 , -- 5.76 , -0.42458 , -- 5.77 , -0.49729 , -- 5.78 , -0.51741 , -- 5.79 , -0.39554 , -- 5.8 , -0.19178 , -- 5.81 , -6.471000000000000E-02 , -- 5.82 , -6.743000000000000E-02 , -- 5.83 , -0.1271 , -- 5.84 , -0.1634 , -- 5.85 , -0.13345 , -- 5.86 , -6.090000000000000E-02 , -- 5.87 , 2.519000000000000E-02 , -- 5.88 , 0.14903 , -- 5.89 , 0.28064 , -- 5.9 , 0.34038 , -- 5.91 , 0.3104 , -- 5.92 , 0.22998 , -- 5.93 , 0.15353 , -- 5.94 , 0.1055 , -- 5.95 , 7.457000000000000E-02 , -- 5.96 , 5.763000000000000E-02 , -- 5.97 , 8.033999999999999E-02 , -- 5.98 , 0.14644 , -- 5.99 , 0.1332 , -- 6.0 , -7.482000000000000E-02 , -- 6.01 , -0.36556 , -- 6.02 , -0.55895 , -- 6.03 , -0.59056 , -- 6.04 , -0.46664 , -- 6.05 , -0.26194 , -- 6.06 , -7.546000000000000E-02 , -- 6.07 , 7.784000000000001E-02 , -- 6.08 , 0.23755 , -- 6.09 , 0.36836 , -- 6.1 , 0.37298 , -- 6.11 , 0.26509 , -- 6.12 , 0.15102 , -- 6.13 , 6.525000000000000E-02 , -- 6.14 , -1.695000000000000E-02 , -- 6.15 , -0.10207 , -- 6.16 , -0.1821 , -- 6.17 , -0.26644 , -- 6.18 , -0.32842 , -- 6.19 , -0.24869 , -- 6.2 , 2.279000000000000E-02 , -- 6.21 , 0.37255 , -- 6.22 , 0.6758 , -- 6.23 , 0.86221 , -- 6.24 , 0.91467 , -- 6.25 , 0.89167 , -- 6.26 , 0.84631 , -- 6.27 , 0.74074 , -- 6.28 , 0.49841 , -- 6.29 , 0.16761 , -- 6.3 , -4.544000000000000E-02 , -- 6.31 , -2.644000000000000E-02 , -- 6.32 , 9.400000000000000E-02 , -- 6.33 , 0.16063 , -- 6.34 , 0.18176 , -- 6.35 , 0.20612 , -- 6.36 , 0.22068 , -- 6.37 , 0.22211 , -- 6.38 , 0.23664 , -- 6.39 , 0.24671 , -- 6.4 , 0.1861 , -- 6.41 , 0.10676 , -- 6.42 , 0.2039 , -- 6.43 , 0.4894 , -- 6.44 , 0.7178 , -- 6.45 , 0.73624 , -- 6.46 , 0.64197 , -- 6.47 , 0.61236 , -- 6.48 , 0.66281 , -- 6.49 , 0.6407 , -- 6.5 , 0.48402 , -- 6.51 , 0.28743 , -- 6.52 , 0.1436 , -- 6.53 , 6.140000000000000E-02 , -- 6.54 , -1.770000000000000E-03 , -- 6.55 , -6.498000000000000E-02 , -- 6.56 , -0.12251 , -- 6.57 , -0.16577 , -- 6.58 , -0.20217 , -- 6.59 , -0.28219 , -- 6.6 , -0.37605 , -- 6.61 , -0.34257 , -- 6.62 , -0.12814 , -- 6.63 , 0.1706 , -- 6.64 , 0.38468 , -- 6.65 , 0.39384 , -- 6.66 , 0.26746 , -- 6.67 , 0.18207 , -- 6.68 , 0.19512 , -- 6.69 , 0.22133 , -- 6.7 , 0.209 , -- 6.71 , 0.17146 , -- 6.72 , 6.763000000000000E-02 , -- 6.73 , -0.13527 , -- 6.74 , -0.37496 , -- 6.75 , -0.55764 , -- 6.76 , -0.58824 , -- 6.77 , -0.44844 , -- 6.78 , -0.27116 , -- 6.79 , -0.19551 , -- 6.8 , -0.18978 , -- 6.81 , -9.911000000000000E-02 , -- 6.82 , 0.11626 , -- 6.83 , 0.30541 , -- 6.84 , 0.3521 , -- 6.85 , 0.27698 , -- 6.86 , 0.10781 , -- 6.87 , -0.13553 , -- 6.88 , -0.3724 , -- 6.89 , -0.51163 , -- 6.9 , -0.49535 , -- 6.91 , -0.29991 , -- 6.92 , -1.034000000000000E-02 , -- 6.93 , 0.19111 , -- 6.94 , 0.1843 , -- 6.95 , 6.730000000000000E-03 , -- 6.96 , -0.21507 , -- 6.97 , -0.41983 , -- 6.98 , -0.58894 , -- 6.99 , -0.63614 , -- 7.0 , -0.54698 , -- 7.01 , -0.44682 , -- 7.02 , -0.42416 , -- 7.03 , -0.46132 , -- 7.04 , -0.48084 , -- 7.05 , -0.43504 , -- 7.06 , -0.34615 , -- 7.07 , -0.23496 , -- 7.08 , -0.13072 , -- 7.09 , -5.857000000000000E-02 , -- 7.1 , 1.753000000000000E-02 , -- 7.11 , 0.10141 , -- 7.12 , 0.12684 , -- 7.13 , 9.014000000000000E-02 , -- 7.14 , 0.11682 , -- 7.15 , 0.28896 , -- 7.16 , 0.48134 , -- 7.17 , 0.54721 , -- 7.18 , 0.49147 , -- 7.19 , 0.35746 , -- 7.2 , 0.17093 , -- 7.21 , -6.870000000000000E-03 , -- 7.22 , -7.575999999999999E-02 , -- 7.23 , -4.320000000000000E-03 , -- 7.24 , 6.714000000000001E-02 , -- 7.25 , 2.620000000000000E-03 , -- 7.26 , -0.12071 , -- 7.27 , -0.16453 , -- 7.28 , -0.1671 , -- 7.29 , -0.24591 , -- 7.3 , -0.36246 , -- 7.31 , -0.39855 , -- 7.32 , -0.33851 , -- 7.33 , -0.22608 , -- 7.34 , -0.1129 , -- 7.35 , -3.976000000000000E-02 , -- 7.36 , 5.950000000000000E-03 , -- 7.37 , 4.231000000000000E-02 , -- 7.38 , 9.320000000000001E-02 , -- 7.39 , 0.21161 , -- 7.4 , 0.37502 , -- 7.41 , 0.46085 , -- 7.42 , 0.42852 , -- 7.43 , 0.39911 , -- 7.44 , 0.48134 , -- 7.45 , 0.61862 , -- 7.46 , 0.65845 , -- 7.47 , 0.52488 , -- 7.48 , 0.27775 , -- 7.49 , 2.611000000000000E-02 , -- 7.5 , -0.16858 , -- 7.51 , -0.35917 , -- 7.52 , -0.64888 , -- 7.53 , -0.93894 , -- 7.54 , -0.99997 , -- 7.55 , -0.79545 , -- 7.56 , -0.50022 , -- 7.57 , -0.31055 , -- 7.58 , -0.28451 , -- 7.59 , -0.32788 , -- 7.6 , -0.34293 , -- 7.61 , -0.30914 , -- 7.62 , -0.29364 , -- 7.63 , -0.36128 , -- 7.64 , -0.43128 , -- 7.65 , -0.41928 , -- 7.66 , -0.39651 , -- 7.67 , -0.43324 , -- 7.68 , -0.4592 , -- 7.69 , -0.3661 , -- 7.7 , -0.17726 , -- 7.71 , -7.930000000000000E-03 , -- 7.72 , 9.228000000000000E-02 , -- 7.73 , 0.12711 , -- 7.74 , 0.10315 , -- 7.75 , 9.070000000000000E-03 , -- 7.76 , -0.1676 , -- 7.77 , -0.37078 , -- 7.78 , -0.48702 , -- 7.79 , -0.42176 , -- 7.8 , -0.20091 , -- 7.81 , -7.270000000000000E-03 , -- 7.82 , 3.404000000000000E-02 , -- 7.83 , 2.700000000000000E-03 , -- 7.84 , -4.730000000000000E-03 , -- 7.85 , -2.107000000000000E-02 , -- 7.86 , -7.763000000000000E-02 , -- 7.87 , -0.11332 , -- 7.88 , -9.217000000000000E-02 , -- 7.89 , -7.226000000000000E-02 , -- 7.9 , -0.10282 , -- 7.91 , -0.18072 , -- 7.92 , -0.27112 , -- 7.93 , -0.33308 , -- 7.94 , -0.37009 , -- 7.95 , -0.41046 , -- 7.96 , -0.46542 , -- 7.97 , -0.51679 , -- 7.98 , -0.48695 , -- 7.99 , -0.31766 , -- 8.0 , -0.11193 , -- 8.01 , -1.808000000000000E-02 , -- 8.02 , -9.790000000000000E-03 , -- 8.03 , 7.910000000000000E-03 , -- 8.04 , 2.892000000000000E-02 , -- 8.05 , 5.256000000000000E-02 , -- 8.06 , 0.15118 , -- 8.07 , 0.33598 , -- 8.08 , 0.47411 , -- 8.09 , 0.4184 , -- 8.1 , 0.22182 , -- 8.11 , 6.008000000000000E-02 , -- 8.12 , 7.820000000000001E-03 , -- 8.13 , 3.031000000000000E-02 , -- 8.14 , 6.139000000000000E-02 , -- 8.15 , 9.475000000000000E-02 , -- 8.16 , 0.1711 , -- 8.17 , 0.25375 , -- 8.18 , 0.32694 , -- 8.19 , 0.47654 , -- 8.2 , 0.71476 , -- 8.21 , 0.92354 , -- 8.22 , 0.99997 , -- 8.23 , 0.96174 , -- 8.24 , 0.85956 , -- 8.25 , 0.67462 , -- 8.26 , 0.42666 , -- 8.27 , 0.21402 , -- 8.28 , 8.068000000000000E-02 , -- 8.29 , -2.572000000000000E-02 , -- 8.3 , -0.18823 , -- 8.31 , -0.43016 , -- 8.32 , -0.69265 , -- 8.33 , -0.84523 , -- 8.34 , -0.78451 , -- 8.35 , -0.5823 , -- 8.36 , -0.39951 , -- 8.37 , -0.3009 , -- 8.38 , -0.28826 , -- 8.39 , -0.34762 , -- 8.4 , -0.40794 , -- 8.41 , -0.37827 , -- 8.42 , -0.24945 , -- 8.43 , -0.10703 , -- 8.44 , -1.106000000000000E-02 , -- 8.45 , 6.251000000000000E-02 , -- 8.46 , 0.1419 , -- 8.47 , 0.19928 , -- 8.48 , 0.18798 , -- 8.49 , 0.11645 , -- 8.5 , 4.575000000000000E-02 , -- 8.51 , 4.959000000000000E-02 , -- 8.52 , 0.17716 , -- 8.53 , 0.34359 , -- 8.54 , 0.36584 , -- 8.55 , 0.23915 , -- 8.56 , 0.18171 , -- 8.57 , 0.30089 , -- 8.58 , 0.43922 , -- 8.59 , 0.40395 , -- 8.6 , 0.15759 , -- 8.61 , -0.16407 , -- 8.62 , -0.36165 , -- 8.63 , -0.39041 , -- 8.64 , -0.35247 , -- 8.65 , -0.31056 , -- 8.66 , -0.24355 , -- 8.67 , -9.318000000000000E-02 , -- 8.68 , 7.779999999999999E-02 , -- 8.69 , 5.175000000000000E-02 , -- 8.7 , -0.23925 , -- 8.71 , -0.59171 , -- 8.72 , -0.77473 , -- 8.73 , -0.75474 , -- 8.74 , -0.64528 , -- 8.75 , -0.48987 , -- 8.76 , -0.29956 , -- 8.77 , -0.1701 , -- 8.78 , -0.13175 , -- 8.79 , -0.10789 , -- 8.8 , -4.978000000000000E-02 , -- 8.81 , 4.376000000000000E-02 , -- 8.82 , 0.15205 , -- 8.83 , 0.2202 , -- 8.84 , 0.17479 , -- 8.85 , 2.103000000000000E-02 , -- 8.86 , -0.14172 , -- 8.87 , -0.26548 , -- 8.88 , -0.38534 , -- 8.89 , -0.50451 , -- 8.9 , -0.53404 , -- 8.91 , -0.38116 , -- 8.92 , -0.11525 , -- 8.93 , 7.395000000000000E-02 , -- 8.94 , 0.10361 , -- 8.95 , 6.577000000000000E-02 , -- 8.96 , 6.259000000000001E-02 , -- 8.97 , 5.649000000000000E-02 , -- 8.98 , -3.880000000000000E-03 , -- 8.99 , -2.390000000000000E-02 , -- 9.0 , 7.305000000000000E-02 , -- 9.01 , 0.19452 , -- 9.02 , 0.2608 , -- 9.03 , 0.35267 , -- 9.04 , 0.5391 , -- 9.05 , 0.73389 , -- 9.06 , 0.83545 , -- 9.07 , 0.82904 , -- 9.08 , 0.72024 , -- 9.09 , 0.51294 , -- 9.1 , 0.23736 , -- 9.11 , -4.577000000000000E-02 , -- 9.12 , -0.26395 , -- 9.13 , -0.38853 , -- 9.14 , -0.43089 , -- 9.15 , -0.4349 , -- 9.16 , -0.41682 , -- 9.17 , -0.37537 , -- 9.18 , -0.32465 , -- 9.19 , -0.29702 , -- 9.2 , -0.32491 , -- 9.21 , -0.3466 , -- 9.22 , -0.28185 , -- 9.23 , -0.19619 , -- 9.24 , -0.14637 , -- 9.25 , -9.772000000000000E-02 , -- 9.26 , -7.858999999999999E-02 , -- 9.27 , -0.13191 , -- 9.28 , -0.21558 , -- 9.29 , -0.24568 , -- 9.3 , -0.18549 , -- 9.31 , -9.976000000000000E-02 , -- 9.32 , -6.297000000000000E-02 , -- 9.33 , -8.577000000000000E-02 , -- 9.34 , -0.11997 , -- 9.35 , -5.070000000000000E-02 , -- 9.36 , 0.19743 , -- 9.37 , 0.55636 , -- 9.38 , 0.86649 , -- 9.39 , 0.99997 , -- 9.4 , 0.95787 , -- 9.41 , 0.80859 , -- 9.42 , 0.58733 , -- 9.43 , 0.34042 , -- 9.44 , 0.15629 , -- 9.45 , 7.298000000000000E-02 , -- 9.46 , 3.103000000000000E-02 , -- 9.47 , -1.360000000000000E-03 , -- 9.48 , 2.567000000000000E-02 , -- 9.49 , 9.848000000000000E-02 , -- 9.5 , 0.13363 , -- 9.51 , 0.10499 , -- 9.52 , 1.947000000000000E-02 , -- 9.53 , -0.11686 , -- 9.54 , -0.25475 , -- 9.55 , -0.33284 , -- 9.56 , -0.37717 , -- 9.57 , -0.45927 , -- 9.58 , -0.53679 , -- 9.59 , -0.50988 , -- 9.6 , -0.4323 , -- 9.61 , -0.46891 , -- 9.62 , -0.62414 , -- 9.63 , -0.67897 , -- 9.64 , -0.46893 , -- 9.65 , -0.10561 , -- 9.66 , 0.12896 , -- 9.67 , 7.442000000000000E-02 , -- 9.68 , -0.13619 , -- 9.69 , -0.25497 , -- 9.7 , -0.19615 , -- 9.71 , -5.295000000000000E-02 , -- 9.72 , 5.399000000000000E-02 , -- 9.73 , 8.438000000000000E-02 , -- 9.74 , 7.897000000000000E-02 , -- 9.75 , 0.11239 , -- 9.76 , 0.18699 , -- 9.77 , 0.19038 , -- 9.78 , 0.13535 , -- 9.79 , 0.20938 , -- 9.8 , 0.43787 , -- 9.81 , 0.63937 , -- 9.82 , 0.67742 , -- 9.83 , 0.58799 , -- 9.84 , 0.49876 , -- 9.85 , 0.4183 , -- 9.86 , 0.29948 , -- 9.87 , 0.22905 , -- 9.88 , 0.2606 , -- 9.89 , 0.28847 , -- 9.9 , 0.22616 , -- 9.91 , 0.12545 , -- 9.92 , 8.956000000000000E-02 , -- 9.93 , 0.12928 , -- 9.94 , 0.15076 , -- 9.95 , 4.544000000000000E-02 , -- 9.96 , -0.20722 , -- 9.97 , -0.49063 , -- 9.98 , -0.6894 , -- 9.99 , -0.80485 , -- 10.0 , -0.84771 , -- 10.01 , -0.76807 , -- 10.02 , -0.56037 , -- 10.03 , -0.32503 , -- 10.04 , -0.15016 , -- 10.05 , -3.882000000000000E-02 , -- 10.06 , 6.110000000000000E-03 , -- 10.07 , -2.178000000000000E-02 , -- 10.08 , -6.615000000000000E-02 , -- 10.09 , -3.796000000000000E-02 , -- 10.1 , 8.788000000000000E-02 , -- 10.11 , 0.2149 , -- 10.12 , 0.23018 , -- 10.13 , 0.14302 , -- 10.14 , 3.300000000000000E-02 , -- 10.15 , -5.442000000000000E-02 , -- 10.16 , -9.190000000000000E-02 , -- 10.17 , -5.636000000000000E-02 , -- 10.18 , 1.760000000000000E-03 , -- 10.19 , -4.910000000000000E-03 , -- 10.2 , -7.645000000000000E-02 , -- 10.21 , -0.16067 , -- 10.22 , -0.22708 , -- 10.23 , -0.23139 , -- 10.24 , -0.12101 , -- 10.25 , 7.537000000000001E-02 , -- 10.26 , 0.24004 , -- 10.27 , 0.32546 , -- 10.28 , 0.38826 , -- 10.29 , 0.41863 , -- 10.3 , 0.35794 , -- 10.31 , 0.23222 , -- 10.32 , 0.11401 , -- 10.33 , 1.697000000000000E-02 , -- 10.34 , -0.10766 , -- 10.35 , -0.25136 , -- 10.36 , -0.35757 , -- 10.37 , -0.41565 , -- 10.38 , -0.3843 , -- 10.39 , -0.22915 , -- 10.4 , -7.590000000000000E-03 , -- 10.41 , 0.24235 , -- 10.42 , 0.48677 , -- 10.43 , 0.65383 , -- 10.44 , 0.70515 , -- 10.45 , 0.61222 , -- 10.46 , 0.40693 , -- 10.47 , 0.24331 , -- 10.48 , 0.2277 , -- 10.49 , 0.27807 , -- 10.5 , 0.24063 , -- 10.51 , 9.018000000000000E-02 , -- 10.52 , -8.182000000000000E-02 , -- 10.53 , -0.23302 , -- 10.54 , -0.37812 , -- 10.55 , -0.4703 , -- 10.56 , -0.41592 , -- 10.57 , -0.24651 , -- 10.58 , -0.12814 , -- 10.59 , -0.13 , -- 10.6 , -0.17581 , -- 10.61 , -0.22261 , -- 10.62 , -0.29974 , -- 10.63 , -0.40731 , -- 10.64 , -0.49694 , -- 10.65 , -0.51567 , -- 10.66 , -0.38399 , -- 10.67 , -6.413000000000001E-02 , -- 10.68 , 0.26417 , -- 10.69 , 0.33331 , -- 10.7 , 0.13429 , -- 10.71 , -8.293000000000000E-02 , -- 10.72 , -0.1463 , -- 10.73 , -0.13542 , -- 10.74 , -0.20542 , -- 10.75 , -0.35982 , -- 10.76 , -0.44591 , -- 10.77 , -0.37107 , -- 10.78 , -0.25668 , -- 10.79 , -0.25179 , -- 10.8 , -0.31124 , -- 10.81 , -0.28374 , -- 10.82 , -0.12758 , -- 10.83 , 1.490000000000000E-02 , -- 10.84 , 1.229000000000000E-02 , -- 10.85 , -6.356000000000001E-02 , -- 10.86 , -5.771000000000000E-02 , -- 10.87 , 8.679000000000001E-02 , -- 10.88 , 0.31097 , -- 10.89 , 0.53347 , -- 10.9 , 0.68419 , -- 10.91 , 0.65081 , -- 10.92 , 0.4251 , -- 10.93 , 0.19891 , -- 10.94 , 0.11666 , -- 10.95 , 0.13796 , -- 10.96 , 0.14749 , -- 10.97 , 9.375000000000000E-02 , -- 10.98 , 2.569000000000000E-02 , -- 10.99 , -1.828000000000000E-02 , -- 11.0 , -6.660000000000000E-03 , -- 11.01 , 9.803000000000001E-02 , -- 11.02 , 0.2156 , -- 11.03 , 0.2608 , -- 11.04 , 0.28376 , -- 11.05 , 0.31446 , -- 11.06 , 0.30511 , -- 11.07 , 0.25332 , -- 11.08 , 0.19284 , -- 11.09 , 0.1152 , -- 11.1 , 1.948000000000000E-02 , -- 11.11 , -8.540000000000001E-03 , -- 11.12 , -8.070000000000001E-03 , -- 11.13 , 5.720000000000000E-03 , -- 11.14 , 5.899000000000000E-02 , -- 11.15 , 0.13421 , -- 11.16 , 0.26053 , -- 11.17 , 0.41353 , -- 11.18 , 0.51092 , -- 11.19 , 0.52002 , -- 11.2 , 0.50124 , -- 11.21 , 0.5386 , -- 11.22 , 0.65388 , -- 11.23 , 0.8058 , -- 11.24 , 0.93844 , -- 11.25 , 0.99997 , -- 11.26 , 0.96789 , -- 11.27 , 0.87593 , -- 11.28 , 0.80065 , -- 11.29 , 0.79192 , -- 11.3 , 0.8141 , -- 11.31 , 0.8052 , -- 11.32 , 0.74262 , -- 11.33 , 0.61546 , -- 11.34 , 0.41975 , -- 11.35 , 0.22346 , -- 11.36 , 0.14585 , -- 11.37 , 0.18339 , -- 11.38 , 0.21495 , -- 11.39 , 0.22018 , -- 11.4 , 0.23766 , -- 11.41 , 0.19769 , -- 11.42 , 1.272000000000000E-02 , -- 11.43 , -0.33277 , -- 11.44 , -0.5999 , -- 11.45 , -0.66307 , -- 11.46 , -0.54941 , -- 11.47 , -0.30754 , -- 11.48 , 9.150000000000000E-03 , -- 11.49 , 0.33567 , -- 11.5 , 0.62395 , -- 11.51 , 0.82292 , -- 11.52 , 0.92488 , -- 11.53 , 0.94922 , -- 11.54 , 0.90162 , -- 11.55 , 0.81535 , -- 11.56 , 0.68529 , -- 11.57 , 0.48301 , -- 11.58 , 0.28744 , -- 11.59 , 0.21968 , -- 11.6 , 0.31463 , -- 11.61 , 0.4858 , -- 11.62 , 0.58845 , -- 11.63 , 0.57005 , -- 11.64 , 0.49055 , -- 11.65 , 0.39877 , -- 11.66 , 0.2819 , -- 11.67 , 0.11731 , -- 11.68 , -6.177000000000000E-02 , -- 11.69 , -0.1701 , -- 11.7 , -0.21434 , -- 11.71 , -0.36528 , -- 11.72 , -0.67236 , -- 11.73 , -0.88398 , -- 11.74 , -0.82736 , -- 11.75 , -0.67582 , -- 11.76 , -0.64387 , -- 11.77 , -0.69937 , -- 11.78 , -0.68858 , -- 11.79 , -0.5758 , -- 11.8 , -0.46315 , -- 11.81 , -0.45051 , -- 11.82 , -0.51549 , -- 11.83 , -0.51468 , -- 11.84 , -0.35292 , -- 11.85 , -0.11964 , -- 11.86 , -1.117000000000000E-02 , -- 11.87 , -0.1357 , -- 11.88 , -0.40276 , -- 11.89 , -0.63738 , -- 11.9 , -0.73699 , -- 11.91 , -0.69661 , -- 11.92 , -0.58112 , -- 11.93 , -0.46357 , -- 11.94 , -0.38497 , -- 11.95 , -0.33617 , -- 11.96 , -0.26831 , -- 11.97 , -0.19582 , -- 11.98 , -0.16518 , -- 11.99 , -0.14401 , -- 12.0 , -7.318000000000000E-02 , -- 12.01 , 7.769000000000000E-02 , -- 12.02 , 0.26041 , -- 12.03 , 0.37046 , -- 12.04 , 0.40569 , -- 12.05 , 0.44476 , -- 12.06 , 0.50231 , -- 12.07 , 0.52622 , -- 12.08 , 0.47631 , -- 12.09 , 0.35672 , -- 12.1 , 0.14838 , -- 12.11 , -0.13846 , -- 12.12 , -0.36979 , -- 12.13 , -0.47711 , -- 12.14 , -0.54786 , -- 12.15 , -0.62333 , -- 12.16 , -0.64749 , -- 12.17 , -0.58515 , -- 12.18 , -0.46856 , -- 12.19 , -0.35151 , -- 12.2 , -0.26225 , -- 12.21 , -0.22214 , -- 12.22 , -0.22853 , -- 12.23 , -0.19257 , -- 12.24 , -2.725000000000000E-02 , -- 12.25 , 0.18283 , -- 12.26 , 0.25344 , -- 12.27 , 0.12964 , -- 12.28 , -9.258000000000000E-02 , -- 12.29 , -0.29733 , -- 12.3 , -0.42242 , -- 12.31 , -0.45343 , -- 12.32 , -0.38158 , -- 12.33 , -0.24116 , -- 12.34 , -0.13557 , -- 12.35 , -0.11938 , -- 12.36 , -0.14999 , -- 12.37 , -0.17426 , -- 12.38 , -0.16707 , -- 12.39 , -0.12211 , -- 12.4 , -6.938000000000000E-02 , -- 12.41 , -5.365000000000000E-02 , -- 12.42 , -6.988999999999999E-02 , -- 12.43 , -0.10537 , -- 12.44 , -0.18301 , -- 12.45 , -0.26683 , -- 12.46 , -0.27079 , -- 12.47 , -0.18067 , -- 12.48 , -5.357000000000000E-02 , -- 12.49 , 5.621000000000000E-02 , -- 12.5 , 0.12411 , -- 12.51 , 0.1349 , -- 12.52 , 0.10552 , -- 12.53 , 8.767000000000000E-02 , -- 12.54 , 5.312000000000000E-02 , -- 12.55 , -7.994000000000000E-02 , -- 12.56 , -0.28316 , -- 12.57 , -0.43439 , -- 12.58 , -0.45819 , -- 12.59 , -0.39875 , -- 12.6 , -0.3257 , -- 12.61 , -0.21617 , -- 12.62 , -5.834000000000000E-02 , -- 12.63 , 6.234000000000000E-02 , -- 12.64 , 7.834000000000001E-02 , -- 12.65 , 2.524000000000000E-02 , -- 12.66 , -4.370000000000000E-03 , -- 12.67 , 2.088000000000000E-02 , -- 12.68 , 3.738000000000000E-02 , -- 12.69 , -5.780000000000000E-03 , -- 12.7 , -7.783000000000000E-02 , -- 12.71 , -0.10293 , -- 12.72 , -5.917000000000000E-02 , -- 12.73 , -2.088000000000000E-02 , -- 12.74 , -4.084000000000000E-02 , -- 12.75 , -7.596000000000000E-02 , -- 12.76 , -7.527000000000000E-02 , -- 12.77 , -4.418000000000000E-02 , -- 12.78 , -2.046000000000000E-02 , -- 12.79 , -2.682000000000000E-02 , -- 12.8 , -2.654000000000000E-02 , -- 12.81 , 3.635000000000000E-02 , -- 12.82 , 0.12352 , -- 12.83 , 0.13159 , -- 12.84 , 4.372000000000000E-02 , -- 12.85 , -6.480000000000000E-02 , -- 12.86 , -0.1361 , -- 12.87 , -0.17058 , -- 12.88 , -0.1883 , -- 12.89 , -0.19167 , -- 12.9 , -0.19116 , -- 12.91 , -0.20869 , -- 12.92 , -0.23797 , -- 12.93 , -0.28017 , -- 12.94 , -0.36467 , -- 12.95 , -0.46778 , -- 12.96 , -0.49324 , -- 12.97 , -0.38894 , -- 12.98 , -0.2225 , -- 12.99 , -9.676000000000000E-02 , -- 13.0 , -5.153000000000000E-02 , -- 13.01 , -5.856000000000000E-02 , -- 13.02 , -6.265000000000000E-02 , -- 13.03 , -3.700000000000000E-02 , -- 13.04 , 8.800000000000001E-03 , -- 13.05 , 4.189000000000000E-02 , -- 13.06 , 1.048000000000000E-02 , -- 13.07 , -8.393000000000000E-02 , -- 13.08 , -0.17214 , -- 13.09 , -0.21986 , -- 13.1 , -0.25265 , -- 13.11 , -0.28696 , -- 13.12 , -0.29845 , -- 13.13 , -0.27534 , -- 13.14 , -0.25187 , -- 13.15 , -0.25011 , -- 13.16 , -0.27425 , -- 13.17 , -0.33551 , -- 13.18 , -0.41051 , -- 13.19 , -0.45406 , -- 13.2 , -0.44533 , -- 13.21 , -0.38727 , -- 13.22 , -0.30756 , -- 13.23 , -0.24203 , -- 13.24 , -0.20129 , -- 13.25 , -0.16106 , -- 13.26 , -9.457000000000000E-02 , -- 13.27 , -2.440000000000000E-02 , -- 13.28 , 7.040000000000000E-03 , -- 13.29 , 8.600000000000000E-03 , -- 13.3 , 1.981000000000000E-02 , -- 13.31 , 4.834000000000000E-02 , -- 13.32 , 7.178000000000000E-02 , -- 13.33 , 8.525000000000001E-02 , -- 13.34 , 0.1107 , -- 13.35 , 0.15822 , -- 13.36 , 0.21564 , -- 13.37 , 0.27468 , -- 13.38 , 0.32506 , -- 13.39 , 0.34096 , -- 13.4 , 0.32619 , -- 13.41 , 0.32491 , -- 13.42 , 0.34842 , -- 13.43 , 0.36279 , -- 13.44 , 0.34026 , -- 13.45 , 0.2756 , -- 13.46 , 0.18648 , -- 13.47 , 9.881000000000000E-02 , -- 13.48 , 3.222000000000000E-02 , -- 13.49 , 1.061000000000000E-02 , -- 13.5 , 4.343000000000000E-02 , -- 13.51 , 9.372000000000000E-02 , -- 13.52 , 0.10628 , -- 13.53 , 7.198000000000000E-02 , -- 13.54 , 3.458000000000000E-02 , -- 13.55 , 2.182000000000000E-02 , -- 13.56 , 1.377000000000000E-02 , -- 13.57 , -1.295000000000000E-02 , -- 13.58 , -4.297000000000000E-02 , -- 13.59 , -4.232000000000000E-02 , -- 13.6 , -1.224000000000000E-02 , -- 13.61 , 1.559000000000000E-02 , -- 13.62 , 1.639000000000000E-02 , -- 13.63 , -1.544000000000000E-02 , -- 13.64 , -5.384000000000000E-02 , -- 13.65 , -7.287000000000000E-02 , -- 13.66 , -8.747000000000001E-02 , -- 13.67 , -0.10976 , -- 13.68 , -0.11529 , -- 13.69 , -8.388000000000000E-02 , -- 13.7 , -3.945000000000000E-02 , -- 13.71 , -2.420000000000000E-02 , -- 13.72 , -3.630000000000000E-02 , -- 13.73 , -3.928000000000000E-02 , -- 13.74 , -2.207000000000000E-02 , -- 13.75 , -5.590000000000000E-03 , -- 13.76 , -9.450000000000000E-03 , -- 13.77 , -2.752000000000000E-02 , -- 13.78 , -4.478000000000000E-02 , -- 13.79 , -6.457000000000000E-02 , -- 13.8 , -8.530000000000000E-02 , -- 13.81 , -8.704000000000001E-02 , -- 13.82 , -5.918000000000000E-02 , -- 13.83 , -3.830000000000000E-03 , -- 13.84 , 7.192000000000000E-02 , -- 13.85 , 0.14312 , -- 13.86 , 0.17488 , -- 13.87 , 0.16315 , -- 13.88 , 0.14274 , -- 13.89 , 0.14017 , -- 13.9 , 0.14556 , -- 13.91 , 0.13989 , -- 13.92 , 0.12104 , -- 13.93 , 9.578000000000000E-02 , -- 13.94 , 7.056999999999999E-02 , -- 13.95 , 5.257000000000000E-02 , -- 13.96 , 4.283000000000000E-02 , -- 13.97 , 3.754000000000000E-02 , -- 13.98 , 3.580000000000000E-02 , -- 13.99 , 3.422000000000000E-02 , -- 14.0 , 2.593000000000000E-02 , -- 14.01 , 4.220000000000000E-03 , -- 14.02 , -1.590000000000000E-02 , -- 14.03 , -2.929000000000000E-02 , -- 14.04 , 4.251000000000000E-02 , -- 14.05 , 5.369000000000000E-02 , -- 14.06 , 6.154000000000000E-02 , -- 14.07 , 6.560000000000001E-02 , -- 14.08 , 6.591000000000000E-02 , -- 14.09 , 6.272000000000000E-02 , -- 14.1 , 5.704000000000000E-02 , -- 14.11 , 5.054000000000000E-02 , -- 14.12 , 4.304000000000000E-02 , -- 14.13 , 3.569000000000000E-02 , -- 14.14 , 2.953000000000000E-02 , -- 14.15 , 2.591000000000000E-02 , -- 14.16 , 2.479000000000000E-02 , -- 14.17 , 2.511000000000000E-02 , -- 14.18 , 2.581000000000000E-02 , -- 14.19 , 2.493000000000000E-02 , -- 14.2 , 2.314000000000000E-02 , -- 14.21 , 2.027000000000000E-02 , -- 14.22 , 1.935000000000000E-02 , -- 14.23 , 2.023000000000000E-02 , -- 14.24 , 2.506000000000000E-02 , -- 14.25 , 3.099000000000000E-02 , -- 14.26 , 3.760000000000000E-02 , -- 14.27 , 4.262000000000000E-02 , -- 14.28 , 4.532000000000000E-02 , -- 14.29 , 4.802000000000000E-02 , -- 14.3 , 5.005000000000000E-02 , -- 14.31 , 5.302000000000000E-02 , -- 14.32 , 5.416000000000000E-02 , -- 14.33 , 5.517000000000000E-02 , -- 14.34 , 5.543000000000000E-02 , -- 14.35 , 5.403000000000000E-02 , -- 14.36 , 5.095000000000000E-02 , -- 14.37 , 4.660000000000000E-02 , -- 14.38 , 4.407000000000000E-02 , -- 14.39 , 4.359000000000000E-02 , -- 14.4 , 4.649000000000000E-02 , -- 14.41 , 4.927000000000000E-02 , -- 14.42 , 5.116000000000000E-02 , -- 14.43 , 5.246000000000000E-02 , -- 14.44 , 5.290000000000000E-02 , -- 14.45 , 5.342000000000000E-02 , -- 14.46 , 5.301000000000000E-02 , -- 14.47 , 5.389000000000000E-02 , -- 14.48 , 5.518000000000000E-02 , -- 14.49 , 5.594000000000000E-02 , -- 14.5 , 5.543000000000000E-02 , -- 14.51 , 5.542000000000000E-02 , -- 14.52 , 5.677000000000000E-02 , -- 14.53 , 5.746000000000000E-02 , -- 14.54 , 5.802000000000000E-02 , -- 14.55 , 5.847000000000000E-02 , -- 14.56 , 5.842000000000000E-02 , -- 14.57 , 5.750000000000000E-02 , -- 14.58 , 5.606000000000000E-02 , -- 14.59 , 5.592000000000000E-02 , -- 14.6 , 5.517000000000000E-02 , -- 14.61 , 5.439000000000000E-02 , -- 14.62 , 5.392000000000000E-02 , -- 14.63 , 5.395000000000000E-02 , -- 14.64 , 5.260000000000000E-02 , -- 14.65 , 5.031000000000000E-02 , -- 14.66 , 4.883000000000000E-02 , -- 14.67 , 4.944000000000000E-02 , -- 14.68 , 5.215000000000000E-02 , -- 14.69 , 5.627000000000000E-02 , -- 14.7 , 6.244000000000000E-02 , -- 14.71 , 6.783000000000000E-02 , -- 14.72 , 7.159000000000000E-02 , -- 14.73 , 7.149999999999999E-02 , -- 14.74 , 6.673000000000000E-02 , -- 14.75 , 5.755000000000000E-02 , -- 14.76 , 4.539000000000000E-02 , -- 14.77 , 3.504000000000000E-02 , -- 14.78 , 2.721000000000000E-02 , -- 14.79 , 2.308000000000000E-02 , -- 14.8 , 2.125000000000000E-02 , -- 14.81 , 2.022000000000000E-02 , -- 14.82 , 1.831000000000000E-02 , -- 14.83 , 1.547000000000000E-02 , -- 14.84 , 1.321000000000000E-02 , -- 14.85 , 1.112000000000000E-02 , -- 14.86 , 1.025000000000000E-02 , -- 14.87 , 9.549999999999999E-03 , -- 14.88 , 1.040000000000000E-02 , -- 14.89 , 1.059000000000000E-02 , -- 14.9 , 1.108000000000000E-02 , -- 14.91 , 1.195000000000000E-02 , -- 14.92 , 1.452000000000000E-02 , -- 14.93 , 1.809000000000000E-02 , -- 14.94 , 2.029000000000000E-02 , -- 14.95 , 2.323000000000000E-02 , -- 14.96 , 2.515000000000000E-02 , -- 14.97 , 2.836000000000000E-02 , -- 14.98 , 3.278000000000000E-02 , -- 14.99 , 3.934000000000000E-02 , -- 15.00 , 0.0 , -- ), -- INTERPOL='LIN', -- PROL_DROITE='CONSTANT', -- PROL_GAUCHE='EXCLU',); -- -- -- -- diff --cc Tests/testcomm7/forma12c.comm index 2027774f,2027774f..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm7/forma12c.comm +++ /dev/null @@@ -1,773 -1,773 +1,0 @@@ --# MODIF DATE 12/05/2005 AUTEUR DURAND C.DURAND --# TITRE TP ANALYSE SISMIQUE --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2004 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. --# ====================================================================== --# RESPONSABLE BOYERE E.BOYERE --#----------------------------------------------------------------------- --# --# ANALYSE RIS12 TR4 REGLEMENTAIRE --# SCENARIO 1 --# GL1(X,Y) + GL2(Z) --# --#----------------------------------------------------------------------- -- --DEBUT(CODE=_F(NOM ='FORMA12C',NIV_PUB_WEB='INTERNET')) -- --MAILLAGE=LIRE_MAILLAGE(INFO=2) -- --MODELE=AFFE_MODELE( -- MAILLAGE=MAILLAGE, -- AFFE=( -- _F(GROUP_MA='GPOU_D_T', -- PHENOMENE='MECANIQUE', -- MODELISATION='POU_D_T',), -- _F(GROUP_MA='GPOU_C_T', -- PHENOMENE='MECANIQUE', -- MODELISATION='POU_C_T',), -- _F(GROUP_MA='GDIS_TR', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_TR',), -- ), -- ) -- --IMPR_RESU(FORMAT='CASTEM',UNITE=37, -- MODELE=MODELE, -- RESU=_F( -- MAILLAGE=MAILLAGE)) -- -- -- --#----------------------------------------------------------------------- --# CARACTERISTIQUES DES ELEMENTS --#----------------------------------------------------------------------- -- -- --CARA=AFFE_CARA_ELEM( -- MODELE=MODELE, -- POUTRE=( -- _F(GROUP_MA='GMEL0301', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.00711),), -- _F(GROUP_MA='GMEL0501', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL0601', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL0701', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1001', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1101', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1201', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1501', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1701', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1801', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1901', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2001', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2101', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2201', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2401', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.00711),),), -- DISCRET=(_F(MAILLE='M0801I02', -- CARA='M_TR_D_N', -- VALE=(36.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0),), -- _F(MAILLE='M1301I02', -- CARA='M_TR_D_N', -- VALE=(36.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0),),), -- DEFI_ARC=(_F(GROUP_MA='GMEL0601', -- CENTRE=(466.39260860000002,107.5500031,0.27747499939999998), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL1101', -- CENTRE=(466.16400149999998,107.3214035,3.7724525930000001), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL1701', -- CENTRE=(466.16400149999998,106.4785995,4.2335472110000003), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL1901', -- CENTRE=(466.16400149999998,106.4785995,8.7655010220000005), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL2101', -- CENTRE=(466.16400149999998,107.4713974,9.2274990080000006), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,),),) -- --#----------------------------------------------------------------------- --# DEFINITION DES MATERIAUX --#----------------------------------------------------------------------- -- --MATP01=DEFI_MATERIAU(ELAS=_F(E=1.97E11, -- NU=0.3, -- RHO=1.3108749019999999E4, -- ALPHA=1.639999937E-05,),) --MATP03=DEFI_MATERIAU(ELAS=_F(E=1.97E11, -- NU=0.3, -- RHO=1.956015625E4, -- ALPHA=1.639999937E-05,),) -- --#----------------------------------------------------------------------- --# DEFINITION DES SUPPORTS --#----------------------------------------------------------------------- -- --SUPPORT=AFFE_CHAR_MECA( -- MODELE=MODELE, -- DDL_IMPO=( --# PF1 ET PF2 -- _F( NOEUD = ('N02__I00', 'N01__I00',), -- DX = 0., DY = 0., DZ = 0., DRX = 0., DRY = 0., DRZ = 0.), --# GL1 -- _F( NOEUD = 'N0701I00', -- DX = 0., DY = 0.), --# GL2 -- _F( NOEUD = 'N1201I00', -- DZ = 0.), -- ), -- ) -- --#----------------------------------------------------------------------- --# DEFINITION DES CHAMPS DE MATERIAUX --#----------------------------------------------------------------------- -- --CHMATP=AFFE_MATERIAU(MAILLAGE=MAILLAGE, -- AFFE=(_F(GROUP_MA='GMAT01', -- MATER=MATP01, -- TEMP_REF=20.0,), -- _F(GROUP_MA='GMAT03', -- MATER=MATP03, -- TEMP_REF=20.0,),),) -- --#----------------------------------------------------------------------- --# ASSEMBLAGE MATRICE MASSE ET RIGIDITE --#----------------------------------------------------------------------- -- --MACRO_MATR_ASSE(MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- CHARGE=SUPPORT, -- NUME_DDL=CO('NUMDDL'), -- MATR_ASSE=(_F(MATRICE=CO("MATRRIGI"), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO("MATRMASS"), -- OPTION='MASS_MECA',),),); -- -- --#----------------------------------------------------------------------- --# ASSEMBLAGE DU SECOND MEMBRE --#----------------------------------------------------------------------- -- --INCLUDE(UNITE=22) -- --CHSEIX=CALC_CHAR_SEISME( MATR_MASS=MATRMASS, -- DIRECTION=(1., 0., 0.,), MONO_APPUI='OUI' -- ) --CHSEIY=CALC_CHAR_SEISME( MATR_MASS=MATRMASS, -- DIRECTION=(0., 1., 0.,), MONO_APPUI='OUI' -- ) --CHSEIZ=CALC_CHAR_SEISME( MATR_MASS=MATRMASS, -- DIRECTION=(0., 0., 1.,), MONO_APPUI='OUI' -- ) -- --#----------------------------------------------------------------------- --# CALCUL DES MODES --#----------------------------------------------------------------------- --MASSINER=POST_ELEM( -- MODELE=MODELE, -- CHARGE=SUPPORT, -- CARA_ELEM=CARA, -- CHAM_MATER=CHMATP, -- MASS_INER=_F( TOUT = 'OUI',) -- ) --MODES=MACRO_MODE_MECA( -- MATR_A=MATRRIGI, -- MATR_B=MATRMASS, -- CALC_FREQ=_F( -- FREQ_MIN = 0.0, -- FREQ_MAX = 33.0, -- NB_BLOC_FREQ = 1), -- VERI_MODE=_F( STOP_ERREUR = 'NON'), -- NORM_MODE=_F( -- NORME = 'MASS_GENE', -- MASS_INER =MASSINER), -- IMPRESSION=_F( TOUT_PARA = 'OUI') -- ) -- --# TEST_RESU UNIQUEMENT POUR FAIRE CAS TEST --TEST_RESU(RESU=(_F(RESULTAT=MODES, -- NUME_ORDRE=1, -- PARA='FREQ', -- VALE= 4.5135794612152, -- PRECISION=1e-05, -- REFERENCE='NON_REGRESSION', -- VERSION='7.3.19',))) -- --MODES=CALC_ELEM( -- reuse=MODES, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=MODES,) -- --########################################################### --#---- REPONSE TRANSITOIRE PAR SUPERPOSITION MODALE ------ --#---- MONO APPUI GRANDEURS RELATIVES ------ --########################################################### -- --# DEFINITION DES INSTANTS DE RECUPERATION -- --L_RECU=DEFI_LIST_REEL( DEBUT=0., -- INTERVALLE=_F( -- JUSQU_A = 20.47, -- PAS = 0.01) -- ) -- --#---------------------------------------------------- --#------------- PROJECTION SUR LA BASE MODALE -------- --#---------------------------------------------------- --MACRO_PROJ_BASE( -- BASE=MODES, -- MATR_ASSE_GENE=( -- _F( -- MATRICE=CO("MASSEGEN"), -- MATR_ASSE=MATRMASS, -- ), -- _F( -- MATRICE=CO("RIGIDGEN"), -- MATR_ASSE=MATRRIGI, -- ), -- ), -- VECT_ASSE_GENE=( -- _F( -- VECTEUR=CO("EFGENX"), -- VECT_ASSE=CHSEIX, -- ), -- _F( -- VECTEUR=CO("EFGENY"), -- VECT_ASSE=CHSEIY, -- ), -- _F( -- VECTEUR=CO("EFGENZ"), -- VECT_ASSE=CHSEIZ, -- ), -- ), -- ) -- --#------------------------------------------------------------------ --#-------------- RESOLUTION DU PB GENERALISE ----------------------- --#-------------- SANS CORRECTION STATIQUE -------------------------- --#------------------------------------------------------------------ --GSCR=DYNA_TRAN_MODAL( -- MASS_GENE=MASSEGEN, -- RIGI_GENE=RIGIDGEN, -- AMOR_REDUIT=0.02, -- EXCIT=( -- _F( -- VECT_GENE=EFGENX, -- FONC_MULT=ACCELH1, -- ), -- _F( -- VECT_GENE=EFGENY, -- FONC_MULT=ACCELH1, -- ), -- _F( -- VECT_GENE=EFGENZ, -- FONC_MULT=ACCELV1, -- ), -- ), -- INCREMENT=_F( -- INST_INIT = 0., -- INST_FIN =20.47, -- PAS = 0.001 -- ), -- ) -- --#-------------------------------------------------------------- --#---- RESTITUTION GRANDEUR PHYSIQUE DANS LE REPERE RELATIF --#--- SANS CORRECTION STATIQUE --#-------------------------------------------------------------- --# RESTITUTION GLOBALE DU CHAMP DE DEPLACEMENT RELATIF A CHAQUE INSTANT --# DE LA LISTE L_RECU --RGSCR=REST_BASE_PHYS( -- RESU_GENE=GSCR, -- INTERPOL='LIN', -- LIST_INST=L_RECU, -- #TOUT_INST='OUI', -- TOUT_CHAM='OUI', -- ) --DPSCR=CREA_CHAMP( -- TYPE_CHAM='NOEU_DEPL_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR, -- NOM_CHAM='DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) --TDPSCR=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_MAX_R', -- GROUP_NO='GNSTR01', -- CHAM_GD=DPSCR, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- -- --# RESTITUTION GLOBALE DU CHAMP EFGE_ELNO_DEPL A CHAQUE INSTANT --# DE LA LISTE L_RECU --RGSCR=CALC_ELEM( -- reuse=RGSCR, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=RGSCR,) --EFSCR=CREA_CHAMP( -- TYPE_CHAM='ELNO_SIEF_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR, -- NOM_CHAM='EFGE_ELNO_DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) --TEFSCR=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_MAX_R', -- GROUP_NO='GNSTR01', -- CHAM_GD=EFSCR, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) --IMPR_TABLE( -- TABLE=TEFSCR, -- FORMAT='TABLEAU', -- ) -- --########################################################### --#---- REPONSE TRANSITOIRE PAR SUPERPOSITION MODALE ------ --#---- MULTI APPUIS GRANDEURS ABSOLUES ------ --########################################################### -- --# DEFINITION EXCITATION MULTIPLE -- --MSTA=MODE_STATIQUE( -- MATR_RIGI=MATRRIGI, -- MATR_MASS=MATRMASS, -- MODE_STAT=_F(TOUT='OUI',AVEC_CMP=('DX','DY','DZ'),),) -- -- --CHSEIXM=CALC_CHAR_SEISME( -- MATR_MASS=MATRMASS, -- DIRECTION=(1., 0., 0.,), -- MODE_STAT=MSTA, -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ) -- --CHSEIYM=CALC_CHAR_SEISME( -- MATR_MASS=MATRMASS, -- DIRECTION=(0., 1., 0.,), -- MODE_STAT=MSTA, -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ) -- --CHSEIZM=CALC_CHAR_SEISME( -- MATR_MASS=MATRMASS, -- DIRECTION=(0., 0., 1.,), -- MODE_STAT=MSTA, -- NOEUD=('N02__I00','N01__I00','N1201I00',), -- ) -- --MACRO_PROJ_BASE( -- BASE=MODES, -- MATR_ASSE_GENE=( -- _F( -- MATRICE=CO("MASGEN2"), -- MATR_ASSE=MATRMASS, -- ), -- _F( -- MATRICE=CO("RIGGEN2"), -- MATR_ASSE=MATRRIGI, -- ), -- ), -- VECT_ASSE_GENE=( -- _F( -- VECTEUR=CO("EFX2"), -- VECT_ASSE=CHSEIXM, -- ), -- _F( -- VECTEUR=CO("EFY2"), -- VECT_ASSE=CHSEIYM, -- ), -- _F( -- VECTEUR=CO("EFZ2"), -- VECT_ASSE=CHSEIZM, -- ), -- ), -- ) -- -- --VITESH1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=ACCELH1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) --DEPLAH1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=VITESH1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) --VITESV1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=ACCELV1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) --DEPLAV1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=VITESV1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) -- --GSCA=DYNA_TRAN_MODAL( -- MASS_GENE=MASGEN2, -- RIGI_GENE=RIGGEN2, -- AMOR_REDUIT=0.02, -- MODE_STAT=MSTA, -- EXCIT=( -- _F( -- VECT_GENE=EFX2, -- ACCE=ACCELH1, -- VITE=VITESH1, -- DEPL=DEPLAH1, -- MULT_APPUI='OUI', -- DIRECTION=(1.,0.,0.,), -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ), -- _F( -- VECT_GENE=EFY2, -- ACCE=ACCELH1, -- VITE=VITESH1, -- DEPL=DEPLAH1, -- MULT_APPUI='OUI', -- DIRECTION=(0.,1.,0.,), -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ), -- _F( -- VECT_GENE=EFZ2, -- ACCE=ACCELV1, -- VITE=VITESV1, -- DEPL=DEPLAV1, -- MULT_APPUI='OUI', -- DIRECTION=(0.,0.,1.,), -- NOEUD=('N02__I00','N01__I00','N1201I00',), -- ), -- ), -- INCREMENT=_F( -- INST_INIT = 0., -- INST_FIN =20.47, -- PAS = 0.001 -- ), -- ) -- -- --# RESTITUTION GRANDEURS ABSOLUES --#------------------------------- -- --RGSCA=REST_BASE_PHYS( -- RESU_GENE=GSCA, -- INTERPOL='LIN', -- LIST_INST=L_RECU, -- TOUT_CHAM='OUI', -- MULT_APPUI='OUI', -- ) -- --# DEPLACEMENTS -- --DPSCA=CREA_CHAMP( -- TYPE_CHAM='NOEU_DEPL_R', -- OPERATION='EXTR', -- RESULTAT=RGSCA, -- NOM_CHAM='DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TDPSCA=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_MAX_A', -- GROUP_NO='GNSTR01', -- CHAM_GD=DPSCA, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=TDPSCA, -- FORMAT='TABLEAU', -- ) -- --# EFFORTS -- --RGSCA=CALC_ELEM( -- reuse=RGSCA, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=RGSCA,) -- --EFSCA=CREA_CHAMP( -- TYPE_CHAM='ELNO_SIEF_R', -- OPERATION='EXTR', -- RESULTAT=RGSCA, -- NOM_CHAM='EFGE_ELNO_DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TEFSCA=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_MAX_A', -- GROUP_NO='GNSTR01', -- CHAM_GD=EFSCA, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) --IMPR_TABLE( -- TABLE=TEFSCA, -- FORMAT='TABLEAU', -- ) -- -- --# RESTITUTION GRANDEURS RELATIVES --#------------------------------- -- --# DEPLACEMENTS -- --RGSCR2=REST_BASE_PHYS( -- RESU_GENE=GSCA, -- INTERPOL='LIN', -- LIST_INST=L_RECU, -- TOUT_CHAM='OUI', -- ) -- --DPSCR2=CREA_CHAMP( -- TYPE_CHAM='NOEU_DEPL_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR2, -- NOM_CHAM='DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TDPSCR2=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_MAX_R2', -- GROUP_NO='GNSTR01', -- CHAM_GD=DPSCR2, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=TDPSCR2, -- FORMAT='TABLEAU', -- ) -- --# EFFORTS -- --RGSCR2=CALC_ELEM( -- reuse=RGSCR2, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=RGSCR2,) -- --EFSCR2=CREA_CHAMP( -- TYPE_CHAM='ELNO_SIEF_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR2, -- NOM_CHAM='EFGE_ELNO_DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TEFSCR2=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_MAX_R2', -- GROUP_NO='GNSTR01', -- CHAM_GD=EFSCR2, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=TEFSCR2, -- FORMAT='TABLEAU', -- ) -- --########################################################### --#------REPONSE SPECTRALE PAR SUPERPOSITION MODALE--------- --########################################################### -- --# CALCUL DU SPECTRE DE REPONSE OSCILLATEUR EN PSEUDO ACCELERATION ABSOLUE --# NAPPE SRO FONCTION DE AMORTISSEMENT --#------------------------------------------------------------------------ --SROXY=CALC_FONCTION( -- SPEC_OSCI=_F( -- FONCTION=ACCELH1, -- AMOR_REDUIT=(0.02,0.05,0.10), -- NORME=9.81, -- ), -- ) --SROZ=CALC_FONCTION( -- SPEC_OSCI=_F( -- FONCTION=ACCELV1, -- AMOR_REDUIT=(0.02,0.05,0.10), -- NORME=9.81, -- ), -- ) -- -- --#----------------------------------------------- --# REPONSE SPECTRALE SANS CORRECTION STATIQUE --#----------------------------------------------- --SPEC=COMB_SISM_MODAL( -- MODE_MECA=MODES, -- AMOR_REDUIT=0.02, -- MASS_INER=MASSINER, -- EXCIT=_F( -- MONO_APPUI='OUI', -- TRI_SPEC='OUI', -- SPEC_OSCI=(SROXY,SROXY,SROZ), -- ECHELLE=(9.81,9.81,9.81),), -- COMB_MODE=_F(TYPE='CQC',), -- COMB_DIRECTION=_F( TYPE = 'QUAD',), -- OPTION=( -- 'DEPL', -- 'EFGE_ELNO_DEPL', -- ), -- ) -- --EFSPEC=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_SPEC', -- GROUP_NO='GNSTR01', -- RESULTAT=SPEC, -- NOM_CHAM='EFGE_ELNO_DEPL', -- NUME_ORDRE=4, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=EFSPEC, -- FORMAT='TABLEAU', -- ) -- --DPSPEC=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_SPEC', -- GROUP_NO='GNSTR01', -- RESULTAT=SPEC, -- NOM_CHAM='DEPL', -- NUME_ORDRE=4, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=DPSPEC, -- FORMAT='TABLEAU', -- ) -- -- -- --FIN() -- -- -- -- -- -- diff --cc Tests/testcomm7/g.comm index 8756209b,8756209b..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/g.comm +++ /dev/null @@@ -1,11 -1,11 +1,0 @@@ --DEBUT() --sensible=[2.1E11, 0.3, 1.E-6, 1.E-6, ] -- --# parse: -affectation --n=len(sensible) --PS=[None]*n -- --#for i in range(n): --# PS[i]=DEFI_PARA_SENSI(VALE=sensible[i]) -- --FIN() diff --cc Tests/testcomm7/hplp101b.comm index f6f66257,f6f66257..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm7/hplp101b.comm +++ /dev/null @@@ -1,115 -1,115 +1,0 @@@ --# MODIF DATE 09/05/2006 AUTEUR REZETTE C.REZETTE --# TITRE FISSURE AU CENTRE D'UNE PLAQUE MINCE RECTANGULAIRE FAISANT --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2004 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. --# ====================================================================== --# OBSTACLE A UN FLUC DE CHALEUR UNIFORME EN MILIEU ISOTROPE --# --# TESTE LES DERIVEES DE G DANS LE CAS D'UN CHARGEMENT EN FORCE DE VOLUME -- --DEBUT( CODE=_F( NOM = 'HPLP101B',NIV_PUB_WEB='INTERNET')) -- --YOUNG = DEFI_PARA_SENSI(VALE=1.) --FORC = DEFI_PARA_SENSI(VALE=1.) -- --MA=LIRE_MAILLAGE( ) -- --MA=DEFI_GROUP( reuse=MA, MAILLAGE=MA, -- CREA_GROUP_NO=_F( -- GROUP_MA = ( 'LP9P10', 'LP9P10B', -- 'LP8P9', 'LP8P9B', -- )) -- ) -- --MO=AFFE_MODELE( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- PHENOMENE = 'MECANIQUE', -- MODELISATION = 'C_PLAN') -- ) --ZERO = DEFI_CONSTANTE(VALE=0.) --NU = DEFI_CONSTANTE(VALE=0.3) --ALPHA = DEFI_CONSTANTE(VALE=0.) -- --MAT=DEFI_MATERIAU(ELAS_FO=_F( E = YOUNG, NU = NU, -- TEMP_DEF_ALPHA =20., -- ALPHA = ALPHA, RHO=7800.,)) -- --CHMAT=AFFE_MATERIAU( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- MATER = MAT) -- ) -- --CH=AFFE_CHAR_MECA_F( MODELE=MO, -- FORCE_INTERNE=_F(TOUT='OUI',FY=FORC,), -- DDL_IMPO=( -- _F( GROUP_NO = 'LP8P9', -- DX = ZERO), -- _F( GROUP_NO = 'LP8P9B', -- DX = ZERO), -- _F( GROUP_NO = 'P11', -- DY = ZERO)) -- ) -- --DEP=MECA_STATIQUE( MODELE=MO, CHAM_MATER=CHMAT, -- SENSIBILITE = (FORC), -- EXCIT=_F( CHARGE = CH), -- ) -- --DEP=CALC_ELEM(reuse=DEP,RESULTAT=DEP, -- SENSIBILITE = (FORC), -- OPTION=('EPSI_ELGA_DEPL','SIEF_ELGA_DEPL',),) -- --FOND=DEFI_FOND_FISS( MAILLAGE=MA, -- FOND_FISS=_F( GROUP_NO = ('P0',)), -- NORMALE=(0., 1., 0.,) -- ) -- --THETA0=CALC_THETA( MODELE=MO, -- THETA_2D=_F( GROUP_NO = ('P0',), -- MODULE = 1., -- R_INF = 3.75E-5, -- R_SUP = 7.50E-5), -- DIRECTION=(1., 0., 0.,) -- ) -- --FIN() -- --THETA01=CALC_THETA( MODELE=MO, -- THETA_2D=_F( GROUP_NO = ('P0',), -- MODULE = 1., -- R_INF = 7.50E-5, -- R_SUP = 1.125E-4), -- DIRECTION=(1., 0., 0.,) -- ) -- --# --# DERIVEE PAR RAPPORT A E --# -- --DEP2=MECA_STATIQUE( MODELE=MO, CHAM_MATER=CHMAT, -- SENSIBILITE = (YOUNG), -- EXCIT=_F( CHARGE = CH), -- ) -- --DEP2=CALC_ELEM(reuse=DEP2,RESULTAT=DEP2, -- SENSIBILITE = (YOUNG), -- OPTION=('EPSI_ELGA_DEPL','SIEF_ELGA_DEPL',),) -- -- -- --FIN() -- diff --cc Tests/testcomm7/incmat.comm index 705a1cbd,705a1cbd..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/incmat.comm +++ /dev/null @@@ -1,7 -1,7 +1,0 @@@ --DEBUT() --MA=LIRE_MAILLAGE() --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) -- --FIN() diff --cc Tests/testcomm7/param1.comm index 79172614,79172614..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/param1.comm +++ /dev/null @@@ -1,36 -1,36 +1,0 @@@ -- --DEBUT() --TEMP_MOY=50. --coef0 = 1.E-3 -- --A0=DEFI_FONCTION( NOM_PARA='TEMP', -- PROL_DROITE='EXCLU', -- PROL_GAUCHE='EXCLU', -- VALE=( -- 20. ,14.7 *coef0, -- 50. ,15.2 *coef0, -- 100. ,15.8 *coef0, -- 150. ,16.7 *coef0, -- 200. ,17.2 *coef0, -- 250. ,18. *coef0, -- 300. ,18.6 *coef0, -- 350. ,19.3 *coef0, -- 400. ,20. *coef0, -- 450. ,20.5 *coef0, -- 500. ,21.1 *coef0, -- 550. ,21.7 *coef0, -- 600. ,22.2 *coef0, -- 650. ,22.7 *coef0, -- 700. ,23.2 *coef0, -- 750. ,23.7 *coef0, -- 800. ,24.1 *coef0, -- 950. ,26.67 *coef0, -- 1150. ,29.24 *coef0, -- 1370. ,32.06 *coef0, -- )) -- --DEFI_MATERIAU( ELAS=_F( RHO = 1.E08, -- NU = 0.3, -- E = A0(TEMP_MOY))) -- --FIN() diff --cc Tests/testcomm7/param2.com0 index 2d32a387,2d32a387..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/param2.com0 +++ /dev/null @@@ -1,4 -1,4 +1,0 @@@ --POURSUITE(); --l1=DEFI_LIST_ENTI(DEBUT=mon_param,); --FIN(); -- diff --cc Tests/testcomm7/param2.comm index 19c8eeb2,19c8eeb2..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/param2.comm +++ /dev/null @@@ -1,4 -1,4 +1,0 @@@ --DEBUT(); --mon_param = 2; --m=LIRE_MAILLAGE() --FIN(); diff --cc Tests/testcomm7/param3.11 index 236ca5ca,236ca5ca..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/param3.11 +++ /dev/null @@@ -1,2 -1,2 +1,0 @@@ --x=45 --y=77 diff --cc Tests/testcomm7/param3.12 index 2c2a2157,2c2a2157..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/param3.12 +++ /dev/null @@@ -1,1 -1,1 +1,0 @@@ --d=5;f=7 diff --cc Tests/testcomm7/param3.com0 index d5a0bbf5,d5a0bbf5..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/param3.com0 +++ /dev/null @@@ -1,11 -1,11 +1,0 @@@ --POURSUITE(); --l1=DEFI_LIST_ENTI(DEBUT=2*mon_param+1,); --l2=DEFI_LIST_ENTI(DEBUT=a[1]); --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) --INCLUDE(UNITE=11) --INCLUDE(UNITE=12) -- --FIN(); -- diff --cc Tests/testcomm7/param3.comm index b7a38ea2,b7a38ea2..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/param3.comm +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --DEBUT(); --mon_param = 2; --m=LIRE_MAILLAGE() --a=[1,2,3,4];b=2 --FIN(); diff --cc Tests/testcomm7/pars1.comm index 53e7f325,53e7f325..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/pars1.comm +++ /dev/null @@@ -1,61 -1,61 +1,0 @@@ --DEBUT() --a=1 # comment --c=32.3 # comment -- --aa='string # bizarre' --a="string # bizarre" -- --b="string ( bizarre" -- --d="""string multi --line --""" --e="""string multi # ssssssssssss --line --""" --P='''string # bizarre' #profondeur ' # autre --bbb''' -- --#comment --#comment --#comment -- --#commenta --##XXXX=CHARGE(RAYON=0.1E-2,VALE=(0.12E-1,0.54E-5,0.1),MCF=_F(VALE=0.3E-5), --## V="toto", -- ## ) --#commentb -- --##CH=CHARGE(RAYON=0.1E-2,VALE=(0.12E-1,0.54E-5,0.1),MCF=_F(VALE=0.3E-5), --## MCF2=(_F(VALE=0.3E-4,GROUP_MA='GMA0601'),_F(VALE=0.3E-2)), --## VALE_C=[0.12E-3,0.54E-1,0.1], -- ## ) --MA=LIRE_MAILLAGE() --a=(10, --#commentc --12,13) -- --#commentd --P=1 #profondeur --#commente --aaa=(10, --11, #commentc --12,13) --xx=EVAL("13.26") -- --fmt_raison='-'*80+''' -- -- Exception erreur_Fatale interceptee -- Raison : %s -- --'''+'-'*80+'xxxxxxxxxxxxxxxx\n' -- --# commen """ --# commen ''' --# commen ' --# commen " --BETA=3.41557E-08 -- --a=8.3 ; #position -- --FIN() diff --cc Tests/testcomm7/parseur.comm index 92aaf898,92aaf898..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/parseur.comm +++ /dev/null @@@ -1,74 -1,74 +1,0 @@@ --DEBUT() --P1 = 9.8; -- --P2 = 8.8; -- --P3 = 7; -- --P5 = P3*P1; -- --P6 = P1-3; -- --P4 = [2,3,4]; -- --a = 1. --b=3 --c= 3 * 5 --cc="b+3" --d= 4 + \ -- 5 \ -- -4 --e=LIRE_MAILLAGE() --##MA=LIRE_MAILLAGE() --x=(1,2) --y=[3, --#comme --4] --z="a" --zz='v' --u='''aaaa --bbbb''' --#ne marche pas avec le parseur actuel --#if 1: --# a=45 --#else: --# a=5.6 --d={"a":0} --e={"a":0, --#comme --"d":4} --#ne marche pas avec le parseur actuel --#a==1 --s="-"*80 --fmt_raison='-'*80+''' -- -- Exception erreur_Fatale interceptee -- Raison : %s -- --'''+'-'*80+'xxxxxxxxxxxxxxxx\n' -- --# commen """ --# commen ''' --# commen ' --# commen " --BETA=3.41557E-08 -- --C_0=105.7 -- --C_EQ_I05=69.1 -- --C_EQ_E05=69.1 -- --C_EQ_I10=51.6 -- --C_EQ_E10=69.1 -- --FL_INT05 = FORMULE(NOM_PARA='TEMP',VALE=''' --(0.5*BETA / ((C_0 - C_EQ_I05 )**2) -- * (TEMP - (2.*C_0 - C_EQ_I05 ))*(TEMP - C_EQ_I05 ))''') -- --zz=8.9; --#ne marche pas avec le parseur actuel --#zz=8.9;aa=10 #position -- --FIN() diff --cc Tests/testcomm7/testcomm.py index 7e9432eb,a44d5f78..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/testcomm.py +++ /dev/null @@@ -1,70 -1,70 +1,0 @@@ --import os,glob,sys --import unittest --import difflib -- --import prefs --from InterfaceTK import appli -- --def add_param(j,pos,nom,valeur): - co=j.addentite("PARAMETRE",pos) - co.set_nom(nom) - co=j.addEntite("PARAMETRE",pos) - co.setNom(nom) -- co.set_valeur(valeur) -- return co -- --def add_mcsimp(obj,nom,valeur): - mcs=obj.get_child(nom,restreint='oui') - mcs=obj.getChild(nom,restreint='oui') -- if mcs is None: - pos=obj.get_index_child(nom) - mcs=obj.addentite(nom,pos) - mcs.set_valeur(mcs.eval_val(valeur)) - pos=obj.getIndexChild(nom) - mcs=obj.addEntite(nom,pos) - mcs.set_valeur(mcs.evalVal(valeur)) -- return mcs -- --def cdiff(text1,text2): -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- --class TestCase(unittest.TestCase): -- app=None -- def setUp(self): -- if self.app == None: -- self.app=appli.STANDALONE(version='v7') -- pass -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- -- i=0 -- files= os.path.join(os.path.dirname(__file__),"*.comm") -- for f in glob.glob(files): -- for o in ('3','2','1','0','m'): -- f=f[:-1]+o -- if os.path.isfile(f):break -- -- i=i+1 -- exec """def test%s(self,file="%s"): -- "fichier:%s" -- self.commtest(file) --""" % (i,f,f) -- del i -- -- def commtest(self,file): -- """ Test generique""" -- #print file -- name=os.path.splitext(os.path.basename(file))[0] -- errfile=os.path.join(os.path.dirname(__file__),name+".err") -- err="" -- if os.path.isfile(errfile): -- f=open(errfile) -- err=f.read() -- f.close() -- j=self.app.openJDC(file=file) - assert j.cr.get_mess_exception() == "" - assert j.cr.getMessException() == "" -- -- if err == "": - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- else: -- txt=str(j.report()) -- assert txt == err,cdiff(err,txt) -- - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- j.supprime() -- assert sys.getrefcount(j) == 2,sys.getrefcount(j) diff --cc Tests/testcomm7/titi.comm index a235be8a,a235be8a..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm7/titi.comm +++ /dev/null @@@ -1,69 -1,69 +1,0 @@@ --DEBUT() --YOUNG = DEFI_PARA_SENSI(VALE=1.) --FORC = DEFI_PARA_SENSI(VALE=1.) --MA=LIRE_MAILLAGE() --MA=DEFI_GROUP( reuse=MA, MAILLAGE=MA, -- CREA_GROUP_NO=_F( -- GROUP_MA = ( 'LP9P10', 'LP9P10B', -- 'LP8P9', 'LP8P9B', -- )) -- ) -- --MO=AFFE_MODELE( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- PHENOMENE = 'MECANIQUE', -- MODELISATION = 'C_PLAN') -- ) --ZERO = DEFI_CONSTANTE(VALE=0.) --NU = DEFI_CONSTANTE(VALE=0.3) --ALPHA = DEFI_CONSTANTE(VALE=0.) -- --MAT=DEFI_MATERIAU(ELAS_FO=_F( E = YOUNG, NU = NU, -- TEMP_DEF_ALPHA =20., -- ALPHA = ALPHA, RHO=7800.,)) -- --CHMAT=AFFE_MATERIAU( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- MATER = MAT) -- ) -- --CH=AFFE_CHAR_MECA_F( MODELE=MO, -- FORCE_INTERNE=_F(TOUT='OUI',FY=FORC,), -- DDL_IMPO=( -- _F( GROUP_NO = 'LP8P9', -- DX = ZERO), -- _F( GROUP_NO = 'LP8P9B', -- DX = ZERO), -- _F( GROUP_NO = 'P11', -- DY = ZERO)) -- ) -- --DEP=MECA_STATIQUE( MODELE=MO, CHAM_MATER=CHMAT, -- SENSIBILITE = (FORC), -- EXCIT=_F( CHARGE = CH), -- ) -- --DEP=CALC_ELEM(reuse=DEP,RESULTAT=DEP, -- SENSIBILITE = (FORC), -- OPTION=('EPSI_ELGA_DEPL','SIEF_ELGA_DEPL',),) -- --FOND=DEFI_FOND_FISS( MAILLAGE=MA, -- FOND_FISS=_F( GROUP_NO = ('P0',)), -- NORMALE=(0., 1., 0.,) -- ) -- --THETA0=CALC_THETA( MODELE=MO, -- THETA_2D=_F( GROUP_NO = ('P0',), -- MODULE = 1., -- R_INF = 3.75E-5, -- R_SUP = 7.50E-5), -- DIRECTION=(1., 0., 0.,) -- ) -- -- --FIN() --MA1=LIRE_MAILLAGE() --MO1=AFFE_MODELE( MAILLAGE=MA1, AFFE=_F( TOUT = 'OUI', -- PHENOMENE = 'MECANIQUE', MODELISATION = 'C_PLAN')) -- --FIN() diff --cc Tests/testcomm9/a.11 index 1723fcb9,1723fcb9..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/a.11 +++ /dev/null @@@ -1,1 -1,1 +1,0 @@@ --MM=LIRE_MAILLAGE() diff --cc Tests/testcomm9/a.com0 index 04d1cc20,04d1cc20..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/a.com0 +++ /dev/null @@@ -1,3 -1,3 +1,0 @@@ --POURSUITE() --MA=LIRE_MAILLAGE(INFO=inf) --FIN() diff --cc Tests/testcomm9/a.comm index 665f63fe,665f63fe..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/a.comm +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --DEBUT() --inf=1 --p2=inf+1 --p3=sin(p2) --FIN() diff --cc Tests/testcomm9/aa.comm index 124141b4,124141b4..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/aa.comm +++ /dev/null @@@ -1,8 -1,8 +1,0 @@@ --DEBUT() --inf1=1 --MA=LIRE_MAILLAGE(INFO=inf1) --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) -- --FIN() diff --cc Tests/testcomm9/b.comm index 478973df,478973df..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/b.comm +++ /dev/null @@@ -1,9 -1,9 +1,0 @@@ --DEBUT() --a=1 --fmt_raison='-'*80+""" -- -- Exception erreur_Fatale interceptee -- Raison : %s -- --"""+'-'*80+'\n' --FIN() diff --cc Tests/testcomm9/c.comm index a3ac4352,a3ac4352..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/c.comm +++ /dev/null @@@ -1,44 -1,44 +1,0 @@@ --from Numeric import cos --DEBUT() --RAYCRA=1. --EPCRA=0.1 --S_CR=3.1415*(RAYCRA**2-(RAYCRA-EPCRA)**2) --T_CR=3.1415 --NOMF="nomfichier" --n=2 -- --MA=LIRE_MAILLAGE( ) -- --MO=AFFE_MODELE( MAILLAGE=MA, -- #test de validateur GEOM (typ=grma) avec grma derive de GEOM -- AFFE=(_F(GROUP_MA = ('LI1'), -- PHENOMENE = 'MECANIQUE', -- MODELISATION = 'DIS_TR'), -- ), -- INFO=2,); -- --carel=[0.]*78 -- --CAREG=AFFE_CARA_ELEM(MODELE=MO, -- DISCRET=_F(GROUP_MA=('LI1'), -- CARA = 'K_TR_L', -- VALE = carel, -- REPERE='LOCAL' , ), -- ORIENTATION=(_F(GROUP_MA=('LI1',), -- CARA='VECT_Y', -- VALE=(0.,0.,1.),),), -- ); -- --DEFI_FICHIER(UNITE=50, FICHIER='./REPE_OUT/zzzz206a_resu.mail') --#test de validateur LongStr avec parametre instance de PARAMETRE --DEFI_FICHIER(UNITE=50, FICHIER=NOMF) --#test de validateur LongStr avec parametre instance de Formula --u=DEFI_FICHIER( FICHIER=NOMF*2) --DEFI_FICHIER (ACTION='LIBERER',UNITE=50) --#test de validateur d'objet entier (typ='I'), instance de la classe entier --DEFI_FICHIER (ACTION='LIBERER',UNITE=u) -- --# test de validateur qui accepte tout (typ=assd) --IMPR_CO(CONCEPT=_F(NOM=MA)) -- --FIN() diff --cc Tests/testcomm9/cabri02a.comm index 4c858c6f,4c858c6f..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm9/cabri02a.comm +++ /dev/null @@@ -1,78 -1,78 +1,0 @@@ --# MODIF DATE 07/03/2005 AUTEUR CIBHHLV L.VIVAN --# RESPONSABLE MABBAS M.ABBAS --# --# TITRE TEST DE REFERENCE POUR LA MACRO DE CALCUL DE BRIDES CABRI --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2003 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. --# ====================================================================== -- --DEBUT(CODE=_F( NOM = 'CABRI02A',NIV_PUB_WEB='INTRANET')); -- --# DEFINITION DES DONNEES MATERIAUX -- --# Temperature initiale, assemblage libre de contraintes --TEMP_INI=25.0; -- --# Temperature moyenne du transitoire pour calcul de lambda et rhoCp --TEMP_MOY = 170.0; -- --INCLUDE_MATERIAU(NOM_AFNOR='Z2CN1810', -- TYPE_MODELE='REF', -- VARIANTE='A', -- TYPE_VALE='NOMI', -- NOM_MATER='MA_BRI', -- EXTRACTION=_F(COMPOR='THER', -- TEMP_EVAL= TEMP_MOY,), -- UNITE_LONGUEUR='MM'); -- --INCLUDE_MATERIAU(NOM_AFNOR='Z12CN13', -- TYPE_MODELE='REF', -- VARIANTE='A', -- TYPE_VALE='NOMI', -- NOM_MATER='MA_ECR', -- EXTRACTION=_F(COMPOR='THER', -- TEMP_EVAL= TEMP_MOY,), -- UNITE_LONGUEUR='MM',); -- --INCLUDE_MATERIAU(NOM_AFNOR='Z12CN13', -- TYPE_MODELE='REF', -- VARIANTE='A', -- TYPE_VALE='NOMI', -- NOM_MATER='MA_RON', -- EXTRACTION=_F(COMPOR='THER', -- TEMP_EVAL= TEMP_MOY,), -- UNITE_LONGUEUR='MM',); -- --INCLUDE_MATERIAU(NOM_AFNOR='Z2CN1810', -- TYPE_MODELE='REF', -- VARIANTE='A', -- TYPE_VALE='NOMI', -- NOM_MATER='MA_GOU', -- EXTRACTION=_F(COMPOR='THER', -- TEMP_EVAL= TEMP_MOY,), -- UNITE_LONGUEUR='MM',); -- --INCLUDE_MATERIAU(NOM_AFNOR='Z6CND1712', -- TYPE_MODELE='REF', -- VARIANTE='A', -- TYPE_VALE='NOMI', -- NOM_MATER='MA_LIM', -- EXTRACTION=_F(COMPOR='THER', -- TEMP_EVAL= TEMP_MOY,), -- UNITE_LONGUEUR='MM',); -- --FIN(); diff --cc Tests/testcomm9/d.comm index 06bd2405,06bd2405..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/d.comm +++ /dev/null @@@ -1,4 -1,4 +1,0 @@@ --DEBUT() --a=1 --MA=LIRE_MAILLAGE() --FIN() diff --cc Tests/testcomm9/e.comm index 15bf3261,15bf3261..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/e.comm +++ /dev/null @@@ -1,70 -1,70 +1,0 @@@ --DEBUT() --MAYA=LIRE_MAILLAGE() -- --MAYA=DEFI_GROUP( reuse=MAYA, MAILLAGE=MAYA, -- CREA_GROUP_MA=_F( NOM = 'TOUT', TOUT = 'OUI')) -- --BARRE1=AFFE_MODELE( MAILLAGE=MAYA, -- AFFE=_F( GROUP_MA='SS1', -- MODELISATION = 'POU_D_E', -- PHENOMENE = 'MECANIQUE')) --# --MATERIO1=DEFI_MATERIAU( ELAS=_F( RHO = 1.E08, NU = 0.3, E = 1.E10)) -- --MATERIO2=DEFI_MATERIAU( ELAS=_F( RHO = 0., NU = 0., E = 1.E15)) --# --CHMAT=AFFE_MATERIAU( MAILLAGE=MAYA,AFFE=( -- #_F( TOUT = 'OUI', MATER = MATERIO1), -- _F( GROUP_MA = 'SS1', MATER = MATERIO1), -- _F( GROUP_MA = 'SS2', MATER = MATERIO1), -- _F( GROUP_MA = 'SS3', MATER = MATERIO1), -- _F( GROUP_MA = 'RIGIDE', MATER = MATERIO2), --)) # commentaire test -- --CARA1=AFFE_CARA_ELEM( MODELE=BARRE1, -- POUTRE=_F( -- GROUP_MA = 'TOUT', -- SECTION = 'CERCLE', -- CARA = ('R', 'EP',), -- VALE = (0.1, 0.01,))) -- --GUIDAGE1=AFFE_CHAR_MECA( MODELE=BARRE1,DDL_IMPO=( -- _F( GROUP_MA='SS1', -- DX = 0., DZ = 0., DRX = 0., DRY = 0.), -- _F( GROUP_NO = 'L1', DY = 0., DRZ = 0.), -- )) -- --K_ELEM1=CALC_MATR_ELEM( MODELE=BARRE1, -- CARA_ELEM=CARA1, -- CHAM_MATER=CHMAT, -- OPTION='RIGI_MECA', -- CHARGE=GUIDAGE1) -- --NUM1=NUME_DDL( MATR_RIGI=K_ELEM1) -- --# --K_ASSE1=ASSE_MATRICE( MATR_ELEM=K_ELEM1, -- NUME_DDL=NUM1) -- --MODESTA1=MODE_STATIQUE( MATR_RIGI=K_ASSE1, -- MODE_STAT=_F( -- GROUP_NO=('L12'), -- AVEC_CMP = ('DY','DRZ'), -- )) -- --# parse: -affectation -- --DS1=[None]*5 --DS2=[None]*5 --DS3=[None]*5 --DS4=[None]*5 --CHS1=[None]*5 --CHS2=[None]*5 -- --# parse: +affectation -- --#for k in range(1,5): --# DS1[k] = CREA_CHAMP( OPERATION='EXTR', TYPE_CHAM='NOEU_DEPL_R', --# RESULTAT= MODESTA1, NUME_ORDRE=k, NOM_CHAM = 'DEPL'); -- --FIN() diff --cc Tests/testcomm9/efica01a.11 index bec37b5b,bec37b5b..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/efica01a.11 +++ /dev/null @@@ -1,19 -1,19 +1,0 @@@ --DEPL2 = FORMULE(NOM_PARA='INST',VALE='sin(OMEGAA*INST)/(OMEGAA**xx)') --DEPLACE2=CALC_FONC_INTERP( FONCTION=DEPL2, -- LIST_PARA=L_INST, -- NOM_PARA='INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE', -- NOM_RESU='DEPL' ) -- --MONO_X=CALC_CHAR_SEISME( MATR_MASS=MASSE, -- DIRECTION=( 1., 0., 0.,), -- MONO_APPUI='OUI' ) -- -- --MACRO_PROJ_BASE(BASE=MODE_MEC,MATR_ASSE_GENE=( -- _F( MATRICE = CO("MASS_GEN"), MATR_ASSE = MASSE), -- _F( MATRICE = CO("RIGI_GEN"), MATR_ASSE = RIGIDITE)), -- VECT_ASSE_GENE=_F( VECTEUR = CO("VECT_X"), VECT_ASSE = MONO_X) -- ) -- diff --cc Tests/testcomm9/efica01a.com0 index 35fe5404,35fe5404..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm9/efica01a.com0 +++ /dev/null @@@ -1,49 -1,49 +1,0 @@@ --POURSUITE(CODE=_F( NOM = 'EFICA01A')) -- --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) -- --CHMAT3=AFFE_MATERIAU( MAILLAGE=MAILLA3, -- AFFE=_F( TOUT='OUI', MATER = MAT3)) -- --riginor = 2.88E7 -- --TRAN_GE2=DYNA_TRAN_MODAL( MASS_GENE=MGEN_BIC, RIGI_GENE=RGEN_BIC, -- METHODE='EULER', -- AMOR_REDUIT=( 0.07, 0.07, ), -- MODE_STAT=MSTA_BIC,EXCIT=( -- _F( VECT_GENE = VECT_X1, ACCE = ACCELER1, -- MULT_APPUI = 'OUI', -- DIRECTION = ( 1., 0., 0.,), NOEUD = 'NO1', -- VITE = VITESSE1, DEPL = DEPLACE1), -- _F( VECT_GENE = VECT_X2, ACCE = ACCELER2, -- MULT_APPUI = 'OUI', -- DIRECTION = ( 1., 0., 0.,), NOEUD = 'NO11', -- VITE = VITESSE2, DEPL = DEPLACE2)), -- CHOC=_F( GROUP_NO_1 = 'MASSES1', -- GROUP_NO_2 = 'MASSES2', -- OBSTACLE = GRILLE, -- INTITULE = 'NO2/NO12', -- NORM_OBST = (0., 0., 1.,), -- DIST_1 = 0.4495, -- DIST_2 = 0.4495, -- RIGI_NOR = riginor, -- AMOR_NOR = 0., -- RIGI_TAN = 0., -- COULOMB = 0.), -- INCREMENT=_F( INST_INIT = 0., INST_FIN = 1., PAS = 0.00025), -- ARCHIVAGE=_F( PAS_ARCH = 8) -- ) -- --LISTIMP=DEFI_LIST_REEL( DEBUT=0., -- INTERVALLE=_F( JUSQU_A = 1., NOMBRE = 500)) -- --RESUA1=REST_GENE_PHYS( RESU_GENE=TRAN_GE1, -- LIST_INST=LISTIMP, -- INTERPOL='LIN', -- NOM_CHAM='DEPL', -- MULT_APPUI='OUI' -- ) -- --FIN() diff --cc Tests/testcomm9/efica01a.comm index 20eea866,20eea866..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm9/efica01a.comm +++ /dev/null @@@ -1,275 -1,275 +1,0 @@@ --# MODIF DATE 20/09/2004 AUTEUR DURAND C.DURAND --# TITRE TEST DE NON REGRESSION DE L IHM EFICAS - DERIVE DE SDND102A --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2001 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. --# ====================================================================== --# Ce cas test est gere en configuration dans la base ASTER, il sert de --# modele pour prononcer la recette de l IHM d EFICAS : l objectif est de --# pouvoir recreer ce test a l identique dans EFICAS a partir d une page --# blanche. --# On a donc essaye d y placer toutes les commandes un peu particulieres --# du langage de commandes d ASTER --# --# Il s agit en fait du test SDND102A auquel on a ajoute : --# la definition d un parametre (VAL) --# l inclusion d un fichier (INCLUDE) --# une poursuite (POURSUITE) --# Il contient ainsi : --# des parametres, des formules, des macros, des mots cles facteurs repetes --# (y compris conditionnes par des regles : calc_fonction / COMB), --# des blocs (mode_iter_simult,calc_char_seisme), un defi_valeur, un parametre. --# --# --# Il faudra y associer quelques recommandations pour la recette : --# - verifier qu en ouvrant le .com0, il demande bien a browser le .comm puis, en cascade, le .11 --# - verifier qu on peut bien supprimer une commande, un mot cle simple et facteur --# - verifier les acces a la doc --# --# -- -- --DEBUT(CODE=_F(NOM='EFICA01A',NIV_PUB_WEB='INTERNET',VISU_EFICAS='NON'),) -- --MAILLAGE=LIRE_MAILLAGE() -- --MAILLAGE=DEFI_GROUP(reuse=MAILLAGE, -- MAILLAGE=MAILLAGE, -- CREA_GROUP_NO=(_F(NOEUD='NO2', -- NOM='MASSES',), -- _F(NOEUD='NO1', -- NOM='ENCASTRE',),),) -- --MAILLA2=LIRE_MAILLAGE(UNITE=21,) -- --MODELE=AFFE_MODELE(MAILLAGE=MAILLAGE, -- AFFE=(_F(GROUP_MA='RESSORT', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO='MASSES', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) -- --BICHOC=AFFE_MODELE(MAILLAGE=MAILLA2, -- AFFE=(_F(GROUP_MA='RESSORTS', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) --VAL = 98696.0 -- -- --CARA_ELE=AFFE_CARA_ELEM(MODELE=MODELE, -- DISCRET=(_F(GROUP_MA='RESSORT', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CARA_BIC=AFFE_CARA_ELEM(MODELE=BICHOC, -- DISCRET=(_F(GROUP_MA='RESSORTS', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES1', -- CARA='M_T_D_N', -- VALE=25.0,), -- _F(GROUP_NO='MASSES2', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CON_LIM=AFFE_CHAR_MECA(MODELE=MODELE, -- DDL_IMPO=(_F(GROUP_NO='ENCASTRE', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO='MASSES', -- DY=0.0, -- DZ=0.0,),),) -- --CL_BICHO=AFFE_CHAR_MECA(MODELE=BICHOC, -- DDL_IMPO=(_F(GROUP_NO='ENCBICHO', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- DY=0.0, -- DZ=0.0,),),) -- --MACRO_MATR_ASSE(MODELE=MODELE, -- CARA_ELEM=CARA_ELE, -- CHARGE=CON_LIM, -- NUME_DDL=CO('NUMEDDL'), -- MATR_ASSE=(_F(MATRICE=CO('RIGIDITE'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASSE'), -- OPTION='MASS_MECA',),),) -- --MACRO_MATR_ASSE(MODELE=BICHOC, -- CARA_ELEM=CARA_BIC, -- CHARGE=CL_BICHO, -- NUME_DDL=CO('NUMDDLC'), -- MATR_ASSE=(_F(MATRICE=CO('RIGI_BIC'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASS_BIC'), -- OPTION='MASS_MECA',),),) -- --MODE_MEC=MODE_ITER_SIMULT(MATR_A=RIGIDITE, -- MATR_B=MASSE,) -- --MODE_MEC=NORM_MODE(reuse =MODE_MEC, -- MODE=MODE_MEC, -- NORME='MASS_GENE',) -- --MODE_BIC=MODE_ITER_SIMULT(MATR_A=RIGI_BIC, -- MATR_B=MASS_BIC, -- METHODE='JACOBI', -- OPTION='SANS', -- CALC_FREQ=_F(OPTION='BANDE', -- FREQ=(1.0,10.0,),),) -- --MODE_BIC=NORM_MODE(reuse =MODE_BIC, -- MODE=MODE_BIC, -- NORME='MASS_GENE',) -- --MODE_STA=MODE_STATIQUE(MATR_RIGI=RIGIDITE, -- MATR_MASS=MASSE, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --MSTA_BIC=MODE_STATIQUE(MATR_RIGI=RIGI_BIC, -- MATR_MASS=MASS_BIC, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --L_INST=DEFI_LIST_REEL(DEBUT=0.0, -- INTERVALLE=_F(JUSQU_A=1.0, -- PAS=1.E-4,),) -- --OMEGAA=2.*pi*10. -- --ACCE1 = FORMULE(VALE = 'sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER1=CALC_FONC_INTERP(FONCTION=ACCE1, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --ACCE2 = FORMULE(VALE = '-sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER2=CALC_FONC_INTERP(FONCTION=ACCE2, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE1 = FORMULE(VALE = '-cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE1=CALC_FONC_INTERP(FONCTION=VITE1, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --DEPL1 = FORMULE(VALE = '-sin(OMEGAA*INST)/(OMEGAA**2)', -- NOM_PARA='INST') -- --DEPLACE1=CALC_FONC_INTERP(FONCTION=DEPL1, -- NOM_RESU='DEPL', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE2 = FORMULE(VALE = 'cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE2=CALC_FONC_INTERP(FONCTION=VITE2, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --xx=2 -- --INCLUDE(UNITE=11, -- INFO=1,) -- --MUR=DEFI_OBSTACLE(TYPE='PLAN_Z',) -- --TRAN_GE1=DYNA_TRAN_MODAL(METHODE='EULER', -- MASS_GENE=MASS_GEN, -- RIGI_GENE=RIGI_GEN, -- AMOR_REDUIT=0.07, -- MODE_STAT=MODE_STA, -- INCREMENT=_F(INST_INIT=0.0, -- INST_FIN=1.0, -- PAS=2.0E-4,), -- ARCHIVAGE=_F(PAS_ARCH=8,), -- EXCIT=_F(VECT_GENE=VECT_X, -- ACCE=ACCELER1, -- VITE=VITESSE1, -- DEPL=DEPLACE1, -- MULT_APPUI='OUI', -- DIRECTION=(1.0,0.0,0.0,), -- NOEUD='NO1',), -- CHOC=_F(INTITULE='NO2/MUR', -- GROUP_NO_1='MASSES', -- OBSTACLE=MUR, -- ORIG_OBST=(-1.0,0.0,0.0,), -- NORM_OBST=(0.0,0.0,1.0,), -- JEU=1.1005, -- RIGI_NOR=5.76E7, -- AMOR_NOR=0.0, -- RIGI_TAN=0.0, -- COULOMB=0.0,),) -- --MULT_X1=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO1',) -- --MULT_X2=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO11',) -- --MACRO_PROJ_BASE(BASE=MODE_BIC, -- MATR_ASSE_GENE=(_F(MATRICE=CO('MGEN_BIC'), -- MATR_ASSE=MASS_BIC,), -- _F(MATRICE=CO('RGEN_BIC'), -- MATR_ASSE=RIGI_BIC,),), -- VECT_ASSE_GENE=(_F(VECTEUR=CO('VECT_X1'), -- VECT_ASSE=MULT_X1,), -- _F(VECTEUR=CO('VECT_X2'), -- VECT_ASSE=MULT_X2,),),) -- --GRILLE=DEFI_OBSTACLE(TYPE='BI_PLAN_Z',) -- --MAILLA3=LIRE_MAILLAGE(UNITE=22,) -- --FIN() diff --cc Tests/testcomm9/efica01b.11 index bec37b5b,bec37b5b..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/efica01b.11 +++ /dev/null @@@ -1,19 -1,19 +1,0 @@@ --DEPL2 = FORMULE(NOM_PARA='INST',VALE='sin(OMEGAA*INST)/(OMEGAA**xx)') --DEPLACE2=CALC_FONC_INTERP( FONCTION=DEPL2, -- LIST_PARA=L_INST, -- NOM_PARA='INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE', -- NOM_RESU='DEPL' ) -- --MONO_X=CALC_CHAR_SEISME( MATR_MASS=MASSE, -- DIRECTION=( 1., 0., 0.,), -- MONO_APPUI='OUI' ) -- -- --MACRO_PROJ_BASE(BASE=MODE_MEC,MATR_ASSE_GENE=( -- _F( MATRICE = CO("MASS_GEN"), MATR_ASSE = MASSE), -- _F( MATRICE = CO("RIGI_GEN"), MATR_ASSE = RIGIDITE)), -- VECT_ASSE_GENE=_F( VECTEUR = CO("VECT_X"), VECT_ASSE = MONO_X) -- ) -- diff --cc Tests/testcomm9/efica01b.comm index 20eea866,20eea866..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm9/efica01b.comm +++ /dev/null @@@ -1,275 -1,275 +1,0 @@@ --# MODIF DATE 20/09/2004 AUTEUR DURAND C.DURAND --# TITRE TEST DE NON REGRESSION DE L IHM EFICAS - DERIVE DE SDND102A --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2001 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. --# ====================================================================== --# Ce cas test est gere en configuration dans la base ASTER, il sert de --# modele pour prononcer la recette de l IHM d EFICAS : l objectif est de --# pouvoir recreer ce test a l identique dans EFICAS a partir d une page --# blanche. --# On a donc essaye d y placer toutes les commandes un peu particulieres --# du langage de commandes d ASTER --# --# Il s agit en fait du test SDND102A auquel on a ajoute : --# la definition d un parametre (VAL) --# l inclusion d un fichier (INCLUDE) --# une poursuite (POURSUITE) --# Il contient ainsi : --# des parametres, des formules, des macros, des mots cles facteurs repetes --# (y compris conditionnes par des regles : calc_fonction / COMB), --# des blocs (mode_iter_simult,calc_char_seisme), un defi_valeur, un parametre. --# --# --# Il faudra y associer quelques recommandations pour la recette : --# - verifier qu en ouvrant le .com0, il demande bien a browser le .comm puis, en cascade, le .11 --# - verifier qu on peut bien supprimer une commande, un mot cle simple et facteur --# - verifier les acces a la doc --# --# -- -- --DEBUT(CODE=_F(NOM='EFICA01A',NIV_PUB_WEB='INTERNET',VISU_EFICAS='NON'),) -- --MAILLAGE=LIRE_MAILLAGE() -- --MAILLAGE=DEFI_GROUP(reuse=MAILLAGE, -- MAILLAGE=MAILLAGE, -- CREA_GROUP_NO=(_F(NOEUD='NO2', -- NOM='MASSES',), -- _F(NOEUD='NO1', -- NOM='ENCASTRE',),),) -- --MAILLA2=LIRE_MAILLAGE(UNITE=21,) -- --MODELE=AFFE_MODELE(MAILLAGE=MAILLAGE, -- AFFE=(_F(GROUP_MA='RESSORT', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO='MASSES', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) -- --BICHOC=AFFE_MODELE(MAILLAGE=MAILLA2, -- AFFE=(_F(GROUP_MA='RESSORTS', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',),),) --VAL = 98696.0 -- -- --CARA_ELE=AFFE_CARA_ELEM(MODELE=MODELE, -- DISCRET=(_F(GROUP_MA='RESSORT', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CARA_BIC=AFFE_CARA_ELEM(MODELE=BICHOC, -- DISCRET=(_F(GROUP_MA='RESSORTS', -- REPERE='GLOBAL', -- CARA='K_T_D_L', -- VALE=(VAL,0.0,0.0,),), -- _F(GROUP_NO='MASSES1', -- CARA='M_T_D_N', -- VALE=25.0,), -- _F(GROUP_NO='MASSES2', -- CARA='M_T_D_N', -- VALE=25.0,),),) -- --CON_LIM=AFFE_CHAR_MECA(MODELE=MODELE, -- DDL_IMPO=(_F(GROUP_NO='ENCASTRE', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO='MASSES', -- DY=0.0, -- DZ=0.0,),),) -- --CL_BICHO=AFFE_CHAR_MECA(MODELE=BICHOC, -- DDL_IMPO=(_F(GROUP_NO='ENCBICHO', -- DX=0.0, -- DY=0.0, -- DZ=0.0,), -- _F(GROUP_NO=('MASSES1','MASSES2',), -- DY=0.0, -- DZ=0.0,),),) -- --MACRO_MATR_ASSE(MODELE=MODELE, -- CARA_ELEM=CARA_ELE, -- CHARGE=CON_LIM, -- NUME_DDL=CO('NUMEDDL'), -- MATR_ASSE=(_F(MATRICE=CO('RIGIDITE'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASSE'), -- OPTION='MASS_MECA',),),) -- --MACRO_MATR_ASSE(MODELE=BICHOC, -- CARA_ELEM=CARA_BIC, -- CHARGE=CL_BICHO, -- NUME_DDL=CO('NUMDDLC'), -- MATR_ASSE=(_F(MATRICE=CO('RIGI_BIC'), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO('MASS_BIC'), -- OPTION='MASS_MECA',),),) -- --MODE_MEC=MODE_ITER_SIMULT(MATR_A=RIGIDITE, -- MATR_B=MASSE,) -- --MODE_MEC=NORM_MODE(reuse =MODE_MEC, -- MODE=MODE_MEC, -- NORME='MASS_GENE',) -- --MODE_BIC=MODE_ITER_SIMULT(MATR_A=RIGI_BIC, -- MATR_B=MASS_BIC, -- METHODE='JACOBI', -- OPTION='SANS', -- CALC_FREQ=_F(OPTION='BANDE', -- FREQ=(1.0,10.0,),),) -- --MODE_BIC=NORM_MODE(reuse =MODE_BIC, -- MODE=MODE_BIC, -- NORME='MASS_GENE',) -- --MODE_STA=MODE_STATIQUE(MATR_RIGI=RIGIDITE, -- MATR_MASS=MASSE, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --MSTA_BIC=MODE_STATIQUE(MATR_RIGI=RIGI_BIC, -- MATR_MASS=MASS_BIC, -- MODE_STAT=_F(TOUT='OUI', -- AVEC_CMP='DX',),) -- --L_INST=DEFI_LIST_REEL(DEBUT=0.0, -- INTERVALLE=_F(JUSQU_A=1.0, -- PAS=1.E-4,),) -- --OMEGAA=2.*pi*10. -- --ACCE1 = FORMULE(VALE = 'sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER1=CALC_FONC_INTERP(FONCTION=ACCE1, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --ACCE2 = FORMULE(VALE = '-sin(OMEGAA*INST)', -- NOM_PARA='INST') -- --ACCELER2=CALC_FONC_INTERP(FONCTION=ACCE2, -- NOM_RESU='ACCE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE1 = FORMULE(VALE = '-cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE1=CALC_FONC_INTERP(FONCTION=VITE1, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --DEPL1 = FORMULE(VALE = '-sin(OMEGAA*INST)/(OMEGAA**2)', -- NOM_PARA='INST') -- --DEPLACE1=CALC_FONC_INTERP(FONCTION=DEPL1, -- NOM_RESU='DEPL', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --VITE2 = FORMULE(VALE = 'cos(OMEGAA*INST)/OMEGAA', -- NOM_PARA='INST') -- --VITESSE2=CALC_FONC_INTERP(FONCTION=VITE2, -- NOM_RESU='VITE', -- LIST_PARA=L_INST, -- NOM_PARA = 'INST', -- PROL_DROITE='LINEAIRE', -- PROL_GAUCHE='LINEAIRE',) -- --xx=2 -- --INCLUDE(UNITE=11, -- INFO=1,) -- --MUR=DEFI_OBSTACLE(TYPE='PLAN_Z',) -- --TRAN_GE1=DYNA_TRAN_MODAL(METHODE='EULER', -- MASS_GENE=MASS_GEN, -- RIGI_GENE=RIGI_GEN, -- AMOR_REDUIT=0.07, -- MODE_STAT=MODE_STA, -- INCREMENT=_F(INST_INIT=0.0, -- INST_FIN=1.0, -- PAS=2.0E-4,), -- ARCHIVAGE=_F(PAS_ARCH=8,), -- EXCIT=_F(VECT_GENE=VECT_X, -- ACCE=ACCELER1, -- VITE=VITESSE1, -- DEPL=DEPLACE1, -- MULT_APPUI='OUI', -- DIRECTION=(1.0,0.0,0.0,), -- NOEUD='NO1',), -- CHOC=_F(INTITULE='NO2/MUR', -- GROUP_NO_1='MASSES', -- OBSTACLE=MUR, -- ORIG_OBST=(-1.0,0.0,0.0,), -- NORM_OBST=(0.0,0.0,1.0,), -- JEU=1.1005, -- RIGI_NOR=5.76E7, -- AMOR_NOR=0.0, -- RIGI_TAN=0.0, -- COULOMB=0.0,),) -- --MULT_X1=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO1',) -- --MULT_X2=CALC_CHAR_SEISME(MATR_MASS=MASS_BIC, -- DIRECTION=(1.0,0.0,0.0,), -- MODE_STAT=MSTA_BIC, -- NOEUD='NO11',) -- --MACRO_PROJ_BASE(BASE=MODE_BIC, -- MATR_ASSE_GENE=(_F(MATRICE=CO('MGEN_BIC'), -- MATR_ASSE=MASS_BIC,), -- _F(MATRICE=CO('RGEN_BIC'), -- MATR_ASSE=RIGI_BIC,),), -- VECT_ASSE_GENE=(_F(VECTEUR=CO('VECT_X1'), -- VECT_ASSE=MULT_X1,), -- _F(VECTEUR=CO('VECT_X2'), -- VECT_ASSE=MULT_X2,),),) -- --GRILLE=DEFI_OBSTACLE(TYPE='BI_PLAN_Z',) -- --MAILLA3=LIRE_MAILLAGE(UNITE=22,) -- --FIN() diff --cc Tests/testcomm9/f.comm index d15a6179,d15a6179..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/f.comm +++ /dev/null @@@ -1,18 -1,18 +1,0 @@@ --from Numeric import size -- --DEBUT() -- --# Definition des parametres de l'excitation sinusoidale --freq=1500.0 --periode=1.0/freq --pas=periode/100.0 -- --LISTTM=DEFI_LIST_REEL(DEBUT=0.0*periode, -- INTERVALLE=_F(JUSQU_A=100.0*periode, -- PAS=pas,),); -- --LISTRD=DEFI_LIST_REEL(DEBUT=(98.0)*periode+pas, -- INTERVALLE=_F(JUSQU_A=(100.0)*periode, -- PAS=pas,),); -- --FIN() diff --cc Tests/testcomm9/forma12c.22 index 1452b8f2,1452b8f2..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm9/forma12c.22 +++ /dev/null @@@ -1,5616 -1,5616 +1,0 @@@ --ACCELH1=DEFI_FONCTION(NOM_PARA='INST', -- VALE= -- ( -- 0.0 , 0.0 , -- 5.000000000000000E-03 , 1.384945820672120E-02 , -- 1.000000000000000E-02 , 1.382919843991470E-02 , -- 1.500000000000000E-02 , 1.382973754982250E-02 , -- 2.000000000000000E-02 , 1.383338152282280E-02 , -- 2.500000000000000E-02 , 1.393648950771420E-02 , -- 3.000000000000000E-02 , 1.434779984741860E-02 , -- 3.500000000000000E-02 , 1.512950713231800E-02 , -- 4.000000000000000E-02 , 1.614535272002630E-02 , -- 4.500000000000000E-02 , 1.731995083544010E-02 , -- 5.000000000000000E-02 , 1.859624623558040E-02 , -- 5.500000000000000E-02 , 1.953967672923960E-02 , -- 6.000000000000000E-02 , 1.941781110418540E-02 , -- 6.500000000000000E-02 , 1.786343830924350E-02 , -- 7.000000000000001E-02 , 1.516191250319950E-02 , -- 7.500000000000000E-02 , 1.188464893531830E-02 , -- 8.000000000000000E-02 , 8.604671706807470E-03 , -- 8.500000000000001E-02 , 5.843238016204390E-03 , -- 9.000000000000000E-02 , 3.844393537029640E-03 , -- 9.500000000000000E-02 , 2.578831760615030E-03 , -- 0.1 , 2.285337760842440E-03 , -- 0.105 , 3.429647164261850E-03 , -- 0.11 , 5.693975593542530E-03 , -- 0.115 , 8.059677068797949E-03 , -- 0.12 , 1.074690536157120E-02 , -- 0.125 , 1.570430547663250E-02 , -- 0.13 , 2.370085802024690E-02 , -- 0.135 , 3.228248728765840E-02 , -- 0.14 , 3.854420890726100E-02 , -- 0.145 , 4.255105840524570E-02 , -- 0.15 , 4.542487497977820E-02 , -- 0.155 , 4.522394778102340E-02 , -- 0.16 , 3.829095514459380E-02 , -- 0.165 , 2.483633029107950E-02 , -- 0.17 , 9.962011825963081E-03 , -- 0.175 , -1.690338763720670E-03 , -- 0.18 , -9.628765294085771E-03 , -- 0.185 , -1.491533457160890E-02 , -- 0.19 , -1.675574249783150E-02 , -- 0.195 , -1.397302390604700E-02 , -- 0.2 , -8.394257392452909E-03 , -- 0.205 , -4.066198655663860E-03 , -- 0.21 , -2.824511823738000E-03 , -- 0.215 , -2.617183840945080E-03 , -- 0.22 , -1.417346427510000E-03 , -- 0.225 , -1.143002215953450E-03 , -- 0.23 , -5.114862179520550E-03 , -- 0.235 , -1.257393226409120E-02 , -- 0.24 , -2.009825306788950E-02 , -- 0.245 , -2.922606396367100E-02 , -- 0.25 , -4.681398923377460E-02 , -- 0.255 , -7.440515051138789E-02 , -- 0.26 , -0.10334790104033 , -- 0.265 , -0.12586697159281 , -- 0.27 , -0.14387794464775 , -- 0.275 , -0.15814759425273 , -- 0.28 , -0.15645166862504 , -- 0.285 , -0.12686021613717 , -- 0.29 , -7.870738657620450E-02 , -- 0.295 , -3.337529798013800E-02 , -- 0.3 , 4.960493246599410E-03 , -- 0.305 , 5.045559596258160E-02 , -- 0.31 , 0.105226085321393 , -- 0.315 , 0.149377859842677 , -- 0.32 , 0.169404090056596 , -- 0.325 , 0.175768658339062 , -- 0.33 , 0.179795570216475 , -- 0.335 , 0.172362231098084 , -- 0.34 , 0.14178782193451 , -- 0.345 , 9.600009720172401E-02 , -- 0.35 , 4.821844915823450E-02 , -- 0.355 , -4.337533256019430E-03 , -- 0.36 , -6.584719156367530E-02 , -- 0.365 , -0.11836425870338 , -- 0.37 , -0.13733576068719 , -- 0.375 , -0.12352979806305 , -- 0.38 , -9.647458189678811E-02 , -- 0.385 , -6.215705630868780E-02 , -- 0.39 , -1.230416228554950E-02 , -- 0.395 , 4.641921735700460E-02 , -- 0.4 , 8.859572962085120E-02 , -- 0.405 , 9.988862929152570E-02 , -- 0.41 , 9.014811266775360E-02 , -- 0.415 , 7.203047941527541E-02 , -- 0.42 , 4.502398610270280E-02 , -- 0.425 , 6.797639622722420E-03 , -- 0.43 , -3.515202910758360E-02 , -- 0.435 , -7.008994299356780E-02 , -- 0.44 , -9.184195885494270E-02 , -- 0.445 , -9.764578216442391E-02 , -- 0.45 , -8.980199943709211E-02 , -- 0.455 , -7.844678621890611E-02 , -- 0.46 , -7.092648374585479E-02 , -- 0.465 , -5.916134617989510E-02 , -- 0.47 , -2.956966177372460E-02 , -- 0.475 , 1.671374368998170E-02 , -- 0.48 , 6.681414337976969E-02 , -- 0.485 , 0.115921896874314 , -- 0.49 , 0.168522035427266 , -- 0.495 , 0.222448388891968 , -- 0.5 , 0.268501345352512 , -- 0.505 , 0.304492502191568 , -- 0.51 , 0.333201521434027 , -- 0.515 , 0.348912055073103 , -- 0.52 , 0.344336194210705 , -- 0.525 , 0.328357457992693 , -- 0.53 , 0.315639958020935 , -- 0.535 , 0.298753776631336 , -- 0.54 , 0.252828404979867 , -- 0.545 , 0.169993172714936 , -- 0.55 , 6.727059721322880E-02 , -- 0.555 , -4.209915010595060E-02 , -- 0.56 , -0.16027870746769 , -- 0.565 , -0.28051898189652 , -- 0.57 , -0.37473468426368 , -- 0.575 , -0.41761046311846 , -- 0.58 , -0.40704487960185 , -- 0.585 , -0.35317881167887 , -- 0.59 , -0.26473865427636 , -- 0.595 , -0.15439054042026 , -- 0.6 , -4.069603171914010E-02 , -- 0.605 , 6.408493301865420E-02 , -- 0.61 , 0.155029022019142 , -- 0.615 , 0.221244653075603 , -- 0.62 , 0.250448298949297 , -- 0.625 , 0.2498283906321 , -- 0.63 , 0.239493456134941 , -- 0.635 , 0.218886088833644 , -- 0.64 , 0.164337222785859 , -- 0.645 , 7.035013146739150E-02 , -- 0.65 , -3.065825126167990E-02 , -- 0.655 , -0.10313193025801 , -- 0.66 , -0.14127712726139 , -- 0.665 , -0.15425776005121 , -- 0.67 , -0.14167316851909 , -- 0.675 , -0.10137097186279 , -- 0.68 , -4.328536800004760E-02 , -- 0.685 , 2.048801937177380E-02 , -- 0.69 , 8.302000641121640E-02 , -- 0.695 , 0.129331142992423 , -- 0.7 , 0.139601455006784 , -- 0.705 , 0.121227983591054 , -- 0.71 , 0.113005236382458 , -- 0.715 , 0.1379818615802 , -- 0.72 , 0.176308826146499 , -- 0.725 , 0.205232483015008 , -- 0.73 , 0.236700670002903 , -- 0.735 , 0.28518726999873 , -- 0.74 , 0.325155532319882 , -- 0.745 , 0.319888795846513 , -- 0.75 , 0.275055725375209 , -- 0.755 , 0.223753796143942 , -- 0.76 , 0.172075077677344 , -- 0.765 , 0.102710116433296 , -- 0.77 , 2.458158105150330E-02 , -- 0.775 , -2.772090362464080E-02 , -- 0.78 , -4.579263759539020E-02 , -- 0.785 , -5.563702283874560E-02 , -- 0.79 , -6.754184615076410E-02 , -- 0.795 , -5.871706032442020E-02 , -- 0.8 , -1.692509300464670E-02 , -- 0.805 , 3.809918865159700E-02 , -- 0.81 , 9.363878798804159E-02 , -- 0.815 , 0.168712355371222 , -- 0.82 , 0.278043767236916 , -- 0.825 , 0.400260018759297 , -- 0.83 , 0.503549901131272 , -- 0.835 , 0.576593704222666 , -- 0.84 , 0.611464547720466 , -- 0.845 , 0.581774928421811 , -- 0.85 , 0.466685485187298 , -- 0.855 , 0.279469592461024 , -- 0.86 , 4.649599505060000E-02 , -- 0.865 , -0.22611474655397 , -- 0.87 , -0.53742100922433 , -- 0.875 , -0.85597468112981 , -- 0.88 , -1.12858445463436 , -- 0.885 , -1.31964097839003 , -- 0.89 , -1.41810357733099 , -- 0.895 , -1.4129005458435 , -- 0.9 , -1.29047173798494 , -- 0.905 , -1.05919909208997 , -- 0.91 , -0.75411881989804 , -- 0.915 , -0.41406737678731 , -- 0.92 , -7.194360976911091E-02 , -- 0.925 , 0.232932654611786 , -- 0.93 , 0.457448784206965 , -- 0.935 , 0.581369260987795 , -- 0.94 , 0.617884772522987 , -- 0.945 , 0.588638581913632 , -- 0.95 , 0.499594354895777 , -- 0.955 , 0.351854051263097 , -- 0.96 , 0.167285288529307 , -- 0.965 , -1.354817972678980E-02 , -- 0.97 , -0.16506107206104 , -- 0.975 , -0.30020976135865 , -- 0.98 , -0.44800006523462 , -- 0.985 , -0.60571664044792 , -- 0.99 , -0.72882650966723 , -- 0.995 , -0.78150351703968 , -- 1.0 , -0.78325351768449 , -- 1.005 , -0.7804638307994 , -- 1.01 , -0.77907901470961 , -- 1.015 , -0.74044922924701 , -- 1.02 , -0.64794816611668 , -- 1.025 , -0.53653982368824 , -- 1.03 , -0.43590944296704 , -- 1.035 , -0.32196595199848 , -- 1.04 , -0.15803623495676 , -- 1.045 , 4.418314484939760E-02 , -- 1.05 , 0.242865235492215 , -- 1.055 , 0.422391619487335 , -- 1.06 , 0.586878740356939 , -- 1.065 , 0.710461681206935 , -- 1.07 , 0.741340861669433 , -- 1.075 , 0.655713664787049 , -- 1.08 , 0.470616913700976 , -- 1.085 , 0.20656145315631 , -- 1.09 , -0.12112308548803 , -- 1.095 , -0.47118919290136 , -- 1.1 , -0.77786799146278 , -- 1.105 , -0.99394827732625 , -- 1.11 , -1.10304473601585 , -- 1.115 , -1.08949447190265 , -- 1.12 , -0.93583496154967 , -- 1.125 , -0.65727377808015 , -- 1.13 , -0.30107834922153 , -- 1.135 , 9.620828359443580E-02 , -- 1.14 , 0.514013416080853 , -- 1.145 , 0.90642132985077 , -- 1.15 , 1.20374217441116 , -- 1.155 , 1.37257710404611 , -- 1.16 , 1.43303286111545 , -- 1.165 , 1.40075730037501 , -- 1.17 , 1.25846296855354 , -- 1.175 , 1.00832137286648 , -- 1.18 , 0.706462116642059 , -- 1.185 , 0.413493607411118 , -- 1.19 , 0.148293682071222 , -- 1.195 , -8.190792579850280E-02 , -- 1.2 , -0.25000976533114 , -- 1.205 , -0.34497838239222 , -- 1.21 , -0.39991632301279 , -- 1.215 , -0.44361527764964 , -- 1.22 , -0.45948891812011 , -- 1.225 , -0.43276591909851 , -- 1.23 , -0.39819165775721 , -- 1.235 , -0.38929817650006 , -- 1.24 , -0.37545880341991 , -- 1.245 , -0.30998449197619 , -- 1.25 , -0.21624700688801 , -- 1.255 , -0.16343645166853 , -- 1.26 , -0.17391443905321 , -- 1.265 , -0.21919282258219 , -- 1.27 , -0.29688345097037 , -- 1.275 , -0.43984931085551 , -- 1.28 , -0.64071500818847 , -- 1.285 , -0.82875858278133 , -- 1.29 , -0.93796346189032 , -- 1.295 , -0.949512523725 , -- 1.3 , -0.857601537535 , -- 1.305 , -0.65014691427727 , -- 1.31 , -0.34930571456794 , -- 1.315 , -2.752743937664530E-02 , -- 1.32 , 0.246332435481473 , -- 1.325 , 0.45001279080827 , -- 1.33 , 0.58297681321004 , -- 1.335 , 0.636158064092188 , -- 1.34 , 0.611598530544366 , -- 1.345 , 0.543575003876384 , -- 1.35 , 0.472132760127251 , -- 1.355 , 0.4099056501601 , -- 1.36 , 0.349344621324927 , -- 1.365 , 0.282806527352702 , -- 1.37 , 0.200676817565078 , -- 1.375 , 9.097626989587490E-02 , -- 1.38 , -3.844874520206900E-02 , -- 1.385 , -0.1485730750104 , -- 1.39 , -0.19431957586841 , -- 1.395 , -0.15348271845224 , -- 1.4 , -2.614043201034680E-02 , -- 1.405 , 0.177537986918302 , -- 1.41 , 0.435115227256899 , -- 1.415 , 0.705841641151383 , -- 1.42 , 0.939450691097474 , -- 1.425 , 1.09606995057385 , -- 1.43 , 1.16508829271638 , -- 1.435 , 1.17152904343664 , -- 1.44 , 1.15677325221222 , -- 1.445 , 1.14474618562157 , -- 1.45 , 1.13563604509728 , -- 1.455 , 1.136131797716 , -- 1.46 , 1.17059034109195 , -- 1.465 , 1.24349566378999 , -- 1.47 , 1.31555125128714 , -- 1.475 , 1.34451073520553 , -- 1.48 , 1.32767985662737 , -- 1.485 , 1.27338631745007 , -- 1.49 , 1.15790168079473 , -- 1.495 , 0.956521791996786 , -- 1.5 , 0.698290997947875 , -- 1.505 , 0.438367846650034 , -- 1.51 , 0.189519144568428 , -- 1.515 , -6.309865148517370E-02 , -- 1.52 , -0.2907946493572 , -- 1.525 , -0.43414032419491 , -- 1.53 , -0.49035140435209 , -- 1.535 , -0.51769162343818 , -- 1.54 , -0.53944953961898 , -- 1.545 , -0.51762829963883 , -- 1.55 , -0.44905875024602 , -- 1.555 , -0.41047655284131 , -- 1.56 , -0.45801991852189 , -- 1.565 , -0.5452728301642 , -- 1.57 , -0.60180223196739 , -- 1.575 , -0.64090769354799 , -- 1.58 , -0.71776674993069 , -- 1.585 , -0.81770575898523 , -- 1.59 , -0.86693741584294 , -- 1.595 , -0.84067997754846 , -- 1.6 , -0.78353488744314 , -- 1.605 , -0.71744286940014 , -- 1.61 , -0.59774454986713 , -- 1.615 , -0.38171240617319 , -- 1.62 , -8.924731070437070E-02 , -- 1.625 , 0.229074480135456 , -- 1.63 , 0.542610098773165 , -- 1.635 , 0.829628497520742 , -- 1.64 , 1.04494574127203 , -- 1.645 , 1.13156269562082 , -- 1.65 , 1.05624249517991 , -- 1.655 , 0.819935992458342 , -- 1.66 , 0.449565343322086 , -- 1.665 , -2.180707598866940E-03 , -- 1.67 , -0.46040931126981 , -- 1.675 , -0.85138688793934 , -- 1.68 , -1.12388943755807 , -- 1.685 , -1.24657385888904 , -- 1.69 , -1.20179685962043 , -- 1.695 , -0.99981038351547 , -- 1.7 , -0.69163368557204 , -- 1.705 , -0.34742052586021 , -- 1.71 , -1.646326697056420E-02 , -- 1.715 , 0.283945578116849 , -- 1.72 , 0.543028107021654 , -- 1.725 , 0.737133979583192 , -- 1.73 , 0.84487160610996 , -- 1.735 , 0.870212972351319 , -- 1.74 , 0.834700198404195 , -- 1.745 , 0.747170431789498 , -- 1.75 , 0.594410232927394 , -- 1.755 , 0.367486332109475 , -- 1.76 , 8.962182967477010E-02 , -- 1.765 , -0.1883067260291 , -- 1.77 , -0.41613375697166 , -- 1.775 , -0.56543072263443 , -- 1.78 , -0.62930681455469 , -- 1.785 , -0.60967253780204 , -- 1.79 , -0.50702726496872 , -- 1.795 , -0.32533912503295 , -- 1.8 , -9.026946700126549E-02 , -- 1.805 , 0.145429511003968 , -- 1.81 , 0.330819022676906 , -- 1.815 , 0.45222714352563 , -- 1.82 , 0.524252434401283 , -- 1.825 , 0.544685292311812 , -- 1.83 , 0.482635967462947 , -- 1.835 , 0.323118603668567 , -- 1.84 , 9.999214308770410E-02 , -- 1.845 , -0.1356321129448 , -- 1.85 , -0.36128518628156 , -- 1.855 , -0.57322505412043 , -- 1.86 , -0.74566937227067 , -- 1.865 , -0.831111234663 , -- 1.87 , -0.79988891088422 , -- 1.875 , -0.65798317740384 , -- 1.88 , -0.42968513644553 , -- 1.885 , -0.14457167669537 , -- 1.89 , 0.161701689894838 , -- 1.895 , 0.456458659481019 , -- 1.9 , 0.720641473510481 , -- 1.905 , 0.93536449279502 , -- 1.91 , 1.06690148982661 , -- 1.915 , 1.08832474904443 , -- 1.92 , 1.00876475369484 , -- 1.925 , 0.854457298011041 , -- 1.93 , 0.628173977645005 , -- 1.935 , 0.322546940276438 , -- 1.94 , -2.596888473873320E-02 , -- 1.945 , -0.33525384338564 , -- 1.95 , -0.5416882826646 , -- 1.955 , -0.63460201942509 , -- 1.96 , -0.61577036509424 , -- 1.965 , -0.46445342826001 , -- 1.97 , -0.17427091738081 , -- 1.975 , 0.197608608481982 , -- 1.98 , 0.551300717211572 , -- 1.985 , 0.807313151449369 , -- 1.99 , 0.929291756112952 , -- 1.995 , 0.900203655372628 , -- 2.0 , 0.711960914602783 , -- 2.005 , 0.386125888668035 , -- 2.01 , -1.664845298933290E-02 , -- 2.015 , -0.42003837834356 , -- 2.02 , -0.75822166854004 , -- 2.025 , -0.97936810396973 , -- 2.03 , -1.0426579951744 , -- 2.035 , -0.93057240999803 , -- 2.04 , -0.66368034717177 , -- 2.045 , -0.29110991423144 , -- 2.05 , 0.119136312621438 , -- 2.055 , 0.505291402538494 , -- 2.06 , 0.880216899892637 , -- 2.065 , 1.20828770980265 , -- 2.07 , 1.46849325860208 , -- 2.075 , 1.67233522841001 , -- 2.08 , 1.84159238892188 , -- 2.085 , 1.97017314302929 , -- 2.09 , 2.02820005370812 , -- 2.095 , 2.00307389537606 , -- 2.1 , 1.90918679712901 , -- 2.105 , 1.7492164388665 , -- 2.11 , 1.49601732028444 , -- 2.115 , 1.13320644545655 , -- 2.12 , 0.691534368057989 , -- 2.125 , 0.222522846896641 , -- 2.13 , -0.2568718835065 , -- 2.135 , -0.73270869895797 , -- 2.14 , -1.16691560085841 , -- 2.145 , -1.52131308342383 , -- 2.15 , -1.77830659090987 , -- 2.155 , -1.94190868704924 , -- 2.16 , -2.01807428134882 , -- 2.165 , -2.01753841723068 , -- 2.17 , -1.96550102271951 , -- 2.175 , -1.88172547074643 , -- 2.18 , -1.76181108149962 , -- 2.185 , -1.60314470865115 , -- 2.19 , -1.43287068566641 , -- 2.195 , -1.27868078783724 , -- 2.2 , -1.12992856906385 , -- 2.205 , -0.96854903020236 , -- 2.21 , -0.82469988669093 , -- 2.215 , -0.75306712540506 , -- 2.22 , -0.75949831264927 , -- 2.225 , -0.80266627698916 , -- 2.23 , -0.86825465400046 , -- 2.235 , -0.98190873939491 , -- 2.24 , -1.13332846537187 , -- 2.245 , -1.24587809111606 , -- 2.25 , -1.25403636722243 , -- 2.255 , -1.16774949125882 , -- 2.26 , -1.02737996901608 , -- 2.265 , -0.83618584315821 , -- 2.27 , -0.58078051378866 , -- 2.275 , -0.28886675266917 , -- 2.28 , -1.584903466322660E-02 , -- 2.285 , 0.243494185775485 , -- 2.29 , 0.493747779128152 , -- 2.295 , 0.763367558765503 , -- 2.3 , 1.04659160151311 , -- 2.305 , 1.31787059651459 , -- 2.31 , 1.55330513693362 , -- 2.315 , 1.72708398800512 , -- 2.32 , 1.80403390270411 , -- 2.325 , 1.74474528448072 , -- 2.33 , 1.51781565889812 , -- 2.335 , 1.11765857002866 , -- 2.34 , 0.582482410154426 , -- 2.345 , -9.718428438488540E-03 , -- 2.35 , -0.57168637020167 , -- 2.355 , -1.03230607359137 , -- 2.36 , -1.33718623748091 , -- 2.365 , -1.44694517260007 , -- 2.37 , -1.35098612723151 , -- 2.375 , -1.07661964039704 , -- 2.38 , -0.67815732332436 , -- 2.385 , -0.22427774359532 , -- 2.39 , 0.206546911873295 , -- 2.395 , 0.541628296955107 , -- 2.4 , 0.739725635914114 , -- 2.405 , 0.792688071679571 , -- 2.41 , 0.699855261818748 , -- 2.415 , 0.460345996951087 , -- 2.42 , 9.825062680758330E-02 , -- 2.425 , -0.32686436332366 , -- 2.43 , -0.75151572607261 , -- 2.435 , -1.13800924040631 , -- 2.44 , -1.46265919709476 , -- 2.445 , -1.69312259897435 , -- 2.45 , -1.79655595938503 , -- 2.455 , -1.76112116582848 , -- 2.46 , -1.59504402395201 , -- 2.465 , -1.31375304224191 , -- 2.47 , -0.94339622712974 , -- 2.475 , -0.5311872307141 , -- 2.48 , -0.13652655158703 , -- 2.485 , 0.191652831784399 , -- 2.49 , 0.427316277261529 , -- 2.495 , 0.565105289247264 , -- 2.5 , 0.614388715344672 , -- 2.505 , 0.595214227948157 , -- 2.51 , 0.537482815214678 , -- 2.515 , 0.480599475426244 , -- 2.52 , 0.461418219827792 , -- 2.525 , 0.490351150400196 , -- 2.53 , 0.544926077525614 , -- 2.535 , 0.597359901626847 , -- 2.54 , 0.63915145270988 , -- 2.545 , 0.666359147512914 , -- 2.55 , 0.659549902572926 , -- 2.555 , 0.607653814797886 , -- 2.56 , 0.542274304956947 , -- 2.565 , 0.514978623780516 , -- 2.57 , 0.542507936778163 , -- 2.575 , 0.605343596447052 , -- 2.58 , 0.694971250554721 , -- 2.585 , 0.820564438850225 , -- 2.59 , 0.964525817889196 , -- 2.595 , 1.07728875105342 , -- 2.6 , 1.13416623229962 , -- 2.605 , 1.16046452303612 , -- 2.61 , 1.18333170206295 , -- 2.615 , 1.19818806982642 , -- 2.62 , 1.2055342011362 , -- 2.625 , 1.23921335799247 , -- 2.63 , 1.32082369230339 , -- 2.635 , 1.41353565810184 , -- 2.64 , 1.45647248242833 , -- 2.645 , 1.42296156176653 , -- 2.65 , 1.31247243180803 , -- 2.655 , 1.10982597617917 , -- 2.66 , 0.796193729509591 , -- 2.665 , 0.391525367264635 , -- 2.67 , -5.039209232008630E-02 , -- 2.675 , -0.48551296055089 , -- 2.68 , -0.89084690987514 , -- 2.685 , -1.24148991258587 , -- 2.69 , -1.50817716119153 , -- 2.695 , -1.67597297557138 , -- 2.7 , -1.74058611919401 , -- 2.705 , -1.69018703360535 , -- 2.71 , -1.51441737441596 , -- 2.715 , -1.22691360409733 , -- 2.72 , -0.85820811206465 , -- 2.725 , -0.43656402639097 , -- 2.73 , -1.877591162527850E-03 , -- 2.735 , 0.3722134714064 , -- 2.74 , 0.604368486493566 , -- 2.745 , 0.654206094948509 , -- 2.75 , 0.520823349815255 , -- 2.755 , 0.204565302761595 , -- 2.76 , -0.24284766157643 , -- 2.765 , -0.75311719985656 , -- 2.77 , -1.25324781337662 , -- 2.775 , -1.6520239944361 , -- 2.78 , -1.91175925323649 , -- 2.785 , -2.02042853839568 , -- 2.79 , -1.95654753001104 , -- 2.795 , -1.71189367332731 , -- 2.8 , -1.33217954914393 , -- 2.805 , -0.90169171320611 , -- 2.81 , -0.48741397679456 , -- 2.815 , -0.11957680209296 , -- 2.82 , 0.208180180447444 , -- 2.825 , 0.429754499753944 , -- 2.83 , 0.500373556893508 , -- 2.835 , 0.453923556202155 , -- 2.84 , 0.356589274872127 , -- 2.845 , 0.252756610751608 , -- 2.85 , 0.15368816142573 , -- 2.855 , 7.226479768245560E-02 , -- 2.86 , 3.888968358902120E-02 , -- 2.865 , 7.085947846528430E-02 , -- 2.87 , 0.145649387450817 , -- 2.875 , 0.221440328548596 , -- 2.88 , 0.271936154319643 , -- 2.885 , 0.285520971687156 , -- 2.89 , 0.244558483181686 , -- 2.895 , 0.131111505423643 , -- 2.9 , -4.976188706858230E-02 , -- 2.905 , -0.27342387270832 , -- 2.91 , -0.51955671330527 , -- 2.915 , -0.77083790776384 , -- 2.92 , -0.9909431240431 , -- 2.925 , -1.1326860598253 , -- 2.93 , -1.17530215375529 , -- 2.935 , -1.1315547074335 , -- 2.94 , -1.01461371409468 , -- 2.945 , -0.82697517656886 , -- 2.95 , -0.5923950948081 , -- 2.955 , -0.367250148284 , -- 2.96 , -0.19748847576212 , -- 2.965 , -8.287483750208639E-02 , -- 2.97 , 1.205615998459890E-03 , -- 2.975 , 6.700285876984650E-02 , -- 2.98 , 0.142475719272639 , -- 2.985 , 0.272732688275581 , -- 2.99 , 0.498473860216776 , -- 2.995 , 0.815246300242191 , -- 3.0 , 1.17850966940332 , -- 3.005 , 1.5365879707165 , -- 3.01 , 1.83696246846193 , -- 3.015 , 2.01683359177992 , -- 3.02 , 2.02473029766593 , -- 3.025 , 1.85763991176815 , -- 3.03 , 1.55996114842794 , -- 3.035 , 1.19160270003895 , -- 3.04 , 0.817034460759104 , -- 3.045 , 0.512897988315463 , -- 3.05 , 0.347660769303193 , -- 3.055 , 0.341161122643262 , -- 3.06 , 0.460638539442427 , -- 3.065 , 0.655193651694964 , -- 3.07 , 0.871495085561553 , -- 3.075 , 1.04025886670637 , -- 3.08 , 1.0866972125822 , -- 3.085 , 0.97592646156581 , -- 3.09 , 0.732149789609832 , -- 3.095 , 0.404350262104711 , -- 3.1 , 3.450811147404410E-02 , -- 3.105 , -0.3574143716153 , -- 3.11 , -0.67593382755679 , -- 3.115 , -0.85741138771834 , -- 3.12 , -0.88812837843921 , -- 3.125 , -0.79137979090702 , -- 3.13 , -0.59262327029812 , -- 3.135 , -0.31629865744548 , -- 3.14 , -7.233283133936310E-03 , -- 3.145 , 0.273183439196407 , -- 3.15 , 0.478066409829062 , -- 3.155 , 0.58805365224197 , -- 3.16 , 0.593648649534557 , -- 3.165 , 0.483000051126779 , -- 3.17 , 0.254384438681656 , -- 3.175 , -6.624305965878829E-02 , -- 3.18 , -0.4267275966133 , -- 3.185 , -0.81396009231636 , -- 3.19 , -1.1955849391981 , -- 3.195 , -1.53431204255614 , -- 3.2 , -1.79550741772338 , -- 3.205 , -1.95961471169112 , -- 3.21 , -2.02193224868472 , -- 3.215 , -1.98153140879109 , -- 3.22 , -1.83692731893728 , -- 3.225 , -1.59274123405354 , -- 3.23 , -1.26186737186096 , -- 3.235 , -0.85475661028155 , -- 3.24 , -0.37101324608578 , -- 3.245 , 0.104191797011254 , -- 3.25 , 0.444402436394787 , -- 3.255 , 0.80270823947836 , -- 3.26 , 1.15997110726162 , -- 3.265 , 1.495182836989 , -- 3.27 , 1.77744468860316 , -- 3.275 , 1.96545418255327 , -- 3.28 , 2.0238275806165 , -- 3.285 , 1.94070094966571 , -- 3.29 , 1.72718398222401 , -- 3.295 , 1.40473739766314 , -- 3.3 , 1.00200904728279 , -- 3.305 , 0.563540200278601 , -- 3.31 , 0.149874332156587 , -- 3.315 , -0.36080714644631 , -- 3.32 , -0.78705501088032 , -- 3.325 , -0.96779259671266 , -- 3.33 , -0.92388383903371 , -- 3.335 , -0.70129187312547 , -- 3.34 , -0.37633413832281 , -- 3.345 , -4.983212937679970E-02 , -- 3.35 , 0.182525585093038 , -- 3.355 , 0.262197946276188 , -- 3.36 , 0.176793782229557 , -- 3.365 , -5.176420413944920E-02 , -- 3.37 , -0.37933630972585 , -- 3.375 , -0.74271351288949 , -- 3.38 , -1.06375084817712 , -- 3.385 , -1.26478653529069 , -- 3.39 , -1.29047203891782 , -- 3.395 , -1.12256167350094 , -- 3.4 , -0.78075489126115 , -- 3.405 , -0.31359677016703 , -- 3.41 , 0.21274034122224 , -- 3.415 , 0.723339413347021 , -- 3.42 , 1.14216320992711 , -- 3.425 , 1.40285852862188 , -- 3.43 , 1.46353765010519 , -- 3.435 , 1.31751508169454 , -- 3.44 , 0.990610982524745 , -- 3.445 , 0.528518300724784 , -- 3.45 , -1.201464116995880E-02 , -- 3.455 , -0.56495490805526 , -- 3.46 , -1.06256507808036 , -- 3.465 , -1.45449004401942 , -- 3.47 , -1.72216993561753 , -- 3.475 , -1.87372425489139 , -- 3.48 , -1.93012616321294 , -- 3.485 , -1.92125770401275 , -- 3.49 , -1.88683182264746 , -- 3.495 , -1.86489427093378 , -- 3.5 , -1.87314769209702 , -- 3.505 , -1.90576881574645 , -- 3.51 , -1.947112317286 , -- 3.515 , -1.97949862409975 , -- 3.52 , -1.97797423254897 , -- 3.525 , -1.91218852417812 , -- 3.53 , -1.76423764925703 , -- 3.535 , -1.54024679422456 , -- 3.54 , -1.25875344890035 , -- 3.545 , -0.9338632056843 , -- 3.55 , -0.57694094749828 , -- 3.555 , -0.20814045746558 , -- 3.56 , 0.146206363036127 , -- 3.565 , 0.468653953534567 , -- 3.57 , 0.754631835985132 , -- 3.575 , 0.999185044322006 , -- 3.58 , 1.18633789810153 , -- 3.585 , 1.29531712809396 , -- 3.59 , 1.31308664187438 , -- 3.595 , 1.23731524907479 , -- 3.6 , 1.07118836166498 , -- 3.605 , 0.822464072088323 , -- 3.61 , 0.509927368235254 , -- 3.615 , 0.167608567620092 , -- 3.62 , -0.16136132010127 , -- 3.625 , -0.43756626339828 , -- 3.63 , -0.63523583164368 , -- 3.635 , -0.74542737572521 , -- 3.64 , -0.7756133968174 , -- 3.645 , -0.74811092815284 , -- 3.65 , -0.69606885610044 , -- 3.655 , -0.6565734770812 , -- 3.66 , -0.66248883313473 , -- 3.665 , -0.7327889886856 , -- 3.67 , -0.86178796221599 , -- 3.675 , -1.01484775035497 , -- 3.68 , -1.13874812866412 , -- 3.685 , -1.18063976569405 , -- 3.69 , -1.10015331426255 , -- 3.695 , -0.87258642642403 , -- 3.7 , -0.49606882241743 , -- 3.705 , -3.859866915145810E-03 , -- 3.71 , 0.536274174652005 , -- 3.715 , 1.04296495682297 , -- 3.72 , 1.44309287260192 , -- 3.725 , 1.67861157963259 , -- 3.73 , 1.7100067792938 , -- 3.735 , 1.52993945453465 , -- 3.74 , 1.17332394495836 , -- 3.745 , 0.705456146258253 , -- 3.75 , 0.19881090381289 , -- 3.755 , -0.27919234543845 , -- 3.76 , -0.66960551503829 , -- 3.765 , -0.93205155196248 , -- 3.77 , -1.05626273217395 , -- 3.775 , -1.05832450991158 , -- 3.78 , -0.96616376411692 , -- 3.785 , -0.81175596966687 , -- 3.79 , -0.6282915868819 , -- 3.795 , -0.43985996859902 , -- 3.8 , -0.25160708755689 , -- 3.805 , -5.670095344855360E-02 , -- 3.81 , 0.149245250303935 , -- 3.815 , 0.367246556878583 , -- 3.82 , 0.6001728423305 , -- 3.825 , 0.842651059699404 , -- 3.83 , 1.06576976559939 , -- 3.835 , 1.22584984073272 , -- 3.84 , 1.29118905603104 , -- 3.845 , 1.25131649498925 , -- 3.85 , 1.10483834283469 , -- 3.855 , 0.858719957928343 , -- 3.86 , 0.546596899968826 , -- 3.865 , 0.232913780073415 , -- 3.87 , -1.178392373167330E-02 , -- 3.875 , -0.13503158427521 , -- 3.88 , -0.10474649816556 , -- 3.885 , 8.615352677596511E-02 , -- 3.89 , 0.410679548743155 , -- 3.895 , 0.826698146053687 , -- 3.9 , 1.26554832994177 , -- 3.905 , 1.65499072160026 , -- 3.91 , 1.92591491458393 , -- 3.915 , 2.02174681879988 , -- 3.92 , 1.91690039738994 , -- 3.925 , 1.62485068724173 , -- 3.93 , 1.1855690119834 , -- 3.935 , 0.653037378513217 , -- 3.94 , 9.668746640223920E-02 , -- 3.945 , -0.4301741972333 , -- 3.95 , -0.83059880381395 , -- 3.955 , -1.06253651005356 , -- 3.96 , -1.12343783668418 , -- 3.965 , -1.02905594887957 , -- 3.97 , -0.81438063696053 , -- 3.975 , -0.53887343061785 , -- 3.98 , -0.27199822870815 , -- 3.985 , -6.791154597367660E-02 , -- 3.99 , 4.530742217552380E-02 , -- 3.995 , 6.262857784368379E-02 , -- 4.0 , 2.441344328897610E-03 , -- 4.005 , -9.190475922367920E-02 , -- 4.01 , -0.16297517487801 , -- 4.015 , -0.15723894800794 , -- 4.02 , -3.537253515270430E-02 , -- 4.025 , 0.193043922562747 , -- 4.03 , 0.526357119583793 , -- 4.035 , 0.929427363269694 , -- 4.04 , 1.34182501632519 , -- 4.045 , 1.69896106062951 , -- 4.05 , 1.94147299764395 , -- 4.055 , 2.02131168938189 , -- 4.06 , 1.91405493567929 , -- 4.065 , 1.62895808406502 , -- 4.07 , 1.20381890102136 , -- 4.075 , 0.692151048809337 , -- 4.08 , 0.156757509395021 , -- 4.085 , -0.38604102584051 , -- 4.09 , -0.84133083525009 , -- 4.095 , -1.156233699226 , -- 4.1 , -1.33230861444598 , -- 4.105 , -1.38570779035153 , -- 4.11 , -1.34124970345719 , -- 4.115 , -1.23546550701648 , -- 4.12 , -1.10801235519435 , -- 4.125 , -0.98248955079667 , -- 4.13 , -0.86003296814087 , -- 4.135 , -0.73178734822649 , -- 4.14 , -0.59090783838188 , -- 4.145 , -0.43318234968906 , -- 4.15 , -0.25684880447788 , -- 4.155 , -6.856986064204031E-02 , -- 4.16 , 0.113175698843399 , -- 4.165 , 0.263255109728613 , -- 4.17 , 0.35752664561249 , -- 4.175 , 0.378805103678297 , -- 4.18 , 0.323547996037049 , -- 4.185 , 0.206516861655614 , -- 4.19 , 5.649526699216110E-02 , -- 4.195 , -9.378626227851780E-02 , -- 4.2 , -0.21317600878937 , -- 4.205 , -0.27287940125587 , -- 4.21 , -0.25114165876958 , -- 4.215 , -0.14168231890677 , -- 4.22 , 4.361065500048250E-02 , -- 4.225 , 0.279918937448746 , -- 4.23 , 0.535273378579502 , -- 4.235 , 0.773588682574221 , -- 4.24 , 0.958219914615338 , -- 4.245 , 1.05647251768057 , -- 4.25 , 1.0429998608356 , -- 4.255 , 0.904048723430757 , -- 4.26 , 0.64342045751792 , -- 4.265 , 0.283827852947311 , -- 4.27 , -0.13946358577039 , -- 4.275 , -0.58422822501242 , -- 4.28 , -1.00040723456331 , -- 4.285 , -1.33261766567896 , -- 4.29 , -1.53443838788264 , -- 4.295 , -1.58333249912622 , -- 4.3 , -1.48186835325815 , -- 4.305 , -1.25134227914383 , -- 4.31 , -0.93134131663624 , -- 4.315 , -0.58023320392854 , -- 4.32 , -0.263068523183 , -- 4.325 , -3.234875382342560E-02 , -- 4.33 , 8.104457813070970E-02 , -- 4.335 , 6.646358030000100E-02 , -- 4.34 , -6.520527065940920E-02 , -- 4.345 , -0.27865084678943 , -- 4.35 , -0.52301393304868 , -- 4.355 , -0.75029273588902 , -- 4.36 , -0.92586132464525 , -- 4.365 , -1.02745479977821 , -- 4.37 , -1.045887182644 , -- 4.375 , -0.98998208526761 , -- 4.38 , -0.88247620098788 , -- 4.385 , -0.74513807964771 , -- 4.39 , -0.589693305748 , -- 4.395 , -0.4218623825717 , -- 4.4 , -0.24559350524832 , -- 4.405 , -5.960463612956680E-02 , -- 4.41 , 0.142717207535869 , -- 4.415 , 0.362879306116347 , -- 4.42 , 0.588751862423607 , -- 4.425 , 0.799650310566393 , -- 4.43 , 0.976747652586761 , -- 4.435 , 1.1062713323933 , -- 4.44 , 1.17888982115871 , -- 4.445 , 1.19440253536595 , -- 4.45 , 1.16760308413961 , -- 4.455 , 1.12503563953872 , -- 4.46 , 1.09428815021162 , -- 4.465 , 1.09605242115199 , -- 4.47 , 1.141397648121 , -- 4.475 , 1.22879693707608 , -- 4.48 , 1.34085300252377 , -- 4.485 , 1.44734590197994 , -- 4.49 , 1.51600244532524 , -- 4.495 , 1.52347176965462 , -- 4.5 , 1.4600805519962 , -- 4.505 , 1.32990917025988 , -- 4.51 , 1.15031027736352 , -- 4.515 , 0.950259774927611 , -- 4.52 , 0.764000212508228 , -- 4.525 , 0.620467212343643 , -- 4.53 , 0.53443313966959 , -- 4.535 , 0.504324479922065 , -- 4.54 , 0.515518988342075 , -- 4.545 , 0.5449123033391 , -- 4.55 , 0.565643760216133 , -- 4.555 , 0.553361701085439 , -- 4.56 , 0.492730481489852 , -- 4.565 , 0.380543114015636 , -- 4.57 , 0.224809165664267 , -- 4.575 , 4.198032082290820E-02 , -- 4.58 , -0.14747370012324 , -- 4.585 , -0.32583933056166 , -- 4.59 , -0.48349824002692 , -- 4.595 , -0.61801754775951 , -- 4.6 , -0.72971208292477 , -- 4.605 , -0.82083468227042 , -- 4.61 , -0.89775066250987 , -- 4.615 , -0.96888908984926 , -- 4.62 , -1.0384220049282 , -- 4.625 , -1.10412227179889 , -- 4.63 , -1.16142632685637 , -- 4.635 , -1.20605223114456 , -- 4.64 , -1.23228150965333 , -- 4.645 , -1.2330625103562 , -- 4.65 , -1.20312802686153 , -- 4.655 , -1.13793589958523 , -- 4.66 , -1.0287141764878 , -- 4.665 , -0.8641100498206 , -- 4.67 , -0.63938852378214 , -- 4.675 , -0.35979779312165 , -- 4.68 , -3.418457890781780E-02 , -- 4.685 , 0.32663500010105 , -- 4.69 , 0.70029027164172 , -- 4.695 , 1.04848934874391 , -- 4.7 , 1.32926995685333 , -- 4.705 , 1.5103149027497 , -- 4.71 , 1.56674966292037 , -- 4.715 , 1.47490809529175 , -- 4.72 , 1.22042977817102 , -- 4.725 , 0.812026061087399 , -- 4.73 , 0.280340511193259 , -- 4.735 , -0.25291232049697 , -- 4.74 , -0.74295446485739 , -- 4.745 , -1.21402870653543 , -- 4.75 , -1.61401924449385 , -- 4.755 , -1.89622337299338 , -- 4.76 , -2.02674956179211 , -- 4.765 , -1.98422913056168 , -- 4.77 , -1.76288837183623 , -- 4.775 , -1.38094808362694 , -- 4.78 , -0.88180280078288 , -- 4.785 , -0.32340693878301 , -- 4.79 , 0.309775095794083 , -- 4.795 , 0.96398882181726 , -- 4.8 , 1.46521480566007 , -- 4.805 , 1.77054065361263 , -- 4.81 , 1.87515908448363 , -- 4.815 , 1.80763374123846 , -- 4.82 , 1.61871625340312 , -- 4.825 , 1.37383254873989 , -- 4.83 , 1.14323155673988 , -- 4.835 , 0.984115330306988 , -- 4.84 , 0.925398091665492 , -- 4.845 , 0.966346779872473 , -- 4.85 , 1.08319151549769 , -- 4.855 , 1.23351422222229 , -- 4.86 , 1.36203968864373 , -- 4.865 , 1.41500821627328 , -- 4.87 , 1.35632626255014 , -- 4.875 , 1.17338649661648 , -- 4.88 , 0.873766424591019 , -- 4.885 , 0.482332773802851 , -- 4.89 , 3.923546396876550E-02 , -- 4.895 , -0.22463035892901 , -- 4.9 , -0.44775774321397 , -- 4.905 , -0.63337252960387 , -- 4.91 , -0.77214474283379 , -- 4.915 , -0.86139644715887 , -- 4.92 , -0.90539713757332 , -- 4.925 , -0.91457475953945 , -- 4.93 , -0.90292943826226 , -- 4.935 , -0.88570153051275 , -- 4.94 , -0.87839307255918 , -- 4.945 , -0.89582516241653 , -- 4.95 , -0.95014576706764 , -- 4.955 , -1.0485044185337 , -- 4.96 , -1.1912694657772 , -- 4.965 , -1.3708025639651 , -- 4.97 , -1.57077187288448 , -- 4.975 , -1.76663217835511 , -- 4.98 , -1.92803570312605 , -- 4.985 , -2.02359808191781 , -- 4.99 , -2.0273751484136 , -- 4.995 , -1.9250033514058 , -- 5.0 , -1.71741034508892 , -- 5.005 , -1.42182210128631 , -- 5.01 , -1.07072647445332 , -- 5.015 , -0.70800393596021 , -- 5.02 , -0.38102872779966 , -- 5.025 , -0.13042197488723 , -- 5.03 , 3.718076749748670E-02 , -- 5.035 , 0.111181074997115 , -- 5.04 , 1.189110285104030E-02 , -- 5.045 , -0.20207868848779 , -- 5.05 , -0.44910010485315 , -- 5.055 , -0.64276640560255 , -- 5.06 , -0.71152270492906 , -- 5.065 , -0.61247600528197 , -- 5.07 , -0.33784697642092 , -- 5.075 , 8.416359716705800E-02 , -- 5.08 , 0.593871386434318 , -- 5.085 , 1.11066790591664 , -- 5.09 , 1.547857061782 , -- 5.095 , 1.82798847499016 , -- 5.1 , 1.89521989018272 , -- 5.105 , 1.72255076224409 , -- 5.11 , 1.31357650362981 , -- 5.115 , 0.700681089848237 , -- 5.12 , -3.944101274735180E-02 , -- 5.125 , -0.57538253938727 , -- 5.13 , -1.09801528037525 , -- 5.135 , -1.54898464132246 , -- 5.14 , -1.87419746618154 , -- 5.145 , -2.02778376701628 , -- 5.15 , -1.97724411607912 , -- 5.155 , -1.70971194891691 , -- 5.16 , -1.23638258073101 , -- 5.165 , -0.59315494390597 , -- 5.17 , 0.111368648891046 , -- 5.175 , 0.663169389460638 , -- 5.18 , 1.18144631611042 , -- 5.185 , 1.60890018466206 , -- 5.19 , 1.8979822410482 , -- 5.195 , 2.01808652053979 , -- 5.2 , 1.96085818554624 , -- 5.205 , 1.74218321821589 , -- 5.21 , 1.39935953655912 , -- 5.215 , 0.984200755295425 , -- 5.22 , 0.55469135825056 , -- 5.225 , 0.166760087786826 , -- 5.23 , -0.29010383111112 , -- 5.235 , -0.69805571505204 , -- 5.24 , -0.82852798007756 , -- 5.245 , -0.70078564730017 , -- 5.25 , -0.3628421318389 , -- 5.255 , 7.584234896818380E-02 , -- 5.26 , 0.43610921884854 , -- 5.265 , 0.80338816570313 , -- 5.27 , 1.14583363535399 , -- 5.275 , 1.44233546379898 , -- 5.28 , 1.68096745166101 , -- 5.285 , 1.85664177773435 , -- 5.29 , 1.96856248638458 , -- 5.295 , 2.01783075579683 , -- 5.3 , 2.00659270193592 , -- 5.305 , 1.93938767266716 , -- 5.31 , 1.82500672559004 , -- 5.315 , 1.67686130322037 , -- 5.32 , 1.5118566159347 , -- 5.325 , 1.34860724410237 , -- 5.33 , 1.20475926474899 , -- 5.335 , 1.09288033252557 , -- 5.34 , 1.01607186043109 , -- 5.345 , 0.965585517364128 , -- 5.35 , 0.921875442510843 , -- 5.355 , 0.858856383267098 , -- 5.36 , 0.750174073799282 , -- 5.365 , 0.575950824274314 , -- 5.37 , 0.328597045194569 , -- 5.375 , 1.652082973209100E-02 , -- 5.38 , -0.50276970745072 , -- 5.385 , -1.03563631031452 , -- 5.39 , -1.50490953601753 , -- 5.395 , -1.84994677847168 , -- 5.4 , -2.02843329407602 , -- 5.405 , -2.02545789978173 , -- 5.41 , -1.85714442697612 , -- 5.415 , -1.56774223620682 , -- 5.42 , -1.22052435654413 , -- 5.425 , -0.88506969766425 , -- 5.43 , -0.62375651367727 , -- 5.435 , -0.47941781141452 , -- 5.44 , -0.46672787176114 , -- 5.445 , -0.57069258501391 , -- 5.45 , -0.75256544897363 , -- 5.455 , -0.95943306586182 , -- 5.46 , -1.13415327472143 , -- 5.465 , -1.22591171353667 , -- 5.47 , -1.2008821223853 , -- 5.475 , -1.04867466773548 , -- 5.48 , -0.7816480899877 , -- 5.485 , -0.43025221187204 , -- 5.49 , -3.849293308865140E-02 , -- 5.495 , 0.351248620973817 , -- 5.5 , 0.678851223955433 , -- 5.505 , 0.903561274568929 , -- 5.51 , 1.000825087451 , -- 5.515 , 0.960934560706297 , -- 5.52 , 0.78992867723245 , -- 5.525 , 0.511317876998132 , -- 5.53 , 0.162760320816359 , -- 5.535 , -0.15233717951736 , -- 5.54 , -0.408210240848 , -- 5.545 , -0.62888561745421 , -- 5.55 , -0.79619865273995 , -- 5.555 , -0.90334422649211 , -- 5.56 , -0.957273231721 , -- 5.565 , -0.97632112916908 , -- 5.57 , -0.98529324126005 , -- 5.575 , -1.01088001195299 , -- 5.58 , -1.07663632540647 , -- 5.585 , -1.1964450302827 , -- 5.59 , -1.36885544627383 , -- 5.595 , -1.57548223311668 , -- 5.6 , -1.78343920945552 , -- 5.605 , -1.94998845541488 , -- 5.61 , -2.02894698358654 , -- 5.615 , -1.97893684719994 , -- 5.62 , -1.77192812280346 , -- 5.625 , -1.39963819951885 , -- 5.63 , -0.87646499571534 , -- 5.635 , -0.23861147042705 , -- 5.64 , 0.336218007155657 , -- 5.645 , 0.847327478768983 , -- 5.65 , 1.30857622082849 , -- 5.655 , 1.67664606685409 , -- 5.66 , 1.91879317489308 , -- 5.665 , 2.01692172130926 , -- 5.67 , 1.96853013034153 , -- 5.675 , 1.78510825075991 , -- 5.68 , 1.4896405295593 , -- 5.685 , 1.11350916384325 , -- 5.69 , 0.692073407024996 , -- 5.695 , 0.259804585073245 , -- 5.7 , -0.24312332096602 , -- 5.705 , -0.83740028991543 , -- 5.71 , -1.32862161402076 , -- 5.715 , -1.69669262414581 , -- 5.72 , -1.93128745142237 , -- 5.725 , -2.02921997287969 , -- 5.73 , -1.99337280480397 , -- 5.735 , -1.83373410433008 , -- 5.74 , -1.56747293050187 , -- 5.745 , -1.21724094498849 , -- 5.75 , -0.81052148648056 , -- 5.755 , -0.38038326455022 , -- 5.76 , 4.429619989889450E-02 , -- 5.765 , 0.482041333875258 , -- 5.77 , 0.827113852485307 , -- 5.775 , 1.05562255275457 , -- 5.78 , 1.15574510229285 , -- 5.785 , 1.13102185729002 , -- 5.79 , 1.00111402711585 , -- 5.795 , 0.796402227894675 , -- 5.8 , 0.550299036643284 , -- 5.805 , 0.294746376632263 , -- 5.81 , 5.779627739619110E-02 , -- 5.815 , -0.14033970324891 , -- 5.82 , -0.29057904479289 , -- 5.825 , -0.39279585396293 , -- 5.83 , -0.4494482504971 , -- 5.835 , -0.46100119177358 , -- 5.84 , -0.42521937611264 , -- 5.845 , -0.3375317644422 , -- 5.85 , -0.19158847654649 , -- 5.855 , 1.752214546441880E-02 , -- 5.86 , 0.287160001209617 , -- 5.865 , 0.602028255467961 , -- 5.87 , 0.933254236049531 , -- 5.875 , 1.24149905843902 , -- 5.88 , 1.48303299176761 , -- 5.885 , 1.61843953382086 , -- 5.89 , 1.62241665153411 , -- 5.895 , 1.49156853196882 , -- 5.9 , 1.24765942303674 , -- 5.905 , 0.935345755846739 , -- 5.91 , 0.614175990416646 , -- 5.915 , 0.345931028275661 , -- 5.92 , 0.180659960734569 , -- 5.925 , 0.145383600846828 , -- 5.93 , 0.237765412366942 , -- 5.935 , 0.425793201109318 , -- 5.94 , 0.654468234473261 , -- 5.945 , 0.858677159866798 , -- 5.95 , 0.978207334350809 , -- 5.955 , 0.970329031591707 , -- 5.96 , 0.818026030367143 , -- 5.965 , 0.533251338659083 , -- 5.97 , 0.15356868640373 , -- 5.975 , -0.26839144886352 , -- 5.98 , -0.67878215135657 , -- 5.985 , -1.03400683986537 , -- 5.99 , -1.3073585979251 , -- 5.995 , -1.49178002375022 , -- 6.0 , -1.59881218617846 , -- 6.005 , -1.65263612785215 , -- 6.01 , -1.68040775595467 , -- 6.015 , -1.70326118069031 , -- 6.02 , -1.73147514087517 , -- 6.025 , -1.76409391726272 , -- 6.03 , -1.79154678107851 , -- 6.035 , -1.80004486312369 , -- 6.04 , -1.77657113231061 , -- 6.045 , -1.71309083748955 , -- 6.05 , -1.60890845106533 , -- 6.055 , -1.47045377157793 , -- 6.06 , -1.30823176663841 , -- 6.065 , -1.13218678075657 , -- 6.07 , -0.94831725641373 , -- 6.075 , -0.7582938943429 , -- 6.08 , -0.56105916215743 , -- 6.085 , -0.35465660035081 , -- 6.09 , -0.1384716720616 , -- 6.095 , 8.181401775998960E-02 , -- 6.1 , 0.295120583821675 , -- 6.105 , 0.488813785339096 , -- 6.11 , 0.645978019217284 , -- 6.115 , 0.751956445909178 , -- 6.12 , 0.797070178696218 , -- 6.125 , 0.778938415578525 , -- 6.13 , 0.703933126539259 , -- 6.135 , 0.586193282063444 , -- 6.14 , 0.444346814137257 , -- 6.145 , 0.29825595848257 , -- 6.15 , 0.16716086262001 , -- 6.155 , 6.845201123569530E-02 , -- 6.16 , 1.638790200297000E-02 , -- 6.165 , 2.138979757918980E-02 , -- 6.17 , 9.013446340544370E-02 , -- 6.175 , 0.225364316943996 , -- 6.18 , 0.424627726925139 , -- 6.185 , 0.678666340108451 , -- 6.19 , 0.970459569802561 , -- 6.195 , 1.27533903222018 , -- 6.2 , 1.56265390764561 , -- 6.205 , 1.79967884086063 , -- 6.21 , 1.95730777614782 , -- 6.215 , 2.01568092318868 , -- 6.22 , 1.9680798901563 , -- 6.225 , 1.82260275300508 , -- 6.23 , 1.6012628707179 , -- 6.235 , 1.33584067303513 , -- 6.24 , 1.06088096670087 , -- 6.245 , 0.806020651973241 , -- 6.25 , 0.590240383625112 , -- 6.255 , 0.419170058894404 , -- 6.26 , 0.285567810216695 , -- 6.265 , 0.172882474189092 , -- 6.27 , 6.141521693570270E-02 , -- 6.275 , -4.100655746000240E-02 , -- 6.28 , -0.12748144658853 , -- 6.285 , -0.22402606929835 , -- 6.29 , -0.32266457931099 , -- 6.295 , -0.41245768954213 , -- 6.3 , -0.48300494677694 , -- 6.305 , -0.5281469572368 , -- 6.31 , -0.54867239852271 , -- 6.315 , -0.55291028225442 , -- 6.32 , -0.55498836852966 , -- 6.325 , -0.57168033795742 , -- 6.33 , -0.61890124937392 , -- 6.335 , -0.70832720330432 , -- 6.34 , -0.8444688842815 , -- 6.345 , -1.02312789012362 , -- 6.35 , -1.23201420479741 , -- 6.355 , -1.45302869056683 , -- 6.36 , -1.66483750094807 , -- 6.365 , -1.84512502578643 , -- 6.37 , -1.97287391729285 , -- 6.375 , -2.03065548439675 , -- 6.38 , -2.00620454087577 , -- 6.385 , -1.89315139172675 , -- 6.39 , -1.69175663119939 , -- 6.395 , -1.40995495579992 , -- 6.4 , -1.06376441111769 , -- 6.405 , -0.67620069765757 , -- 6.41 , -0.27510795942141 , -- 6.415 , 0.196812130002227 , -- 6.42 , 0.789662759769171 , -- 6.425 , 1.26662960840841 , -- 6.43 , 1.6072638071671 , -- 6.435 , 1.81182394487741 , -- 6.44 , 1.89972228643561 , -- 6.445 , 1.9047619217593 , -- 6.45 , 1.86751034078394 , -- 6.455 , 1.8254292028055 , -- 6.46 , 1.80357147143536 , -- 6.465 , 1.80953648503866 , -- 6.47 , 1.83384689586528 , -- 6.475 , 1.8545291406415 , -- 6.48 , 1.84468010904891 , -- 6.485 , 1.78185447755559 , -- 6.49 , 1.65634384795161 , -- 6.495 , 1.47475850013982 , -- 6.5 , 1.25778784095604 , -- 6.505 , 1.03382280148781 , -- 6.51 , 0.830377669084782 , -- 6.515 , 0.664847688813952 , -- 6.52 , 0.537441337312092 , -- 6.525 , 0.429805314578715 , -- 6.53 , 0.31046587513464 , -- 6.535 , 0.1447657890999 , -- 6.54 , -9.382243026102850E-02 , -- 6.545 , -0.41334712070585 , -- 6.55 , -0.79651775006838 , -- 6.555 , -1.20028045361043 , -- 6.56 , -1.56291508214219 , -- 6.565 , -1.81661688690887 , -- 6.57 , -1.90206035531056 , -- 6.575 , -1.7817477770441 , -- 6.58 , -1.44921463753588 , -- 6.585 , -0.93148892423534 , -- 6.59 , -0.28406148521622 , -- 6.595 , 0.323315074176515 , -- 6.6 , 0.852343584238104 , -- 6.605 , 1.31274405752464 , -- 6.61 , 1.66746511449112 , -- 6.615 , 1.89908333611956 , -- 6.62 , 2.00928735485692 , -- 6.625 , 2.01484159347826 , -- 6.63 , 1.94157792559844 , -- 6.635 , 1.81783611017065 , -- 6.64 , 1.66894503437948 , -- 6.645 , 1.51424202651612 , -- 6.65 , 1.36676756429498 , -- 6.655 , 1.23440796614096 , -- 6.66 , 1.12141683734346 , -- 6.665 , 1.03005163859298 , -- 6.67 , 0.961856012808879 , -- 6.675 , 0.917594207115419 , -- 6.68 , 0.895802572654735 , -- 6.685 , 0.891399934871178 , -- 6.69 , 0.895639060058472 , -- 6.695 , 0.897175457172006 , -- 6.7 , 0.883661601343515 , -- 6.705 , 0.844008961722013 , -- 6.71 , 0.77132601406367 , -- 6.715 , 0.665213447750178 , -- 6.72 , 0.531957875807601 , -- 6.725 , 0.382692370009228 , -- 6.73 , 0.230704777961798 , -- 6.735 , 8.848409780228460E-02 , -- 6.74 , -4.320967298403890E-02 , -- 6.745 , -0.1762892860789 , -- 6.75 , -0.28784586821218 , -- 6.755 , -0.38905860495499 , -- 6.76 , -0.49291382383649 , -- 6.765 , -0.61009214038178 , -- 6.77 , -0.74528548081034 , -- 6.775 , -0.89462751554703 , -- 6.78 , -1.04544755808821 , -- 6.785 , -1.17892732569852 , -- 6.79 , -1.27460153013389 , -- 6.795 , -1.31507899117539 , -- 6.8 , -1.28996744751844 , -- 6.805 , -1.19853880216558 , -- 6.81 , -1.0504463612584 , -- 6.815 , -0.86390673664632 , -- 6.82 , -0.66172430237656 , -- 6.825 , -0.46650461944826 , -- 6.83 , -0.29641016005237 , -- 6.835 , -0.16215486668974 , -- 6.84 , -6.552041776213589E-02 , -- 6.845 , 2.987151640449150E-04 , -- 6.85 , 4.839493719297370E-02 , -- 6.855 , 9.446598470843660E-02 , -- 6.86 , 0.152946671436979 , -- 6.865 , 0.234067255310907 , -- 6.87 , 0.342244784612781 , -- 6.875 , 0.475796904621799 , -- 6.88 , 0.627950076248601 , -- 6.885 , 0.788973056491094 , -- 6.89 , 0.948691666991149 , -- 6.895 , 1.09834384227231 , -- 6.9 , 1.23115050816982 , -- 6.905 , 1.34171557597024 , -- 6.91 , 1.42465179927775 , -- 6.915 , 1.47287601846948 , -- 6.92 , 1.47626092610496 , -- 6.925 , 1.42154296744535 , -- 6.93 , 1.29406455566583 , -- 6.935 , 1.08117541948277 , -- 6.94 , 0.776554035067551 , -- 6.945 , 0.384383520531035 , -- 6.95 , -7.294167926560280E-02 , -- 6.955 , -0.53864400514197 , -- 6.96 , -1.00153859379899 , -- 6.965 , -1.41800783516812 , -- 6.97 , -1.7468581519585 , -- 6.975 , -1.95670089086248 , -- 6.98 , -2.03182599021495 , -- 6.985 , -1.97504743961906 , -- 6.99 , -1.80676558399137 , -- 6.995 , -1.5604834986916 , -- 7.0 , -1.27576644446333 , -- 7.005 , -0.9903221748174 , -- 7.01 , -0.73330353810734 , -- 7.015 , -0.52160326879535 , -- 7.02 , -0.35985223488993 , -- 7.025 , -0.24369954400838 , -- 7.03 , -0.16525998770838 , -- 7.035 , -0.11901231195031 , -- 7.04 , -0.10598389561423 , -- 7.045 , -0.13446900972305 , -- 7.05 , -0.21699230917524 , -- 7.055 , -0.36458839091288 , -- 7.06 , -0.58005276943233 , -- 7.065 , -0.85208512054878 , -- 7.07 , -1.15259800704237 , -- 7.075 , -1.43896995914881 , -- 7.08 , -1.66118309359685 , -- 7.085 , -1.771927531099 , -- 7.09 , -1.73721975477998 , -- 7.095 , -1.54526433804976 , -- 7.1 , -1.21113953262348 , -- 7.105 , -0.7752249017621 , -- 7.11 , -0.29527299039846 , -- 7.115 , 0.173294693493191 , -- 7.12 , 0.57635137765972 , -- 7.125 , 0.862335395139578 , -- 7.13 , 1.01919271305477 , -- 7.135 , 1.06290746127159 , -- 7.14 , 1.03167712327493 , -- 7.145 , 0.975104812475545 , -- 7.15 , 0.94186991196106 , -- 7.155 , 0.968697291206275 , -- 7.16 , 1.07242991307441 , -- 7.165 , 1.24693307983413 , -- 7.17 , 1.46588613539846 , -- 7.175 , 1.69040391004537 , -- 7.18 , 1.87856926470802 , -- 7.185 , 1.9942412785979 , -- 7.19 , 2.01380495894182 , -- 7.195 , 1.93002933646123 , -- 7.2 , 1.75219708416187 , -- 7.205 , 1.50259348018555 , -- 7.21 , 1.21097997176944 , -- 7.215 , 0.908929916225265 , -- 7.22 , 0.624987318443838 , -- 7.225 , 0.380818385977012 , -- 7.23 , 0.188682790341481 , -- 7.235 , 5.054908150564660E-02 , -- 7.24 , -4.224733175465410E-02 , -- 7.245 , -0.10533217769884 , -- 7.25 , -0.15872049577028 , -- 7.255 , -0.22626933934594 , -- 7.26 , -0.32933473878503 , -- 7.265 , -0.48196141281812 , -- 7.27 , -0.68656470353389 , -- 7.275 , -0.93107691321487 , -- 7.28 , -1.18865855652987 , -- 7.285 , -1.420854392386 , -- 7.29 , -1.58410377773137 , -- 7.295 , -1.63852514448294 , -- 7.3 , -1.55725203777855 , -- 7.305 , -1.33440140393595 , -- 7.31 , -0.98961414150744 , -- 7.315 , -0.56741260276393 , -- 7.32 , -0.13082880911958 , -- 7.325 , 0.249583666745638 , -- 7.33 , 0.508940072170202 , -- 7.335 , 0.600662717049061 , -- 7.34 , 0.5059779991769 , -- 7.345 , 0.238142376340394 , -- 7.35 , -0.15979854274957 , -- 7.355 , -0.62330642360817 , -- 7.36 , -1.07861985315351 , -- 7.365 , -1.45613573961171 , -- 7.37 , -1.70221047327019 , -- 7.375 , -1.78733777799186 , -- 7.38 , -1.70935128300863 , -- 7.385 , -1.49139661468471 , -- 7.39 , -1.17576612947581 , -- 7.395 , -0.81553092872387 , -- 7.4 , -0.46579815462372 , -- 7.405 , -0.17584397718572 , -- 7.41 , 1.695055532407140E-02 , -- 7.415 , 9.080438530410280E-02 , -- 7.42 , 4.100203845188310E-02 , -- 7.425 , -0.12015714114647 , -- 7.43 , -0.36451642152235 , -- 7.435 , -0.65063615988914 , -- 7.44 , -0.92820901616803 , -- 7.445 , -1.14411024994249 , -- 7.45 , -1.2495457268474 , -- 7.455 , -1.20784941543681 , -- 7.46 , -1.00217372922289 , -- 7.465 , -0.64135799082343 , -- 7.47 , -0.16185956349448 , -- 7.475 , 0.375443341531982 , -- 7.48 , 0.893242359584305 , -- 7.485 , 1.30942170236106 , -- 7.49 , 1.55069511538195 , -- 7.495 , 1.56597687306026 , -- 7.5 , 1.33649434622083 , -- 7.505 , 0.880087983425295 , -- 7.51 , 0.248772549844589 , -- 7.515 , -0.36466467822546 , -- 7.52 , -0.91944206639744 , -- 7.525 , -1.41086648314942 , -- 7.53 , -1.78197182048109 , -- 7.535 , -1.99448021035504 , -- 7.54 , -2.03276742886028 , -- 7.545 , -1.9038540437772 , -- 7.55 , -1.63408290724591 , -- 7.555 , -1.26366851276266 , -- 7.56 , -0.84036300953546 , -- 7.565 , -0.41319072336647 , -- 7.57 , -2.695184824283270E-02 , -- 7.575 , 0.376706658165673 , -- 7.58 , 0.651108722060469 , -- 7.585 , 0.775943751253261 , -- 7.59 , 0.755597751751617 , -- 7.595 , 0.613374035034045 , -- 7.6 , 0.389100193892965 , -- 7.605 , 0.134140214335999 , -- 7.61 , -9.593512494436110E-02 , -- 7.615 , -0.25014262596395 , -- 7.62 , -0.29113724407252 , -- 7.625 , -0.20287737386171 , -- 7.63 , 5.024227092122790E-03 , -- 7.635 , 0.297903261089418 , -- 7.64 , 0.622107890736794 , -- 7.645 , 0.91558081793758 , -- 7.65 , 1.12076183929425 , -- 7.655 , 1.19700603742361 , -- 7.66 , 1.12967888152307 , -- 7.665 , 0.933743975370447 , -- 7.67 , 0.650793261469538 , -- 7.675 , 0.339973230252299 , -- 7.68 , 6.485809767286120E-02 , -- 7.685 , -0.12047151548951 , -- 7.69 , -0.18271341139574 , -- 7.695 , -0.11542038316497 , -- 7.7 , 6.117124311775080E-02 , -- 7.705 , 0.306221765396461 , -- 7.71 , 0.568625694223555 , -- 7.715 , 0.79886093305278 , -- 7.72 , 0.959184513633666 , -- 7.725 , 1.02975813458714 , -- 7.73 , 1.00975707269538 , -- 7.735 , 0.913870269761431 , -- 7.74 , 0.765608368548335 , -- 7.745 , 0.589594520216864 , -- 7.75 , 0.405299730586112 , -- 7.755 , 0.223985767660469 , -- 7.76 , 4.920974997763450E-02 , -- 7.765 , -0.11994024975627 , -- 7.77 , -0.28424112296356 , -- 7.775 , -0.43999294669787 , -- 7.78 , -0.57663798061898 , -- 7.785 , -0.67751213622858 , -- 7.79 , -0.72360079867587 , -- 7.795 , -0.69901457723046 , -- 7.8 , -0.59650776204881 , -- 7.805 , -0.42155886366402 , -- 7.81 , -0.19380300792328 , -- 7.815 , 5.489933475191600E-02 , -- 7.82 , 0.285466317840837 , -- 7.825 , 0.458377987772727 , -- 7.83 , 0.540543411689915 , -- 7.835 , 0.510857284716815 , -- 7.84 , 0.363486292918927 , -- 7.845 , 0.108336402431131 , -- 7.85 , -0.21209396424761 , -- 7.855 , -0.56957977141521 , -- 7.86 , -0.94077073678275 , -- 7.865 , -1.29262615047061 , -- 7.87 , -1.59622106208727 , -- 7.875 , -1.82918316989524 , -- 7.88 , -1.97699031089989 , -- 7.885 , -2.03327946447786 , -- 7.89 , -1.99933934346025 , -- 7.895 , -1.88300955675939 , -- 7.9 , -1.69721418310355 , -- 7.905 , -1.45829064978291 , -- 7.91 , -1.18410498022345 , -- 7.915 , -0.8919394708508 , -- 7.92 , -0.59649837620085 , -- 7.925 , -0.30856724453543 , -- 7.93 , -3.473084459177880E-02 , -- 7.935 , 0.243954038684612 , -- 7.94 , 0.505067577023267 , -- 7.945 , 0.74523171014185 , -- 7.95 , 0.961076322702563 , -- 7.955 , 1.14544017577101 , -- 7.96 , 1.28755260199966 , -- 7.965 , 1.37508301728453 , -- 7.97 , 1.39752728794968 , -- 7.975 , 1.35018389601987 , -- 7.98 , 1.23776787698572 , -- 7.985 , 1.07653932806098 , -- 7.99 , 0.893865005632781 , -- 7.995 , 0.724806073674302 , -- 8.0 , 0.606180934525952 , -- 8.005 , 0.569233587341791 , -- 8.01 , 0.632383043958699 , -- 8.015 , 0.795725327814524 , -- 8.02 , 1.03874194319127 , -- 8.025 , 1.32196705023762 , -- 8.03 , 1.59246805399968 , -- 8.035 , 1.79229440498998 , -- 8.04 , 1.86849022149291 , -- 8.045 , 1.78281948278322 , -- 8.05 , 1.51926230063055 , -- 8.055 , 1.08785213984058 , -- 8.06 , 0.524349594247236 , -- 8.065 , -0.1140897577962 , -- 8.07 , -0.75657207669552 , -- 8.075 , -1.32834364834345 , -- 8.08 , -1.76124306233852 , -- 8.085 , -2.00310207974856 , -- 8.09 , -2.02480910234302 , -- 8.095 , -1.82430118945956 , -- 8.1 , -1.42701906953591 , -- 8.105 , -0.88275056011672 , -- 8.11 , -0.25930710346958 , -- 8.115 , 0.36611395388268 , -- 8.12 , 0.916779579720004 , -- 8.125 , 1.32634332320688 , -- 8.13 , 1.54748990874522 , -- 8.135 , 1.55804957216978 , -- 8.14 , 1.36358979345776 , -- 8.145 , 0.996118542284482 , -- 8.15 , 0.509028622424576 , -- 8.155 , -3.108833671467930E-02 , -- 8.16 , -0.55458355458891 , -- 8.165 , -0.9992113406596 , -- 8.17 , -1.31909921378195 , -- 8.175 , -1.4907344205054 , -- 8.18 , -1.51500626604052 , -- 8.185 , -1.41506172917135 , -- 8.19 , -1.23045719608832 , -- 8.195 , -1.00875563741852 , -- 8.2 , -0.79618535909745 , -- 8.205 , -0.62910374181022 , -- 8.21 , -0.52781524086439 , -- 8.215 , -0.49375763302869 , -- 8.22 , -0.51036868088539 , -- 8.225 , -0.54721127046085 , -- 8.23 , -0.56640455149806 , -- 8.235 , -0.5300607346312 , -- 8.24 , -0.40739746710395 , -- 8.245 , -0.18031656379607 , -- 8.25 , 9.909295562647380E-02 , -- 8.255 , 0.384178096593259 , -- 8.26 , 0.711568797471058 , -- 8.265 , 1.05465985685733 , -- 8.27 , 1.38307322715161 , -- 8.275 , 1.66640133480447 , -- 8.28 , 1.87778042356214 , -- 8.285 , 1.99690726227749 , -- 8.29 , 2.01218574892656 , -- 8.295 , 1.9218468256107 , -- 8.3 , 1.73397654400921 , -- 8.305 , 1.4654715893691 , -- 8.31 , 1.14002097734659 , -- 8.315 , 0.785289540807961 , -- 8.32 , 0.429654714191936 , -- 8.325 , 9.887434390542030E-02 , -- 8.33 , -0.27373446466779 , -- 8.335 , -0.61453278823147 , -- 8.34 , -0.86361514651737 , -- 8.345 , -1.02764207046752 , -- 8.35 , -1.12312770730449 , -- 8.355 , -1.17242345160079 , -- 8.36 , -1.19890949112902 , -- 8.365 , -1.22231476786338 , -- 8.37 , -1.25506074091502 , -- 8.375 , -1.30037291926648 , -- 8.38 , -1.35246560106362 , -- 8.385 , -1.39867274893801 , -- 8.39 , -1.42300013455657 , -- 8.395 , -1.41027137760835 , -- 8.4 , -1.34988412628361 , -- 8.405 , -1.23833354826905 , -- 8.41 , -1.08003474781669 , -- 8.415 , -0.8863811686465 , -- 8.42 , -0.67334691448991 , -- 8.425 , -0.45824149658395 , -- 8.43 , -0.25648271091485 , -- 8.435 , -7.919497664086800E-02 , -- 8.44 , 6.790702566583660E-02 , -- 8.445 , 0.184336104551994 , -- 8.45 , 0.273607496426052 , -- 8.455 , 0.341427765954767 , -- 8.46 , 0.393859568348449 , -- 8.465 , 0.436054008314734 , -- 8.47 , 0.471822329873715 , -- 8.475 , 0.503940686983312 , -- 8.48 , 0.534766790770446 , -- 8.485 , 0.566720547413461 , -- 8.49 , 0.602204083610117 , -- 8.495 , 0.642759211345947 , -- 8.5 , 0.687546596661957 , -- 8.505 , 0.73161370540631 , -- 8.51 , 0.764633590722345 , -- 8.515 , 0.770779801924118 , -- 8.52 , 0.730226474533298 , -- 8.525 , 0.622364880535585 , -- 8.53 , 0.430299195926097 , -- 8.535 , 0.145690142921501 , -- 8.54 , -0.1875029917819 , -- 8.545 , -0.54835468448798 , -- 8.55 , -0.93829077724458 , -- 8.555 , -1.32093112448324 , -- 8.56 , -1.65568314187632 , -- 8.565 , -1.90374313930578 , -- 8.57 , -2.03414217931564 , -- 8.575 , -2.02871594615485 , -- 8.58 , -1.88502979034511 , -- 8.585 , -1.61666670363564 , -- 8.59 , -1.25090542907548 , -- 8.595 , -0.82439719072454 , -- 8.6 , -0.3777961843308 , -- 8.605 , 5.997342456618780E-02 , -- 8.61 , 0.498580351025926 , -- 8.615 , 0.848666797179574 , -- 8.62 , 1.09518857615416 , -- 8.625 , 1.23554791479412 , -- 8.63 , 1.2781763580922 , -- 8.635 , 1.2403900007702 , -- 8.64 , 1.14586627728766 , -- 8.645 , 1.02207806372073 , -- 8.65 , 0.897804023904626 , -- 8.655 , 0.800618191332478 , -- 8.66 , 0.754133205007585 , -- 8.665 , 0.775081318262375 , -- 8.67 , 0.87060821275674 , -- 8.675 , 1.03627950859147 , -- 8.68 , 1.25531150972849 , -- 8.685 , 1.49959206680695 , -- 8.69 , 1.73283203030496 , -- 8.695 , 1.91564235877547 , -- 8.7 , 2.01171708813146 , -- 8.705 , 1.99404478322172 , -- 8.71 , 1.85004122617725 , -- 8.715 , 1.5844790314963 , -- 8.72 , 1.21937543098226 , -- 8.725 , 0.790685383472318 , -- 8.73 , 0.34253999395618 , -- 8.735 , -8.315108890721259E-02 , -- 8.74 , -0.45782997432698 , -- 8.745 , -0.73560630397696 , -- 8.75 , -0.90358121095544 , -- 8.755 , -0.96494822819405 , -- 8.76 , -0.93630744097796 , -- 8.765 , -0.84299937779174 , -- 8.77 , -0.71350666162014 , -- 8.775 , -0.57402043454602 , -- 8.78 , -0.44427168990607 , -- 8.785 , -0.33542713208977 , -- 8.79 , -0.2501116833682 , -- 8.795 , -0.18401361018569 , -- 8.8 , -0.12842784460002 , -- 8.805 , -7.314603730146210E-02 , -- 8.81 , -9.074234322190291E-03 , -- 8.815 , 7.000693452309770E-02 , -- 8.82 , 0.166710878734688 , -- 8.825 , 0.280110709519932 , -- 8.83 , 0.406273894637497 , -- 8.835 , 0.539123020255816 , -- 8.84 , 0.671480131538164 , -- 8.845 , 0.796107038123461 , -- 8.85 , 0.906615981394394 , -- 8.855 , 0.998324490593576 , -- 8.86 , 1.0690620538107 , -- 8.865 , 1.11975528767815 , -- 8.87 , 1.15453246345251 , -- 8.875 , 1.18023682665442 , -- 8.88 , 1.20532586633037 , -- 8.885 , 1.23820591293966 , -- 8.89 , 1.28520280175297 , -- 8.895 , 1.3486570631952 , -- 8.9 , 1.42571219461991 , -- 8.905 , 1.50820033663049 , -- 8.91 , 1.58374708347145 , -- 8.915 , 1.63800541668437 , -- 8.92 , 1.65764589236558 , -- 8.925 , 1.63341505537543 , -- 8.93 , 1.5624359419512 , -- 8.935 , 1.44906883520367 , -- 8.94 , 1.30406714173948 , -- 8.945 , 1.14214506133789 , -- 8.95 , 0.97845385721763 , -- 8.955 , 0.824773099970328 , -- 8.96 , 0.686415293227468 , -- 8.965 , 0.560675032421674 , -- 8.97 , 0.437346493634863 , -- 8.975 , 0.301223152764708 , -- 8.98 , 0.136102516376474 , -- 8.985 , -7.065849555314389E-02 , -- 8.99 , -0.32407738413447 , -- 8.995 , -0.61898581453294 , -- 9.0 , -0.93960037368359 , -- 9.005 , -1.26143943272218 , -- 9.01 , -1.55516650644025 , -- 9.015 , -1.79156612412015 , -- 9.02 , -1.94652674681638 , -- 9.025 , -2.00503791616427 , -- 9.03 , -1.96340298656283 , -- 9.035 , -1.82929859570769 , -- 9.04 , -1.61975611512981 , -- 9.045 , -1.35763976380722 , -- 9.05 , -1.06749188919142 , -- 9.055 , -0.77165747380896 , -- 9.06 , -0.48743715471134 , -- 9.065 , -0.22573691716227 , -- 9.07 , 8.680561556133970E-03 , -- 9.075 , 0.215640087376458 , -- 9.08 , 0.397259171267499 , -- 9.085 , 0.555581085303924 , -- 9.09 , 0.690729679309828 , -- 9.095 , 0.800029757983254 , -- 9.1 , 0.878247351202657 , -- 9.105 , 0.91878759810445 , -- 9.11 , 0.915444383097841 , -- 9.115 , 0.864214490635585 , -- 9.12 , 0.76472553582975 , -- 9.125 , 0.620899809131162 , -- 9.13 , 0.440670714935382 , -- 9.135 , 0.234785445409552 , -- 9.14 , 1.501866477042620E-02 , -- 9.145 , -0.16256660035877 , -- 9.15 , -0.33008216119127 , -- 9.155 , -0.49037224168296 , -- 9.16 , -0.64324845085619 , -- 9.165 , -0.79113983805113 , -- 9.17 , -0.93796449486453 , -- 9.175 , -1.0876496844508 , -- 9.18 , -1.24257624122444 , -- 9.185 , -1.40228132491324 , -- 9.19 , -1.56269378306469 , -- 9.195 , -1.71610185022193 , -- 9.2 , -1.85187081485719 , -- 9.205 , -1.95781829391389 , -- 9.21 , -2.02202032577224 , -- 9.215 , -2.03476784125131 , -- 9.22 , -1.99032018745331 , -- 9.225 , -1.88813289198619 , -- 9.23 , -1.73333557866961 , -- 9.235 , -1.53634649422576 , -- 9.24 , -1.31166062827625 , -- 9.245 , -1.075970419663 , -- 9.25 , -0.84593818781158 , -- 9.255 , -0.63597140868637 , -- 9.26 , -0.4563931782957 , -- 9.265 , -0.31231411198407 , -- 9.27 , -0.20343660584305 , -- 9.275 , -0.12481923225902 , -- 9.28 , -6.848370877973950E-02 , -- 9.285 , -2.555427519972480E-02 , -- 9.29 , 1.844706127350420E-02 , -- 9.295 , 6.430221576072399E-02 , -- 9.3 , 0.10743778394149 , -- 9.305 , 0.141299341041405 , -- 9.31 , 0.154447624403715 , -- 9.315 , 0.133048252401135 , -- 9.32 , 6.418690106369780E-02 , -- 9.325 , -6.064647417949840E-02 , -- 9.33 , -0.24265292279827 , -- 9.335 , -0.47405842905361 , -- 9.34 , -0.73810449789487 , -- 9.345 , -1.0108148464089 , -- 9.35 , -1.26431984266432 , -- 9.355 , -1.47118757622947 , -- 9.36 , -1.60894844812626 , -- 9.365 , -1.66394726283033 , -- 9.37 , -1.63377593114862 , -- 9.375 , -1.52779564631775 , -- 9.38 , -1.36560192630373 , -- 9.385 , -1.17367488772945 , -- 9.39 , -0.98085465048613 , -- 9.395 , -0.81346133563023 , -- 9.4 , -0.6909389063025 , -- 9.405 , -0.62276084953816 , -- 9.41 , -0.607149409463 , -- 9.415 , -0.63177724383888 , -- 9.42 , -0.67625991576389 , -- 9.425 , -0.71589163373072 , -- 9.43 , -0.72595664968346 , -- 9.435 , -0.68589387170155 , -- 9.44 , -0.58268627289106 , -- 9.445 , -0.412930213848 , -- 9.45 , -0.18338626940602 , -- 9.455 , 8.998844390524470E-02 , -- 9.46 , 0.384209486902062 , -- 9.465 , 0.672301526951598 , -- 9.47 , 0.926752158620487 , -- 9.475 , 1.12295373373336 , -- 9.48 , 1.24217806572443 , -- 9.485 , 1.27378905610875 , -- 9.49 , 1.21646747255966 , -- 9.495 , 1.07838936456105 , -- 9.5 , 0.876298148043991 , -- 9.505 , 0.633562127434793 , -- 9.51 , 0.377406516734523 , -- 9.515 , 0.135641869430563 , -- 9.52 , -6.672476216219871E-02 , -- 9.525 , -0.21056458019019 , -- 9.53 , -0.28496091918619 , -- 9.535 , -0.28841969553759 , -- 9.54 , -0.2287139810782 , -- 9.545 , -0.12132500570029 , -- 9.55 , 7.625888610971770E-03 , -- 9.555 , 0.116222883261377 , -- 9.56 , 0.213774951165706 , -- 9.565 , 0.289397517200485 , -- 9.57 , 0.338281477903747 , -- 9.575 , 0.362345137379695 , -- 9.58 , 0.369650428641696 , -- 9.585 , 0.372716892921114 , -- 9.59 , 0.386055603509022 , -- 9.595 , 0.423398634616031 , -- 9.6 , 0.495129281552051 , -- 9.605 , 0.60639781396735 , -- 9.61 , 0.756225797586165 , -- 9.615 , 0.937731164545477 , -- 9.62 , 1.13931299682061 , -- 9.625 , 1.34651259505288 , -- 9.63 , 1.54413547032879 , -- 9.635 , 1.71824818793864 , -- 9.64 , 1.85768676819293 , -- 9.645 , 1.95489941817505 , -- 9.65 , 2.00610002856624 , -- 9.655 , 2.01090936461916 , -- 9.66 , 1.97169865125757 , -- 9.665 , 1.89287748522473 , -- 9.67 , 1.78030387269109 , -- 9.675 , 1.64090911938383 , -- 9.68 , 1.48250660526215 , -- 9.685 , 1.31363233674109 , -- 9.69 , 1.14327915207579 , -- 9.695 , 0.980390644995991 , -- 9.7 , 0.833122502994828 , -- 9.705 , 0.707943691566063 , -- 9.71 , 0.608782533951479 , -- 9.715 , 0.536448337875884 , -- 9.72 , 0.488573445463521 , -- 9.725 , 0.46016643878741 , -- 9.73 , 0.444740766028055 , -- 9.735 , 0.435798656192539 , -- 9.74 , 0.428373605655483 , -- 9.745 , 0.420256963476142 , -- 9.75 , 0.412594868385096 , -- 9.755 , 0.409674164332935 , -- 9.76 , 0.417930829751558 , -- 9.765 , 0.444371250852317 , -- 9.77 , 0.494775704856077 , -- 9.775 , 0.572057120950962 , -- 9.78 , 0.675155981128035 , -- 9.785 , 0.798679222993941 , -- 9.79 , 0.933324321352313 , -- 9.795 , 1.06694698775423 , -- 9.8 , 1.18603236012388 , -- 9.805 , 1.27724967196587 , -- 9.81 , 1.32882747232424 , -- 9.815 , 1.33155990686688 , -- 9.82 , 1.27942417786924 , -- 9.825 , 1.16984949079063 , -- 9.83 , 1.00375336219652 , -- 9.835 , 0.78541101181126 , -- 9.84 , 0.522229879372249 , -- 9.845 , 0.224363288427596 , -- 9.85 , -7.544298823405959E-02 , -- 9.855 , -0.32414911077947 , -- 9.86 , -0.56925067043303 , -- 9.865 , -0.80153173249929 , -- 9.87 , -1.01385881998571 , -- 9.875 , -1.20197758458175 , -- 9.88 , -1.36481009682394 , -- 9.885 , -1.50413197543959 , -- 9.89 , -1.62360229940215 , -- 9.895 , -1.72737604935286 , -- 9.9 , -1.81858556613035 , -- 9.905 , -1.89811306323292 , -- 9.91 , -1.96399286416952 , -- 9.915 , -2.01169321437822 , -- 9.92 , -2.03524420540911 , -- 9.925 , -2.02897089319518 , -- 9.93 , -1.9893635845244 , -- 9.935 , -1.91657784009958 , -- 9.94 , -1.81508296294018 , -- 9.945 , -1.69320466339342 , -- 9.95 , -1.56159803137893 , -- 9.955 , -1.4309899156992 , -- 9.96 , -1.309755744458 , -- 9.965 , -1.20194945689331 , -- 9.97 , -1.10635858004562 , -- 9.975 , -1.01686709903203 , -- 9.98 , -0.92410491644605 , -- 9.985 , -0.81798616411117 , -- 9.99 , -0.69053338279253 , -- 9.995 , -0.53828091954851 , -- 10.0 , -0.36368359344091 , -- 10.005 , -0.17516204935777 , -- 10.01 , 3.283892190983560E-02 , -- 10.015 , 0.330694200317556 , -- 10.02 , 0.577629318788318 , -- 10.025 , 0.752762239562344 , -- 10.03 , 0.843359973197779 , -- 10.035 , 0.846296788144704 , -- 10.04 , 0.767736310318568 , -- 10.045 , 0.621457280597053 , -- 10.05 , 0.426437216065522 , -- 10.055 , 0.204358996732675 , -- 10.06 , -2.248438925201870E-02 , -- 10.065 , -0.23266656596899 , -- 10.07 , -0.40662586629101 , -- 10.075 , -0.52750200085185 , -- 10.08 , -0.58215648669077 , -- 10.085 , -0.56248497246021 , -- 10.09 , -0.4669190429802 , -- 10.095 , -0.30169803576621 , -- 10.1 , -8.141467321068210E-02 , -- 10.105 , 0.171736188042055 , -- 10.11 , 0.430255910671489 , -- 10.115 , 0.665052841920839 , -- 10.12 , 0.849933032813423 , -- 10.125 , 0.965995866692921 , -- 10.13 , 1.00493830188015 , -- 10.135 , 0.970469370709915 , -- 10.14 , 0.877402798238989 , -- 10.145 , 0.748601808713132 , -- 10.15 , 0.610481808617733 , -- 10.155 , 0.488130421487012 , -- 10.16 , 0.401133125757128 , -- 10.165 , 0.360990723458034 , -- 10.17 , 0.370538085006636 , -- 10.175 , 0.425250483406994 , -- 10.18 , 0.515772332268937 , -- 10.185 , 0.630771503752903 , -- 10.19 , 0.759255763887151 , -- 10.195 , 0.891778215264391 , -- 10.2 , 1.02038573505463 , -- 10.205 , 1.13765165967161 , -- 10.21 , 1.2354498601353 , -- 10.215 , 1.30423925529986 , -- 10.22 , 1.3333818353705 , -- 10.225 , 1.31262109496076 , -- 10.23 , 1.23439607687214 , -- 10.235 , 1.09630588839482 , -- 10.24 , 0.902881246184685 , -- 10.245 , 0.665930257015006 , -- 10.25 , 0.403145595569434 , -- 10.255 , 0.135167464543167 , -- 10.26 , -0.1181889683435 , -- 10.265 , -0.34158112353947 , -- 10.27 , -0.5266606974231 , -- 10.275 , -0.67279436439978 , -- 10.28 , -0.78577175818034 , -- 10.285 , -0.87491503414711 , -- 10.29 , -0.94943871678613 , -- 10.295 , -1.01514749755514 , -- 10.3 , -1.07240552249575 , -- 10.305 , -1.1159454664886 , -- 10.31 , -1.13652214942974 , -- 10.315 , -1.12387719989209 , -- 10.32 , -1.07009467236169 , -- 10.325 , -0.9723415710773 , -- 10.33 , -0.83421714797159 , -- 10.335 , -0.66537603566363 , -- 10.34 , -0.47961924019497 , -- 10.345 , -0.29207437055768 , -- 10.35 , -0.11633661841191 , -- 10.355 , 3.762456752764130E-02 , -- 10.36 , 0.164274796553055 , -- 10.365 , 0.262005149857291 , -- 10.37 , 0.331666422264028 , -- 10.375 , 0.374819782001995 , -- 10.38 , 0.392377294442122 , -- 10.385 , 0.384141260826285 , -- 10.39 , 0.34936414194296 , -- 10.395 , 0.288052561776111 , -- 10.4 , 0.20242178785536 , -- 10.405 , 9.785306567479871E-02 , -- 10.41 , -1.713557520971730E-02 , -- 10.415 , -0.13204374310037 , -- 10.42 , -0.23639873810073 , -- 10.425 , -0.32201635263159 , -- 10.43 , -0.38475152712529 , -- 10.435 , -0.4251245384254 , -- 10.44 , -0.44753546126283 , -- 10.445 , -0.45825628870499 , -- 10.45 , -0.46279334754373 , -- 10.455 , -0.46346276944743 , -- 10.46 , -0.45799981189361 , -- 10.465 , -0.43972280992741 , -- 10.47 , -0.39929302861398 , -- 10.475 , -0.32758719542718 , -- 10.48 , -0.21885278786041 , -- 10.485 , -7.315503161217039E-02 , -- 10.49 , 0.102651407152514 , -- 10.495 , 0.295816563735959 , -- 10.5 , 0.490226934148564 , -- 10.505 , 0.669891810457828 , -- 10.51 , 0.82237594525252 , -- 10.515 , 0.941216017829958 , -- 10.52 , 1.02661998674533 , -- 10.525 , 1.08430529858058 , -- 10.53 , 1.12286636573309 , -- 10.535 , 1.15051988582967 , -- 10.54 , 1.17222128266484 , -- 10.545 , 1.18801420247095 , -- 10.55 , 1.19307665922947 , -- 10.555 , 1.17938295001738 , -- 10.56 , 1.13840303313913 , -- 10.565 , 1.06394181580147 , -- 10.57 , 0.95422952397942 , -- 10.575 , 0.812611611237298 , -- 10.58 , 0.646677789199809 , -- 10.585 , 0.466152014272008 , -- 10.59 , 0.280289725059773 , -- 10.595 , 9.565146176778430E-02 , -- 10.6 , -8.499446193837400E-02 , -- 10.605 , -0.26230216706899 , -- 10.61 , -0.4386137767682 , -- 10.615 , -0.6154630451662 , -- 10.62 , -0.79113786663093 , -- 10.625 , -0.9591661750224 , -- 10.63 , -1.10826769502301 , -- 10.635 , -1.22391556601366 , -- 10.64 , -1.29112533315649 , -- 10.645 , -1.29775475114347 , -- 10.65 , -1.23742365152054 , -- 10.655 , -1.11129656465532 , -- 10.66 , -0.9282894842173 , -- 10.665 , -0.70371663339333 , -- 10.67 , -0.45680011277455 , -- 10.675 , -0.20771128037236 , -- 10.68 , 2.512459612945220E-02 , -- 10.685 , 0.226918245807304 , -- 10.69 , 0.387350552286146 , -- 10.695 , 0.500473670939197 , -- 10.7 , 0.564029266358019 , -- 10.705 , 0.578637288901258 , -- 10.71 , 0.547211894628189 , -- 10.715 , 0.474757060973486 , -- 10.72 , 0.368436624005821 , -- 10.725 , 0.237615830995378 , -- 10.73 , 9.352792827951401E-02 , -- 10.735 , -5.167273774008210E-02 , -- 10.74 , -0.18646809540466 , -- 10.745 , -0.30187135567744 , -- 10.75 , -0.39316916542135 , -- 10.755 , -0.46096802891446 , -- 10.76 , -0.51111268636195 , -- 10.765 , -0.55334646668629 , -- 10.77 , -0.59891300067983 , -- 10.775 , -0.65764678122702 , -- 10.78 , -0.73525453842381 , -- 10.785 , -0.83150017185443 , -- 10.79 , -0.93976747420304 , -- 10.795 , -1.04812248595262 , -- 10.8 , -1.14160318244191 , -- 10.805 , -1.2051488991501 , -- 10.81 , -1.22646384585139 , -- 10.815 , -1.19814339245798 , -- 10.82 , -1.11865520710004 , -- 10.825 , -0.9920714349609 , -- 10.83 , -0.82681485385664 , -- 10.835 , -0.63386505629908 , -- 10.84 , -0.42496268277971 , -- 10.845 , -0.21119376102165 , -- 10.85 , -2.191019852703480E-03 , -- 10.855 , 0.194127641793734 , -- 10.86 , 0.371466018382975 , -- 10.865 , 0.525035130835761 , -- 10.87 , 0.651602813791636 , -- 10.875 , 0.749803994860723 , -- 10.88 , 0.820544481310922 , -- 10.885 , 0.867273287648818 , -- 10.89 , 0.895807866624117 , -- 10.895 , 0.913572593095597 , -- 10.9 , 0.928236729298366 , -- 10.905 , 0.946014350836689 , -- 10.91 , 0.970040868532415 , -- 10.915 , 0.999311930164329 , -- 10.92 , 1.02854682988849 , -- 10.925 , 1.04913139979 , -- 10.93 , 1.05098941441043 , -- 10.935 , 1.02499491482512 , -- 10.94 , 0.965351048328359 , -- 10.945 , 0.871370473531725 , -- 10.95 , 0.748233229517312 , -- 10.955 , 0.606563895886194 , -- 10.96 , 0.460955473292802 , -- 10.965 , 0.327805324612049 , -- 10.97 , 0.222950093923078 , -- 10.975 , 0.159562148201255 , -- 10.98 , 0.146631988185719 , -- 10.985 , 0.188170103964573 , -- 10.99 , 0.283066815855546 , -- 10.995 , 0.425428418732869 , -- 11.0 , 0.605185596503197 , -- 11.005 , 0.808842841129001 , -- 11.01 , 1.0203252588096 , -- 11.015 , 1.22200011907392 , -- 11.02 , 1.39594474367148 , -- 11.025 , 1.52549944650203 , -- 11.03 , 1.59700049844879 , -- 11.035 , 1.60145576944865 , -- 11.04 , 1.53581761942562 , -- 11.045 , 1.4034930323483 , -- 11.05 , 1.2138831423925 , -- 11.055 , 0.980912371026411 , -- 11.06 , 0.720812505576093 , -- 11.065 , 0.449601892036102 , -- 11.07 , 0.180857582628542 , -- 11.075 , -7.573381698891210E-02 , -- 11.08 , -0.31470812975405 , -- 11.085 , -0.53405962087938 , -- 11.09 , -0.73364261678681 , -- 11.095 , -0.91330540113887 , -- 11.1 , -1.07132417643687 , -- 11.105 , -1.20365312210336 , -- 11.11 , -1.30419832213249 , -- 11.115 , -1.36604239161232 , -- 11.12 , -1.38321880818252 , -- 11.125 , -1.35249870150789 , -- 11.13 , -1.27462783831177 , -- 11.135 , -1.15465182792767 , -- 11.14 , -1.00123343402233 , -- 11.145 , -0.82518952456788 , -- 11.15 , -0.63769529339716 , -- 11.155 , -0.44866816516864 , -- 11.16 , -0.26576203055682 , -- 11.165 , -9.416463454136630E-02 , -- 11.17 , 6.287575092606090E-02 , -- 11.175 , 0.203141505865471 , -- 11.18 , 0.324579712695666 , -- 11.185 , 0.424889751727608 , -- 11.19 , 0.501750804315283 , -- 11.195 , 0.5536421159011 , -- 11.2 , 0.580921794960766 , -- 11.205 , 0.586704260853481 , -- 11.21 , 0.5770850470881 , -- 11.215 , 0.560449668733132 , -- 11.22 , 0.545887300846328 , -- 11.225 , 0.541047479949923 , -- 11.23 , 0.549990662947013 , -- 11.235 , 0.571663114185204 , -- 11.24 , 0.599500251771258 , -- 11.245 , 0.62236878054162 , -- 11.25 , 0.626713322562836 , -- 11.255 , 0.599434772191117 , -- 11.26 , 0.530838614269415 , -- 11.265 , 0.416951659398843 , -- 11.27 , 0.26068866151549 , -- 11.275 , 7.163385796821510E-02 , -- 11.28 , -0.13542954911164 , -- 11.285 , -0.34285006284799 , -- 11.29 , -0.53271798082564 , -- 11.295 , -0.68922055953639 , -- 11.3 , -0.80031992822441 , -- 11.305 , -0.85859556643174 , -- 11.31 , -0.86132208764303 , -- 11.315 , -0.81002406922002 , -- 11.32 , -0.70979684966059 , -- 11.325 , -0.56862676261062 , -- 11.33 , -0.39681435075012 , -- 11.335 , -0.20645292887016 , -- 11.34 , -1.082875708200500E-02 , -- 11.345 , 0.176412752549899 , -- 11.35 , 0.342376371445806 , -- 11.355 , 0.476235796330172 , -- 11.36 , 0.570527791788077 , -- 11.365 , 0.622137109693916 , -- 11.37 , 0.632674434445817 , -- 11.375 , 0.608089217990313 , -- 11.38 , 0.557537864431003 , -- 11.385 , 0.491727720373806 , -- 11.39 , 0.421100488617183 , -- 11.395 , 0.35424883871057 , -- 11.4 , 0.296898598214297 , -- 11.405 , 0.251615782949777 , -- 11.41 , 0.218205567537362 , -- 11.415 , 0.194575186033259 , -- 11.42 , 0.177750889222743 , -- 11.425 , 0.164739545969125 , -- 11.43 , 0.153046754059915 , -- 11.435 , 0.140795993214209 , -- 11.44 , 0.12656443411951 , -- 11.445 , 0.109119048772985 , -- 11.45 , 8.726746617413900E-02 , -- 11.455 , 5.991980120903190E-02 , -- 11.46 , 2.635460927914640E-02 , -- 11.465 , -1.345275150280380E-02 , -- 11.47 , -5.863610709200840E-02 , -- 11.475 , -0.10755044102404 , -- 11.48 , -0.15824658177879 , -- 11.485 , -0.20921212071436 , -- 11.49 , -0.26013226175091 , -- 11.495 , -0.31237245530863 , -- 11.5 , -0.36890715351072 , -- 11.505 , -0.43358437734804 , -- 11.51 , -0.50981957766845 , -- 11.515 , -0.59903776556946 , -- 11.52 , -0.69931194037806 , -- 11.525 , -0.80465691443919 , -- 11.53 , -0.90529166691289 , -- 11.535 , -0.98894889157901 , -- 11.54 , -1.0430005689334 , -- 11.545 , -1.05693388169808 , -- 11.55 , -1.0245796623575 , -- 11.555 , -0.94554374723514 , -- 11.56 , -0.82548253167239 , -- 11.565 , -0.67515951222416 , -- 11.57 , -0.50853411181021 , -- 11.575 , -0.34035152824456 , -- 11.58 , -0.18380744340702 , -- 11.585 , -4.877605466847740E-02 , -- 11.59 , 5.909608053637810E-02 , -- 11.595 , 0.138405652647701 , -- 11.6 , 0.191311518017365 , -- 11.605 , 0.222508949979136 , -- 11.61 , 0.238194003082017 , -- 11.615 , 0.245269919971124 , -- 11.62 , 0.250838712250952 , -- 11.625 , 0.261870016704265 , -- 11.63 , 0.284836510438269 , -- 11.635 , 0.325131372886616 , -- 11.64 , 0.386198740355232 , -- 11.645 , 0.468513501462264 , -- 11.65 , 0.568696341674455 , -- 11.655 , 0.679148315040223 , -- 11.66 , 0.788508513966795 , -- 11.665 , 0.883056182933764 , -- 11.67 , 0.948906416298242 , -- 11.675 , 0.974570797520427 , -- 11.68 , 0.953277599477234 , -- 11.685 , 0.884438058167201 , -- 11.69 , 0.77382364723826 , -- 11.695 , 0.632334566850428 , -- 11.7 , 0.473622939615698 , -- 11.705 , 0.311143111887763 , -- 11.71 , 0.15539149490874 , -- 11.715 , 1.204008787083370E-02 , -- 11.72 , -0.1185541756946 , -- 11.725 , -0.24038836981401 , -- 11.73 , -0.35969118541412 , -- 11.735 , -0.48228327823872 , -- 11.74 , -0.61114632720659 , -- 11.745 , -0.74488165421895 , -- 11.75 , -0.87742903375438 , -- 11.755 , -0.9990735442117 , -- 11.76 , -1.09838127444184 , -- 11.765 , -1.16449496867241 , -- 11.77 , -1.18914405096313 , -- 11.775 , -1.1678940579368 , -- 11.78 , -1.10040933370095 , -- 11.785 , -0.98984205208497 , -- 11.79 , -0.8417105178341 , -- 11.795 , -0.66273801588279 , -- 11.8 , -0.46007426875265 , -- 11.805 , -0.24109784101173 , -- 11.81 , -1.376424841735200E-02 , -- 11.815 , 0.212820798236347 , -- 11.82 , 0.428004774853851 , -- 11.825 , 0.61976809620263 , -- 11.83 , 0.775664732827253 , -- 11.835 , 0.884459785072971 , -- 11.84 , 0.938105319486098 , -- 11.845 , 0.933533376809836 , -- 11.85 , 0.873720830366818 , -- 11.855 , 0.767639484838718 , -- 11.86 , 0.628977669852066 , -- 11.865 , 0.4738539721813 , -- 11.87 , 0.31801589351757 , -- 11.875 , 0.174157204161953 , -- 11.88 , 4.995725310342680E-02 , -- 11.885 , -5.275216941488590E-02 , -- 11.89 , -0.13756423084181 , -- 11.895 , -0.2120196831066 , -- 11.9 , -0.28548456301669 , -- 11.905 , -0.36691840941378 , -- 11.91 , -0.46300320666114 , -- 11.915 , -0.57696070561373 , -- 11.92 , -0.70814553643099 , -- 11.925 , -0.85232717509853 , -- 11.93 , -1.00241060096662 , -- 11.935 , -1.14936568830572 , -- 11.94 , -1.28315120023664 , -- 11.945 , -1.39356260774938 , -- 11.95 , -1.47101607033074 , -- 11.955 , -1.5073448490242 , -- 11.96 , -1.4966490584904 , -- 11.965 , -1.43616086274327 , -- 11.97 , -1.32698077186283 , -- 11.975 , -1.17446433758603 , -- 11.98 , -0.98804059864846 , -- 11.985 , -0.78032474331784 , -- 11.99 , -0.56556840849598 , -- 11.995 , -0.35765933543277 , -- 12.0 , -0.16807550799874 , -- 12.005 , -4.227255766186140E-03 , -- 12.01 , 0.131383604645629 , -- 12.015 , 0.240987503608671 , -- 12.02 , 0.330348730788584 , -- 12.025 , 0.406826008170448 , -- 12.03 , 0.477144240124697 , -- 12.035 , 0.545422501700242 , -- 12.04 , 0.611915404843405 , -- 12.045 , 0.672755857445556 , -- 12.05 , 0.720723072194553 , -- 12.055 , 0.746832365003761 , -- 12.06 , 0.742346946489963 , -- 12.065 , 0.700760339032901 , -- 12.07 , 0.619339003519911 , -- 12.075 , 0.499959785870592 , -- 12.08 , 0.349159304278182 , -- 12.085 , 0.177470223182518 , -- 12.09 , -1.753350545225190E-03 , -- 12.095 , -0.17379950342875 , -- 12.1 , -0.32413511149758 , -- 12.105 , -0.43987021437218 , -- 12.11 , -0.51104917071923 , -- 12.115 , -0.53171143244092 , -- 12.12 , -0.50064639271511 , -- 12.125 , -0.42174741533336 , -- 12.13 , -0.30385287601246 , -- 12.135 , -0.1599770009419 , -- 12.14 , -5.916472086063350E-03 , -- 12.145 , 0.141672124157728 , -- 12.15 , 0.267467136745314 , -- 12.155 , 0.359599717485464 , -- 12.16 , 0.411271872916484 , -- 12.165 , 0.421529890421321 , -- 12.17 , 0.394986365391134 , -- 12.175 , 0.340522937951077 , -- 12.18 , 0.269238562662315 , -- 12.185 , 0.19209641315972 , -- 12.19 , 0.11779958413244 , -- 12.195 , 5.136625423508250E-02 , -- 12.2 , -6.300947873046220E-03 , -- 12.205 , -5.782223054975370E-02 , -- 12.21 , -0.10793985148095 , -- 12.215 , -0.16174127408618 , -- 12.22 , -0.22298866763169 , -- 12.225 , -0.2929886222154 , -- 12.23 , -0.37024238871399 , -- 12.235 , -0.45090142997871 , -- 12.24 , -0.52980992267136 , -- 12.245 , -0.60178949630599 , -- 12.25 , -0.66276746147737 , -- 12.255 , -0.71046604589472 , -- 12.26 , -0.74450641227213 , -- 12.265 , -0.76599806365513 , -- 12.27 , -0.77681628816103 , -- 12.275 , -0.77885826543421 , -- 12.28 , -0.77352755022123 , -- 12.285 , -0.76159237398235 , -- 12.29 , -0.74340951487468 , -- 12.295 , -0.7193684533261 , -- 12.3 , -0.69033859752466 , -- 12.305 , -0.65790529310338 , -- 12.31 , -0.62427337609045 , -- 12.315 , -0.59183465481714 , -- 12.32 , -0.5625391602505 , -- 12.325 , -0.53727609431785 , -- 12.33 , -0.51549939568466 , -- 12.335 , -0.49523027754421 , -- 12.34 , -0.47348196058407 , -- 12.345 , -0.44699386193397 , -- 12.35 , -0.41308162478787 , -- 12.355 , -0.37035623858392 , -- 12.36 , -0.31912406711736 , -- 12.365 , -0.26136188585533 , -- 12.37 , -0.20030871435109 , -- 12.375 , -0.13979053261561 , -- 12.38 , -8.348819445843680E-02 , -- 12.385 , -3.432412971860200E-02 , -- 12.39 , 5.898257672503130E-03 , -- 12.395 , 3.658675251617240E-02 , -- 12.4 , 5.823490831704580E-02 , -- 12.405 , 7.220973009677149E-02 , -- 12.41 , 8.054556791305920E-02 , -- 12.415 , 8.583652449551200E-02 , -- 12.42 , 9.119751190995400E-02 , -- 12.425 , 0.10022495276452 , -- 12.43 , 0.116830802684467 , -- 12.435 , 0.144865533553475 , -- 12.44 , 0.187496464655846 , -- 12.445 , 0.246429769927851 , -- 12.45 , 0.321134575890146 , -- 12.455 , 0.408310004218564 , -- 12.46 , 0.501792671730819 , -- 12.465 , 0.593049206029892 , -- 12.47 , 0.672237912914609 , -- 12.475 , 0.729699407315016 , -- 12.48 , 0.757595593934302 , -- 12.485 , 0.751370987649759 , -- 12.49 , 0.710716591717499 , -- 12.495 , 0.639832178015772 , -- 12.5 , 0.546914264636683 , -- 12.505 , 0.442962983193198 , -- 12.51 , 0.340141957400465 , -- 12.515 , 0.249991895482425 , -- 12.52 , 0.181816356681784 , -- 12.525 , 0.14149413564273 , -- 12.53 , 0.130883062190031 , -- 12.535 , 0.147852731887966 , -- 12.54 , 0.186894240935408 , -- 12.545 , 0.240161777063203 , -- 12.55 , 0.298772249040031 , -- 12.555 , 0.3541646202598 , -- 12.56 , 0.399336722395081 , -- 12.565 , 0.429803491932159 , -- 12.57 , 0.444142296553351 , -- 12.575 , 0.444055340271153 , -- 12.58 , 0.433919042501565 , -- 12.585 , 0.41987739717275 , -- 12.59 , 0.408602791719151 , -- 12.595 , 0.405932599777175 , -- 12.6 , 0.415626645287793 , -- 12.605 , 0.438500795189521 , -- 12.61 , 0.47213105784221 , -- 12.615 , 0.511225323925744 , -- 12.62 , 0.548612052766521 , -- 12.625 , 0.576660272126196 , -- 12.63 , 0.588829953918048 , -- 12.635 , 0.581021197761628 , -- 12.64 , 0.552418992096461 , -- 12.645 , 0.505653719521126 , -- 12.65 , 0.446259700593861 , -- 12.655 , 0.381569197808235 , -- 12.66 , 0.319325454510432 , -- 12.665 , 0.266332799357825 , -- 12.67 , 0.227442179455834 , -- 12.675 , 0.20505248099 , -- 12.68 , 0.199165657452942 , -- 12.685 , 0.207885677656546 , -- 12.69 , 0.228151213713856 , -- 12.695 , 0.256464303289308 , -- 12.7 , 0.289423464944378 , -- 12.705 , 0.323974105633788 , -- 12.71 , 0.357399971553342 , -- 12.715 , 0.387180213631022 , -- 12.72 , 0.410871216078733 , -- 12.725 , 0.426149440224674 , -- 12.73 , 0.431066724422046 , -- 12.735 , 0.424468610875424 , -- 12.74 , 0.40643852414304 , -- 12.745 , 0.378585136191504 , -- 12.75 , 0.344023630341179 , -- 12.755 , 0.306976904799534 , -- 12.76 , 0.272045167670388 , -- 12.765 , 0.243295410789869 , -- 12.77 , 0.223399948751481 , -- 12.775 , 0.213036444793139 , -- 12.78 , 0.210713889469279 , -- 12.785 , 0.213057227036913 , -- 12.79 , 0.21547276609123 , -- 12.795 , 0.213006795751766 , -- 12.8 , 0.201182178134479 , -- 12.805 , 0.176611102924828 , -- 12.81 , 0.137299208402565 , -- 12.815 , 8.261651333889580E-02 , -- 12.82 , 1.306254997938910E-02 , -- 12.825 , -7.003874532972119E-02 , -- 12.83 , -0.16475325893821 , -- 12.835 , -0.26859374971277 , -- 12.84 , -0.37841766630558 , -- 12.845 , -0.49027765178853 , -- 12.85 , -0.59935591527846 , -- 12.855 , -0.70013189417767 , -- 12.86 , -0.78683177941038 , -- 12.865 , -0.85412623949955 , -- 12.87 , -0.89792127381358 , -- 12.875 , -0.91603916182254 , -- 12.88 , -0.90857357773468 , -- 12.885 , -0.87778714750083 , -- 12.89 , -0.8275372966502 , -- 12.895 , -0.76235786224487 , -- 12.9 , -0.68643393291051 , -- 12.905 , -0.60274756840487 , -- 12.91 , -0.51264247885951 , -- 12.915 , -0.41593073711012 , -- 12.92 , -0.3115269410358 , -- 12.925 , -0.19842747985447 , -- 12.93 , -7.676760694603291E-02 , -- 12.935 , 5.135539420685220E-02 , -- 12.94 , 0.181528383908596 , -- 12.945 , 0.307260660414741 , -- 12.95 , 0.420769213103223 , -- 12.955 , 0.514139979660135 , -- 12.96 , 0.580592682156079 , -- 12.965 , 0.615578076246798 , -- 12.97 , 0.617476907926892 , -- 12.975 , 0.587799377315074 , -- 12.98 , 0.530889280436902 , -- 12.985 , 0.453243660311424 , -- 12.99 , 0.362622392194437 , -- 12.995 , 0.2671120583141 , -- 13.0 , 0.174286119779362 , -- 13.005 , 9.052797178882990E-02 , -- 13.01 , 2.054498441234870E-02 , -- 13.015 , -3.294702871288870E-02 , -- 13.02 , -6.937300005549160E-02 , -- 13.025 , -9.028206231971420E-02 , -- 13.03 , -9.913110412573760E-02 , -- 13.035 , -0.10083734030815 , -- 13.04 , -0.10108450259662 , -- 13.045 , -0.1054266897417 , -- 13.05 , -0.1182915683999 , -- 13.055 , -0.14205888957835 , -- 13.06 , -0.17640190935702 , -- 13.065 , -0.21806865581631 , -- 13.07 , -0.26120089347156 , -- 13.075 , -0.29817769418101 , -- 13.08 , -0.32085004389739 , -- 13.085 , -0.32193831070962 , -- 13.09 , -0.29631759697471 , -- 13.095 , -0.24193696858333 , -- 13.1 , -0.16019970762232 , -- 13.105 , -5.574993867029920E-02 , -- 13.11 , 6.425618048517991E-02 , -- 13.115 , 0.19122987419663 , -- 13.12 , 0.316346629224766 , -- 13.125 , 0.431653751489729 , -- 13.13 , 0.530914954469608 , -- 13.135 , 0.610121196882937 , -- 13.14 , 0.667657470309265 , -- 13.145 , 0.704186599565721 , -- 13.15 , 0.722325191446681 , -- 13.155 , 0.726186367330791 , -- 13.16 , 0.720836106520834 , -- 13.165 , 0.711688820321258 , -- 13.17 , 0.703862564199362 , -- 13.175 , 0.701524520420123 , -- 13.18 , 0.707294612263167 , -- 13.185 , 0.721797723723084 , -- 13.19 , 0.743474213000332 , -- 13.195 , 0.768726481461021 , -- 13.2 , 0.792431876186836 , -- 13.205 , 0.808764824723334 , -- 13.21 , 0.812196723822406 , -- 13.215 , 0.798471820125594 , -- 13.22 , 0.765360902698407 , -- 13.225 , 0.713020417223642 , -- 13.23 , 0.643892155196421 , -- 13.235 , 0.562167990243985 , -- 13.24 , 0.472970245560551 , -- 13.245 , 0.381438619514679 , -- 13.25 , 0.291951206368075 , -- 13.255 , 0.20762340636979 , -- 13.26 , 0.130166940321081 , -- 13.265 , 6.006289386634430E-02 , -- 13.27 , -3.060365982684810E-03 , -- 13.275 , -6.001488208941340E-02 , -- 13.28 , -0.11173380533579 , -- 13.285 , -0.15914104631288 , -- 13.29 , -0.20317809418618 , -- 13.295 , -0.24493336090531 , -- 13.3 , -0.28573011925772 , -- 13.305 , -0.32707569024184 , -- 13.31 , -0.37040876594875 , -- 13.315 , -0.41668833903021 , -- 13.32 , -0.46592656198441 , -- 13.325 , -0.51683388329442 , -- 13.33 , -0.56671530350641 , -- 13.335 , -0.61172427575717 , -- 13.34 , -0.64745289857378 , -- 13.345 , -0.66975635467017 , -- 13.35 , -0.67561421984368 , -- 13.355 , -0.66382212752523 , -- 13.36 , -0.63533221269618 , -- 13.365 , -0.59315990071751 , -- 13.37 , -0.54187928568118 , -- 13.375 , -0.48684683870894 , -- 13.38 , -0.43334458417513 , -- 13.385 , -0.38584852580448 , -- 13.39 , -0.34757223717143 , -- 13.395 , -0.32034609191295 , -- 13.4 , -0.30479305822331 , -- 13.405 , -0.30068667519817 , -- 13.41 , -0.30734431404504 , -- 13.415 , -0.32393187524719 , -- 13.42 , -0.3496124571983 , -- 13.425 , -0.38355062958007 , -- 13.43 , -0.42483772740574 , -- 13.435 , -0.47243959941852 , -- 13.44 , -0.52523698989138 , -- 13.445 , -0.58218855059142 , -- 13.45 , -0.64255715702482 , -- 13.455 , -0.70611547192509 , -- 13.46 , -0.77319959733532 , -- 13.465 , -0.84453581144061 , -- 13.47 , -0.9208154277502 , -- 13.475 , -1.00210330165744 , -- 13.48 , -1.08722318257344 , -- 13.485 , -1.17331384017982 , -- 13.49 , -1.25571905330723 , -- 13.495 , -1.32830569669314 , -- 13.5 , -1.38419198321401 , -- 13.505 , -1.41674939954092 , -- 13.51 , -1.42066916256513 , -- 13.515 , -1.39284912504276 , -- 13.52 , -1.33290856588875 , -- 13.525 , -1.24321481899912 , -- 13.53 , -1.12845482092199 , -- 13.535 , -0.994859301148 , -- 13.54 , -0.84929200472393 , -- 13.545 , -0.69840229944309 , -- 13.55 , -0.5480171915834 , -- 13.555 , -0.40283245150506 , -- 13.56 , -0.26639859300057 , -- 13.565 , -0.1412841699847 , -- 13.57 , -2.930752910284020E-02 , -- 13.575 , 6.831031669366761E-02 , -- 13.58 , 0.150909902638648 , -- 13.585 , 0.218485436556094 , -- 13.59 , 0.271817772885176 , -- 13.595 , 0.312563547048263 , -- 13.6 , 0.343197563758831 , -- 13.605 , 0.366784232668975 , -- 13.61 , 0.386577813348275 , -- 13.615 , 0.405567940703392 , -- 13.62 , 0.426060284638387 , -- 13.625 , 0.449416325446865 , -- 13.63 , 0.476003373865086 , -- 13.635 , 0.505362938780156 , -- 13.64 , 0.536518767578895 , -- 13.645 , 0.568328300506654 , -- 13.65 , 0.599754845087405 , -- 13.655 , 0.630000025300325 , -- 13.66 , 0.6584695973929 , -- 13.665 , 0.68462841460832 , -- 13.67 , 0.70782686172262 , -- 13.675 , 0.727203534668359 , -- 13.68 , 0.741722744375036 , -- 13.685 , 0.750362416108883 , -- 13.69 , 0.752392406085506 , -- 13.695 , 0.747650040601305 , -- 13.7 , 0.736696231685042 , -- 13.705 , 0.720777621636586 , -- 13.71 , 0.701571294344929 , -- 13.715 , 0.680769236869278 , -- 13.72 , 0.659613778989939 , -- 13.725 , 0.638519591968826 , -- 13.73 , 0.616905016742059 , -- 13.735 , 0.593283746255628 , -- 13.74 , 0.565603855337414 , -- 13.745 , 0.531733554716355 , -- 13.75 , 0.489962659748419 , -- 13.755 , 0.439375608243233 , -- 13.76 , 0.380009446404367 , -- 13.765 , 0.312773129830936 , -- 13.77 , 0.239195423372873 , -- 13.775 , 0.16110638214858 , -- 13.78 , 8.038995906805420E-02 , -- 13.785 , -1.102897232504770E-03 , -- 13.79 , -8.144778281704360E-02 , -- 13.795 , -0.15840843583426 , -- 13.8 , -0.22917659635052 , -- 13.805 , -0.29024518206889 , -- 13.81 , -0.33752175024298 , -- 13.815 , -0.36674198188098 , -- 13.82 , -0.37413071891857 , -- 13.825 , -0.35717935529397 , -- 13.83 , -0.31535074520267 , -- 13.835 , -0.25052105857336 , -- 13.84 , -0.16702284226815 , -- 13.845 , -7.124636094412699E-02 , -- 13.85 , 2.913353087510890E-02 , -- 13.855 , 0.126149325078345 , -- 13.86 , 0.212544685340441 , -- 13.865 , 0.282593826653342 , -- 13.87 , 0.33259342353236 , -- 13.875 , 0.360977014896564 , -- 13.88 , 0.368090497895831 , -- 13.885 , 0.355740094833499 , -- 13.89 , 0.326653538417733 , -- 13.895 , 0.283980395609887 , -- 13.9 , 0.230911938687721 , -- 13.905 , 0.170438689852821 , -- 13.91 , 0.105217955743757 , -- 13.915 , 3.748846121428490E-02 , -- 13.92 , -3.100811006762060E-02 , -- 13.925 , -9.912461677678459E-02 , -- 13.93 , -0.16638732593593 , -- 13.935 , -0.23301599989748 , -- 13.94 , -0.29981098203477 , -- 13.945 , -0.36788336374228 , -- 13.95 , -0.43823790831234 , -- 13.955 , -0.51128976367887 , -- 13.96 , -0.58642827752511 , -- 13.965 , -0.66176331535379 , -- 13.97 , -0.7341480161194 , -- 13.975 , -0.79952454249667 , -- 13.98 , -0.85353878258576 , -- 13.985 , -0.89230509468498 , -- 13.99 , -0.9131476514604 , -- 13.995 , -0.91514375354423 , -- 14.0 , -0.8993367487938 , -- 14.005 , -0.86856422332842 , -- 14.01 , -0.82694415950239 , -- 14.015 , -0.77913771351111 , -- 14.02 , -0.72955729658514 , -- 14.025 , -0.68168905647206 , -- 14.03 , -0.63766151216947 , -- 14.035 , -0.59811504505913 , -- 14.04 , -0.56235853309889 , -- 14.045 , -0.52872726325526 , -- 14.05 , -0.49503897771436 , -- 14.055 , -0.45902725746187 , -- 14.06 , -0.41868594009816 , -- 14.065 , -0.37248337306763 , -- 14.07 , -0.31947100513302 , -- 14.075 , -0.25931189817463 , -- 14.08 , -0.19228261646431 , -- 14.085 , -0.11925792681763 , -- 14.09 , -4.169532968283350E-02 , -- 14.095 , 3.843303316390890E-02 , -- 14.1 , 0.118775003838835 , -- 14.105 , 0.196837583343436 , -- 14.11 , 0.270307193173439 , -- 14.115 , 0.337420184008135 , -- 14.12 , 0.397291393971841 , -- 14.125 , 0.450126440210993 , -- 14.13 , 0.497226657276013 , -- 14.135 , 0.540774142842358 , -- 14.14 , 0.58340264798186 , -- 14.145 , 0.627643304621108 , -- 14.15 , 0.675349975738562 , -- 14.155 , 0.727241025622671 , -- 14.16 , 0.782651129746367 , -- 14.165 , 0.839560451090441 , -- 14.17 , 0.894881294455553 , -- 14.175 , 0.944955884798899 , -- 14.18 , 0.986144014351956 , -- 14.185 , 1.015390719979 , -- 14.19 , 1.0306572943892 , -- 14.195 , 1.03115234481902 , -- 14.2 , 1.01733343986871 , -- 14.205 , 0.990709541557108 , -- 14.21 , 0.953502790822332 , -- 14.215 , 0.908254264710393 , -- 14.22 , 0.857454756635746 , -- 14.225 , 0.803265224100822 , -- 14.23 , 0.74737385316121 , -- 14.235 , 0.690995601525318 , -- 14.24 , 0.635005073529152 , -- 14.245 , 0.580160133049894 , -- 14.25 , 0.527369694111442 , -- 14.255 , 0.477938039158216 , -- 14.26 , 0.433728338232803 , -- 14.265 , 0.397194149800069 , -- 14.27 , 0.371248511478309 , -- 14.275 , 0.358963505823744 , -- 14.28 , 0.363137797938165 , -- 14.285 , 0.385787231840523 , -- 14.29 , 0.427657749130475 , -- 14.295 , 0.487849697242734 , -- 14.3 , 0.563646552494242 , -- 14.305 , 0.650598748291401 , -- 14.31 , 0.742869615401765 , -- 14.315 , 0.833794067276776 , -- 14.32 , 0.916556460872168 , -- 14.325 , 0.984863842045941 , -- 14.33 , 1.0335040976667 , -- 14.335 , 1.05869041827564 , -- 14.34 , 1.05816644274048 , -- 14.345 , 1.03108361491544 , -- 14.35 , 0.977735351761127 , -- 14.355 , 0.899232930675646 , -- 14.36 , 0.797237214065439 , -- 14.365 , 0.673796884116058 , -- 14.37 , 0.531337867932015 , -- 14.375 , 0.372747573641774 , -- 14.38 , 0.20150981243218 , -- 14.385 , 2.178427411223690E-02 , -- 14.39 , -0.16161383529816 , -- 14.395 , -0.34339606863716 , -- 14.4 , -0.5181084642692 , -- 14.405 , -0.68053644448525 , -- 14.41 , -0.826088703855 , -- 14.415 , -0.95112570187104 , -- 14.42 , -1.05313423965707 , -- 14.425 , -1.13075625342751 , -- 14.43 , -1.18366851217429 , -- 14.435 , -1.21238579974723 , -- 14.44 , -1.21803310838506 , -- 14.445 , -1.20215241564511 , -- 14.45 , -1.16656016251128 , -- 14.455 , -1.113269900772 , -- 14.46 , -1.04444581397611 , -- 14.465 , -0.96236345544593 , -- 14.47 , -0.86935386142724 , -- 14.475 , -0.76773118679175 , -- 14.48 , -0.65972693552001 , -- 14.485 , -0.54746173019692 , -- 14.49 , -0.43299292085595 , -- 14.495 , -0.3184397215422 , -- 14.5 , -0.20616849862018 , -- 14.505 , -9.897318159698620E-02 , -- 14.51 , -1.803143023172810E-04 , -- 14.515 , 8.640194233650360E-02 , -- 14.52 , 0.156727372406871 , -- 14.525 , 0.206940131693837 , -- 14.53 , 0.233914703352716 , -- 14.535 , 0.235793875210402 , -- 14.54 , 0.212387260096523 , -- 14.545 , 0.165314426336394 , -- 14.55 , 9.783758697368690E-02 , -- 14.555 , 1.439534230634960E-02 , -- 14.56 , -8.005859022341789E-02 , -- 14.565 , -0.18076618261283 , -- 14.57 , -0.28374454180973 , -- 14.575 , -0.38610798365218 , -- 14.58 , -0.48605081190961 , -- 14.585 , -0.58252398542127 , -- 14.59 , -0.67470367132805 , -- 14.595 , -0.76142935693159 , -- 14.6 , -0.8407780560685 , -- 14.605 , -0.90992374040628 , -- 14.61 , -0.96532870247995 , -- 14.615 , -1.00324396367882 , -- 14.62 , -1.02038773635927 , -- 14.625 , -1.01463341589249 , -- 14.63 , -0.98552757460307 , -- 14.635 , -0.93450835223946 , -- 14.64 , -0.86477120783303 , -- 14.645 , -0.78081893710178 , -- 14.65 , -0.68781873202676 , -- 14.655 , -0.59091719649253 , -- 14.66 , -0.49467793607145 , -- 14.665 , -0.40274402274473 , -- 14.67 , -0.31777533615604 , -- 14.675 , -0.24161241000393 , -- 14.68 , -0.17557875216008 , -- 14.685 , -0.12078750746673 , -- 14.69 , -7.835224295217311E-02 , -- 14.695 , -4.942101977486440E-02 , -- 14.7 , -3.503749471905150E-02 , -- 14.705 , -3.587495731215070E-02 , -- 14.71 , -5.194398103175540E-02 , -- 14.715 , -8.236828155631780E-02 , -- 14.72 , -0.12531697112263 , -- 14.725 , -0.17812203875209 , -- 14.73 , -0.23756805254037 , -- 14.735 , -0.30028601265584 , -- 14.74 , -0.36316012018238 , -- 14.745 , -0.42365909583363 , -- 14.75 , -0.48002335079991 , -- 14.755 , -0.53128602795839 , -- 14.76 , -0.57714447879069 , -- 14.765 , -0.61773654874064 , -- 14.77 , -0.65338922947777 , -- 14.775 , -0.68440719071073 , -- 14.78 , -0.71094150841826 , -- 14.785 , -0.73295383213119 , -- 14.79 , -0.75025831938642 , -- 14.795 , -0.76260438890415 , -- 14.8 , -0.76975912976851 , -- 14.805 , -0.77155180131721 , -- 14.81 , -0.76787415141689 , -- 14.815 , -0.75863134459094 , -- 14.82 , -0.74368104295612 , -- 14.825 , -0.72278322433993 , -- 14.83 , -0.69560054902327 , -- 14.835 , -0.66175375591306 , -- 14.84 , -0.62093898535516 , -- 14.845 , -0.57306913773937 , -- 14.85 , -0.51841917741191 , -- 14.855 , -0.45771315164191 , -- 14.86 , -0.392137917305 , -- 14.865 , -0.3232532945768 , -- 14.87 , -0.25282156152333 , -- 14.875 , -0.18257072630809 , -- 14.88 , -0.11395570313114 , -- 14.885 , -4.795078990473090E-02 , -- 14.89 , 1.505030752196730E-02 , -- 14.895 , 7.523505899511330E-02 , -- 14.9 , 0.133241663209769 , -- 14.905 , 0.189946958395501 , -- 14.91 , 0.246204884243539 , -- 14.915 , 0.302617865301028 , -- 14.92 , 0.359383341937356 , -- 14.925 , 0.416272256914715 , -- 14.93 , 0.472730379837134 , -- 14.935 , 0.528097455638089 , -- 14.94 , 0.581866656852053 , -- 14.945 , 0.633923511292493 , -- 14.95 , 0.684671503159956 , -- 14.955 , 0.735006617044871 , -- 14.96 , 0.78610900707482 , -- 14.965 , 0.839096114213373 , -- 14.97 , 0.894592925855566 , -- 14.975 , 0.952340646800937 , -- 14.98 , 1.0109322862822 , -- 14.985 , 1.06776815099708 , -- 14.99 , 1.11925763952313 , -- 14.995 , 1.16125733848899 , -- 15.0 , 1.18965840938029 , -- 15.005 , 1.20101711803106 , -- 15.01 , 1.19309156203439 , -- 15.015 , 1.16518353563898 , -- 15.02 , 1.11821232455035 , -- 15.025 , 1.0545184865003 , -- 15.03 , 0.977448615628865 , -- 15.035 , 0.890815252481333 , -- 15.04 , 0.798354444510221 , -- 15.045 , 0.703279494461959 , -- 15.05 , 0.60801847543151 , -- 15.055 , 0.514150357593879 , -- 15.06 , 0.422530486995826 , -- 15.065 , 0.333543044544543 , -- 15.07 , 0.247413880227417 , -- 15.075 , 0.164505011560775 , -- 15.08 , 8.554502116652860E-02 , -- 15.085 , 1.176008397877900E-02 , -- 15.09 , -5.508991016794810E-02 , -- 15.095 , -0.11277329041032 , -- 15.1 , -0.15872202731611 , -- 15.105 , -0.19023769676271 , -- 15.11 , -0.20475543680883 , -- 15.115 , -0.20016459209247 , -- 15.12 , -0.17515953672649 , -- 15.125 , -0.1295909322101 , -- 15.13 , -6.475341455153370E-02 , -- 15.135 , 1.645644779243700E-02 , -- 15.14 , 0.109582085491203 , -- 15.145 , 0.208891920094615 , -- 15.15 , 0.307902347961824 , -- 15.155 , 0.400086953541137 , -- 15.16 , 0.479656312478387 , -- 15.165 , 0.54227026093024 , -- 15.17 , 0.585531391323096 , -- 15.175 , 0.60915577781107 , -- 15.18 , 0.614771789148716 , -- 15.185 , 0.605386403919845 , -- 15.19 , 0.584635659710548 , -- 15.195 , 0.555987240463961 , -- 15.2 , 0.522078576056577 , -- 15.205 , 0.484332615313383 , -- 15.21 , 0.44293940454718 , -- 15.215 , 0.397175120559912 , -- 15.22 , 0.345968006972672 , -- 15.225 , 0.288543030116857 , -- 15.23 , 0.224972791486283 , -- 15.235 , 0.156481408793171 , -- 15.24 , 8.542958350357370E-02 , -- 15.245 , 1.498370477529230E-02 , -- 15.25 , -5.142934425176120E-02 , -- 15.255 , -0.1107437937938 , -- 15.26 , -0.16078441017566 , -- 15.265 , -0.20057844669055 , -- 15.27 , -0.23037829970624 , -- 15.275 , -0.2514154045316 , -- 15.28 , -0.26546110414046 , -- 15.285 , -0.27433386226401 , -- 15.29 , -0.27947343680654 , -- 15.295 , -0.28170382574971 , -- 15.3 , -0.28121922535055 , -- 15.305 , -0.27778333156123 , -- 15.31 , -0.27106104276765 , -- 15.315 , -0.26098347288903 , -- 15.32 , -0.2480337104626 , -- 15.325 , -0.23338239832851 , -- 15.33 , -0.21883669131141 , -- 15.335 , -0.20662723365469 , -- 15.34 , -0.19908795725974 , -- 15.345 , -0.1983095632208 , -- 15.35 , -0.20583511356768 , -- 15.355 , -0.22245388077999 , -- 15.36 , -0.24810721805446 , -- 15.365 , -0.28190022979588 , -- 15.37 , -0.32218399867655 , -- 15.375 , -0.36668187000496 , -- 15.38 , -0.41262893144551 , -- 15.385 , -0.4569195252945 , -- 15.39 , -0.49626700745835 , -- 15.395 , -0.52739011070132 , -- 15.4 , -0.54723474350703 , -- 15.405 , -0.55322582044501 , -- 15.41 , -0.54352567312437 , -- 15.415 , -0.51725918301048 , -- 15.42 , -0.47466073347181 , -- 15.425 , -0.41710230560527 , -- 15.43 , -0.34698928139492 , -- 15.435 , -0.26752756403572 , -- 15.44 , -0.18240759770015 , -- 15.445 , -9.545429827632960E-02 , -- 15.45 , -1.031774321012660E-02 , -- 15.455 , 6.975569716684001E-02 , -- 15.46 , 0.142031815271298 , -- 15.465 , 0.204287600135245 , -- 15.47 , 0.254724524020873 , -- 15.475 , 0.291852234959508 , -- 15.48 , 0.314393966922164 , -- 15.485 , 0.321257693596354 , -- 15.49 , 0.311592647764159 , -- 15.495 , 0.284924209311069 , -- 15.5 , 0.241333574629117 , -- 15.505 , 0.181630984411648 , -- 15.51 , 0.107473789318163 , -- 15.515 , 2.138659993284420E-02 , -- 15.52 , -7.333294612818740E-02 , -- 15.525 , -0.17281819572361 , -- 15.53 , -0.2729111163528 , -- 15.535 , -0.36947452952708 , -- 15.54 , -0.45868092644508 , -- 15.545 , -0.53724054983261 , -- 15.55 , -0.60253835404275 , -- 15.555 , -0.65267651763316 , -- 15.56 , -0.6864354117723 , -- 15.565 , -0.70318229683703 , -- 15.57 , -0.70276183568102 , -- 15.575 , -0.68540176686393 , -- 15.58 , -0.6516520838685 , -- 15.585 , -0.60236502510189 , -- 15.59 , -0.538706492591 , -- 15.595 , -0.46217410897888 , -- 15.6 , -0.37460077533887 , -- 15.605 , -0.27810973417383 , -- 15.61 , -0.17502716813551 , -- 15.615 , -6.773228527287170E-02 , -- 15.62 , 4.151501433409210E-02 , -- 15.625 , 0.150751860185515 , -- 15.63 , 0.258442092002889 , -- 15.635 , 0.363538574930614 , -- 15.64 , 0.465442765332169 , -- 15.645 , 0.563876126508653 , -- 15.65 , 0.658665592231715 , -- 15.655 , 0.749509291460253 , -- 15.66 , 0.835755718589599 , -- 15.665 , 0.916264699152492 , -- 15.67 , 0.989375816925145 , -- 15.675 , 1.05301420158238 , -- 15.68 , 1.10490739292059 , -- 15.685 , 1.14288462647541 , -- 15.69 , 1.16518849553063 , -- 15.695 , 1.1707464912492 , -- 15.7 , 1.15934157640063 , -- 15.705 , 1.13165264409975 , -- 15.71 , 1.08916287801769 , -- 15.715 , 1.03396048449819 , -- 15.72 , 0.968480895649285 , -- 15.725 , 0.895239610317516 , -- 15.73 , 0.816614791244956 , -- 15.735 , 0.734699276030846 , -- 15.74 , 0.651241095374945 , -- 15.745 , 0.567649521370319 , -- 15.75 , 0.485049163207599 , -- 15.755 , 0.404335549986381 , -- 15.76 , 0.326219056425138 , -- 15.765 , 0.251231356865374 , -- 15.77 , 0.179720965294244 , -- 15.775 , 0.111831041730238 , -- 15.78 , 4.750476279777080E-02 , -- 15.785 , -1.347798247405040E-02 , -- 15.79 , -7.141356069694010E-02 , -- 15.795 , -0.12656450883031 , -- 15.8 , -0.1790372399842 , -- 15.805 , -0.2286955113047 , -- 15.81 , -0.27512243015728 , -- 15.815 , -0.31766447732324 , -- 15.82 , -0.3555388110919 , -- 15.825 , -0.38798921520158 , -- 15.83 , -0.41444221410296 , -- 15.835 , -0.43463094635962 , -- 15.84 , -0.44864369112348 , -- 15.845 , -0.4568931292131 , -- 15.85 , -0.46000160926806 , -- 15.855 , -0.45865250041628 , -- 15.86 , -0.45343877892519 , -- 15.865 , -0.44476504067162 , -- 15.87 , -0.43283082098116 , -- 15.875 , -0.41771237775514 , -- 15.88 , -0.3995214147592 , -- 15.885 , -0.37860415544342 , -- 15.89 , -0.35572212713179 , -- 15.895 , -0.33216132888134 , -- 15.9 , -0.30972572285948 , -- 15.905 , -0.29059799700979 , -- 15.91 , -0.27708096353175 , -- 15.915 , -0.27126155854412 , -- 15.92 , -0.2746590319597 , -- 15.925 , -0.28792675974919 , -- 15.93 , -0.31066689274262 , -- 15.935 , -0.34140077106906 , -- 15.94 , -0.3777039602476 , -- 15.945 , -0.41648665097944 , -- 15.95 , -0.45437291128764 , -- 15.955 , -0.48811381404708 , -- 15.96 , -0.51496612193939 , -- 15.965 , -0.5329765854495 , -- 15.97 , -0.54113053164364 , -- 15.975 , -0.53935053269995 , -- 15.98 , -0.52835825596445 , -- 15.985 , -0.50943591924887 , -- 15.99 , -0.48413923071434 , -- 15.995 , -0.45401661733085 , -- 16.0 , -0.42038541841803 , -- 16.005 , -0.38419449756936 , -- 16.01 , -0.34598883075877 , -- 16.015 , -0.30596135684737 , -- 16.02 , -0.26406862723475 , -- 16.025 , -0.22017134269813 , -- 16.03 , -0.17416871222392 , -- 16.035 , -0.12609398639317 , -- 16.04 , -7.616580091339020E-02 , -- 16.045 , -2.479105816937940E-02 , -- 16.05 , 2.745737110728120E-02 , -- 16.055 , 7.987861751112391E-02 , -- 16.06 , 0.131672708259285 , -- 16.065 , 0.181958505928516 , -- 16.07 , 0.229779175022502 , -- 16.075 , 0.274114727562895 , -- 16.08 , 0.313912537790184 , -- 16.085 , 0.348155259464482 , -- 16.09 , 0.375959714090624 , -- 16.095 , 0.396703409827832 , -- 16.1 , 0.410143539243666 , -- 16.105 , 0.416499539855543 , -- 16.11 , 0.416464899336383 , -- 16.115 , 0.411132431725026 , -- 16.12 , 0.401834694221056 , -- 16.125 , 0.389926331168038 , -- 16.13 , 0.376552509432684 , -- 16.135 , 0.362455371415181 , -- 16.14 , 0.347864663265341 , -- 16.145 , 0.332498409591647 , -- 16.15 , 0.315673926599289 , -- 16.155 , 0.296498803516978 , -- 16.16 , 0.274095775096738 , -- 16.165 , 0.247800859489553 , -- 16.17 , 0.217295286911219 , -- 16.175 , 0.182636701553898 , -- 16.18 , 0.144199700257594 , -- 16.185 , 0.102548913123023 , -- 16.19 , 5.829530297192130E-02 , -- 16.195 , 1.197592728082750E-02 , -- 16.2 , -3.600290534227300E-02 , -- 16.205 , -8.535615468618291E-02 , -- 16.21 , -0.13584918811621 , -- 16.215 , -0.18721153582539 , -- 16.22 , -0.23906457716721 , -- 16.225 , -0.29090350734869 , -- 16.23 , -0.34213587188623 , -- 16.235 , -0.392170780993 , -- 16.24 , -0.44051591221236 , -- 16.245 , -0.48684480865516 , -- 16.25 , -0.53098857668878 , -- 16.255 , -0.57284978382707 , -- 16.26 , -0.61224319073572 , -- 16.265 , -0.64871598685836 , -- 16.27 , -0.68140334352395 , -- 16.275 , -0.70898222576025 , -- 16.28 , -0.7297595947791 , -- 16.285 , -0.7418948815967 , -- 16.29 , -0.74371891027858 , -- 16.295 , -0.73407611710958 , -- 16.3 , -0.71260329024102 , -- 16.305 , -0.67986749030603 , -- 16.31 , -0.63732240300856 , -- 16.315 , -0.58707824160675 , -- 16.32 , -0.53154405116823 , -- 16.325 , -0.47301455154914 , -- 16.33 , -0.41331652122001 , -- 16.335 , -0.35357961212191 , -- 16.34 , -0.29419497300413 , -- 16.345 , -0.23495140181355 , -- 16.35 , -0.17531083484956 , -- 16.355 , -0.11473456907756 , -- 16.36 , -5.298091218194400E-02 , -- 16.365 , 9.709062607778981E-03 , -- 16.37 , 7.256409889259650E-02 , -- 16.375 , 0.134384503385863 , -- 16.38 , 0.193739454595389 , -- 16.385 , 0.24920525086789 , -- 16.39 , 0.299568602241651 , -- 16.395 , 0.343956956389216 , -- 16.4 , 0.381866908791684 , -- 16.405 , 0.413114650618461 , -- 16.41 , 0.437733369467239 , -- 16.415 , 0.455877974867213 , -- 16.42 , 0.46776384132681 , -- 16.425 , 0.473663922748246 , -- 16.43 , 0.47395074709205 , -- 16.435 , 0.469159269294089 , -- 16.44 , 0.460028874160481 , -- 16.445 , 0.447496145434672 , -- 16.45 , 0.43262324571891 , -- 16.455 , 0.416476298710912 , -- 16.46 , 0.39998487143001 , -- 16.465 , 0.383825594174033 , -- 16.47 , 0.368369873101624 , -- 16.475 , 0.353714574674185 , -- 16.48 , 0.339789306901935 , -- 16.485 , 0.326509782519242 , -- 16.49 , 0.313927074313828 , -- 16.495 , 0.302325131506492 , -- 16.5 , 0.292230126681682 , -- 16.505 , 0.284323481848275 , -- 16.51 , 0.279278430837744 , -- 16.515 , 0.277565991023392 , -- 16.52 , 0.27928378094795 , -- 16.525 , 0.284059216918989 , -- 16.53 , 0.291055442661278 , -- 16.535 , 0.299081158427955 , -- 16.54 , 0.306775986803293 , -- 16.545 , 0.312824550426672 , -- 16.55 , 0.316148133716397 , -- 16.555 , 0.316029035226392 , -- 16.56 , 0.31215069004257 , -- 16.565 , 0.304553318859 , -- 16.57 , 0.293538129439739 , -- 16.575 , 0.279551088336509 , -- 16.58 , 0.263087654869009 , -- 16.585 , 0.244637877428558 , -- 16.59 , 0.224678132698894 , -- 16.595 , 0.203690933512921 , -- 16.6 , 0.182189070638557 , -- 16.605 , 0.160712533967535 , -- 16.61 , 0.139788985048289 , -- 16.615 , 0.119849630257617 , -- 16.62 , 0.101127004531768 , -- 16.625 , 8.356184746823360E-02 , -- 16.63 , 6.675788773408831E-02 , -- 16.635 , 5.000422430522750E-02 , -- 16.64 , 3.237781788478290E-02 , -- 16.645 , 1.290492007865870E-02 , -- 16.65 , -9.242841522190411E-03 , -- 16.655 , -3.457307113926180E-02 , -- 16.66 , -6.315044794397080E-02 , -- 16.665 , -9.456431033805510E-02 , -- 16.67 , -0.12798945588883 , -- 16.675 , -0.16233338586658 , -- 16.68 , -0.19643231791386 , -- 16.685 , -0.22926030484873 , -- 16.69 , -0.26010137973961 , -- 16.695 , -0.28866176894499 , -- 16.7 , -0.31509595200913 , -- 16.705 , -0.33995273832631 , -- 16.71 , -0.36405095016433 , -- 16.715 , -0.38831357635509 , -- 16.72 , -0.41358504112542 , -- 16.725 , -0.44046253469103 , -- 16.73 , -0.46915752304 , -- 16.735 , -0.49941060932339 , -- 16.74 , -0.53046223395319 , -- 16.745 , -0.56108536534834 , -- 16.75 , -0.58967419378453 , -- 16.755 , -0.61438209498106 , -- 16.76 , -0.63329121107995 , -- 16.765 , -0.64459684400811 , -- 16.77 , -0.64678096256853 , -- 16.775 , -0.63875489537808 , -- 16.78 , -0.61995220147847 , -- 16.785 , -0.59036060295097 , -- 16.79 , -0.55049669392639 , -- 16.795 , -0.50133039140924 , -- 16.8 , -0.44418245956687 , -- 16.805 , -0.38061075875138 , -- 16.81 , -0.31231562731901 , -- 16.815 , -0.24106197922092 , -- 16.82 , -0.1686326543263 , -- 16.825 , -9.679598568714549E-02 , -- 16.83 , -2.728380092511400E-02 , -- 16.835 , 3.824293020108400E-02 , -- 16.84 , 9.824002683071940E-02 , -- 16.845 , 0.151346034414838 , -- 16.85 , 0.196448639221428 , -- 16.855 , 0.232748834021365 , -- 16.86 , 0.259798117288868 , -- 16.865 , 0.277506221603702 , -- 16.87 , 0.286111918797314 , -- 16.875 , 0.286131733842289 , -- 16.88 , 0.278296735618878 , -- 16.885 , 0.263498277115562 , -- 16.89 , 0.24274886174333 , -- 16.895 , 0.217166404345327 , -- 16.9 , 0.187968246853482 , -- 16.905 , 0.156461968787081 , -- 16.91 , 0.124015045694316 , -- 16.915 , 9.199139026589789E-02 , -- 16.92 , 6.165693925050090E-02 , -- 16.925 , 3.406870712543500E-02 , -- 16.93 , 9.974305988061479E-03 , -- 16.935 , -1.024803512308630E-02 , -- 16.94 , -2.658403019625520E-02 , -- 16.945 , -3.930334521456180E-02 , -- 16.95 , -4.881605741987730E-02 , -- 16.955 , -5.549717708582600E-02 , -- 16.96 , -5.952392534556360E-02 , -- 16.965 , -6.076975805147920E-02 , -- 16.97 , -5.879314030308780E-02 , -- 16.975 , -5.292859848425780E-02 , -- 16.98 , -4.246799585244240E-02 , -- 16.985 , -2.689000147691090E-02 , -- 16.99 , -6.084643377645750E-03 , -- 16.995 , 1.948494890135070E-02 , -- 17.0 , 4.872381188647930E-02 , -- 17.005 , 7.996838345792370E-02 , -- 17.01 , 0.111158477862087 , -- 17.015 , 0.140083752196672 , -- 17.02 , 0.164651035916986 , -- 17.025 , 0.18312224741681 , -- 17.03 , 0.194279612887888 , -- 17.035 , 0.197502657429334 , -- 17.04 , 0.192756670137177 , -- 17.045 , 0.180518699701142 , -- 17.05 , 0.161669903280425 , -- 17.055 , 0.137385815960322 , -- 17.06 , 0.109043393552795 , -- 17.065 , 7.814867623624100E-02 , -- 17.07 , 4.627753286711330E-02 , -- 17.075 , 1.501227171733180E-02 , -- 17.08 , -1.413775130832270E-02 , -- 17.085 , -3.983793711438840E-02 , -- 17.09 , -6.104036519750250E-02 , -- 17.095 , -7.708842285673501E-02 , -- 17.1 , -8.778382263463140E-02 , -- 17.105 , -9.339483606844121E-02 , -- 17.11 , -9.459269265106150E-02 , -- 17.115 , -9.232223501388739E-02 , -- 17.12 , -8.763025422153840E-02 , -- 17.125 , -8.148499770125020E-02 , -- 17.13 , -7.462775457220110E-02 , -- 17.135 , -6.748324353623050E-02 , -- 17.14 , -6.014609852966310E-02 , -- 17.145 , -5.243702915474610E-02 , -- 17.15 , -4.400785444844100E-02 , -- 17.155 , -3.446180958692290E-02 , -- 17.16 , -2.345792198001310E-02 , -- 17.165 , -1.077394978512690E-02 , -- 17.17 , 3.679128728274960E-03 , -- 17.175 , 1.988574043577430E-02 , -- 17.18 , 3.777667605297300E-02 , -- 17.185 , 5.727939847072780E-02 , -- 17.19 , 7.834501552629659E-02 , -- 17.195 , 0.100944016898245 , -- 17.2 , 0.125030824710985 , -- 17.205 , 0.150493723897266 , -- 17.21 , 0.177105725250697 , -- 17.215 , 0.204499198588219 , -- 17.22 , 0.232171627050269 , -- 17.225 , 0.259522952289019 , -- 17.23 , 0.28591162656688 , -- 17.235 , 0.310713017545991 , -- 17.24 , 0.333360202463241 , -- 17.245 , 0.353356491062333 , -- 17.25 , 0.370257070307643 , -- 17.255 , 0.383631410780558 , -- 17.26 , 0.393022771718625 , -- 17.265 , 0.397924531915073 , -- 17.27 , 0.397789484581034 , -- 17.275 , 0.392075448648513 , -- 17.28 , 0.380321842357972 , -- 17.285 , 0.362236624526743 , -- 17.29 , 0.337775799625786 , -- 17.295 , 0.307187618217491 , -- 17.3 , 0.271012952518342 , -- 17.305 , 0.230034748672592 , -- 17.31 , 0.185192192119736 , -- 17.315 , 0.1374724900416 , -- 17.32 , 8.781061932229070E-02 , -- 17.325 , 3.701123827098990E-02 , -- 17.33 , -1.428322820528750E-02 , -- 17.335 , -6.558572925239700E-02 , -- 17.34 , -0.11651660768663 , -- 17.345 , -0.16673628393002 , -- 17.35 , -0.21587015869355 , -- 17.355 , -0.26345095520442 , -- 17.36 , -0.30888431890374 , -- 17.365 , -0.35145163113226 , -- 17.37 , -0.39033885127352 , -- 17.375 , -0.42469770664605 , -- 17.38 , -0.45371821850159 , -- 17.385 , -0.4767087589838 , -- 17.39 , -0.49316630884791 , -- 17.395 , -0.50283205552792 , -- 17.4 , -0.50572081737774 , -- 17.405 , -0.50212196719028 , -- 17.41 , -0.49256808518885 , -- 17.415 , -0.47777707225688 , -- 17.42 , -0.45857357564831 , -- 17.425 , -0.43580164741667 , -- 17.43 , -0.41024501009179 , -- 17.435 , -0.3825675139441 , -- 17.44 , -0.35328788816102 , -- 17.445 , -0.32279085797443 , -- 17.45 , -0.29137731320226 , -- 17.455 , -0.25933449326509 , -- 17.46 , -0.2270143702293 , -- 17.465 , -0.19489381305459 , -- 17.47 , -0.16360264699467 , -- 17.475 , -0.1339028594142 , -- 17.48 , -0.1066224111889 , -- 17.485 , -8.254834652459410E-02 , -- 17.49 , -6.230534889079800E-02 , -- 17.495 , -4.623541755964700E-02 , -- 17.5 , -3.430878641434340E-02 , -- 17.505 , -2.607920373761460E-02 , -- 17.51 , -2.069570607448080E-02 , -- 17.515 , -1.696571448514850E-02 , -- 17.52 , -1.346258488402600E-02 , -- 17.525 , -8.657687814216761E-03 , -- 17.53 , -1.066706267368470E-03 , -- 17.535 , 1.061426833550790E-02 , -- 17.54 , 2.738663947692650E-02 , -- 17.545 , 4.985546977711610E-02 , -- 17.55 , 7.816411304470480E-02 , -- 17.555 , 0.111966131087412 , -- 17.56 , 0.150434055062022 , -- 17.565 , 0.19231308509617 , -- 17.57 , 0.236013378779133 , -- 17.575 , 0.279746002917216 , -- 17.58 , 0.321684272405146 , -- 17.585 , 0.360138883852544 , -- 17.59 , 0.393718048669997 , -- 17.595 , 0.421452589177563 , -- 17.6 , 0.442859042866297 , -- 17.605 , 0.457932285135102 , -- 17.61 , 0.467063199142238 , -- 17.615 , 0.470901203329776 , -- 17.62 , 0.470183933061112 , -- 17.625 , 0.465570499510758 , -- 17.63 , 0.457509881267887 , -- 17.635 , 0.446170505322342 , -- 17.64 , 0.431441044905879 , -- 17.645 , 0.412997059132728 , -- 17.65 , 0.390417907394592 , -- 17.655 , 0.363320032948617 , -- 17.66 , 0.331482683771369 , -- 17.665 , 0.294935652090983 , -- 17.67 , 0.254001046090184 , -- 17.675 , 0.209280977845859 , -- 17.68 , 0.161607754445718 , -- 17.685 , 0.111965960430188 , -- 17.69 , 6.141586922651330E-02 , -- 17.695 , 1.102093548815530E-02 , -- 17.7 , -3.820203658969610E-02 , -- 17.705 , -8.531704155098779E-02 , -- 17.71 , -0.1294862669167 , -- 17.715 , -0.16998594459785 , -- 17.72 , -0.20622064042651 , -- 17.725 , -0.23774591935919 , -- 17.73 , -0.26428840511531 , -- 17.735 , -0.28576606331927 , -- 17.74 , -0.30229286763517 , -- 17.745 , -0.31416772926296 , -- 17.75 , -0.3218406535065 , -- 17.755 , -0.3258645654062 , -- 17.76 , -0.32683843068621 , -- 17.765 , -0.32535588224289 , -- 17.77 , -0.32196457829868 , -- 17.775 , -0.31715006731732 , -- 17.78 , -0.31133941077337 , -- 17.785 , -0.30492235408688 , -- 17.79 , -0.29827929738639 , -- 17.795 , -0.29180571311681 , -- 17.8 , -0.2859227673159 , -- 17.805 , -0.2810686116836 , -- 17.81 , -0.27767024271612 , -- 17.815 , -0.27609995179852 , -- 17.82 , -0.27662600365925 , -- 17.825 , -0.27936632736658 , -- 17.83 , -0.28425416349301 , -- 17.835 , -0.29102164261339 , -- 17.84 , -0.29920350847177 , -- 17.845 , -0.30815897987418 , -- 17.85 , -0.31710995942421 , -- 17.855 , -0.32518836729579 , -- 17.86 , -0.33149006868417 , -- 17.865 , -0.33512980995752 , -- 17.87 , -0.33529555909469 , -- 17.875 , -0.3312973400369 , -- 17.88 , -0.32261024125577 , -- 17.885 , -0.30890529900639 , -- 17.89 , -0.290070720818 , -- 17.895 , -0.26621431048452 , -- 17.9 , -0.23765242692415 , -- 17.905 , -0.20488114286083 , -- 17.91 , -0.16853769940936 , -- 17.915 , -0.12935252659241 , -- 17.92 , -8.810348127193721E-02 , -- 17.925 , -4.557141302171240E-02 , -- 17.93 , -2.513356389291560E-03 , -- 17.935 , 4.035724323904150E-02 , -- 17.94 , 8.237249752346711E-02 , -- 17.945 , 0.122904827481364 , -- 17.95 , 0.16135335850423 , -- 17.955 , 0.197135089796928 , -- 17.96 , 0.229680590055412 , -- 17.965 , 0.258445542327015 , -- 17.97 , 0.282931564681535 , -- 17.975 , 0.3027256078172 , -- 17.98 , 0.317544225316334 , -- 17.985 , 0.327282981257925 , -- 17.99 , 0.332055566875123 , -- 17.995 , 0.332219078215985 , -- 18.0 , 0.328372664764279 , -- 18.005 , 0.321327968541342 , -- 18.01 , 0.312046315167661 , -- 18.015 , 0.301552393558308 , -- 18.02 , 0.29083015000257 , -- 18.025 , 0.280717140577436 , -- 18.03 , 0.271812862742294 , -- 18.035 , 0.264416834319869 , -- 18.04 , 0.258507921567912 , -- 18.045 , 0.25377043717894 , -- 18.05 , 0.249664740892512 , -- 18.055 , 0.245531784942376 , -- 18.06 , 0.240715666971269 , -- 18.065 , 0.234683989615924 , -- 18.07 , 0.227126896191005 , -- 18.075 , 0.218018915200585 , -- 18.08 , 0.207635259720329 , -- 18.085 , 0.196519817484055 , -- 18.09 , 0.185413864456323 , -- 18.095 , 0.175156074068905 , -- 18.1 , 0.166570903921847 , -- 18.105 , 0.160362276331594 , -- 18.11 , 0.157026715204937 , -- 18.115 , 0.156797444080986 , -- 18.12 , 0.159624455669982 , -- 18.125 , 0.16519187224497 , -- 18.13 , 0.172968089200864 , -- 18.135 , 0.1822813476427 , -- 18.14 , 0.192409206882619 , -- 18.145 , 0.202670276399768 , -- 18.15 , 0.212504752944377 , -- 18.155 , 0.221533110089593 , -- 18.16 , 0.229583054017435 , -- 18.165 , 0.236681693233947 , -- 18.17 , 0.24301317231324 , -- 18.175 , 0.248850323481097 , -- 18.18 , 0.254471744041749 , -- 18.185 , 0.260080804366178 , -- 18.19 , 0.265741889443548 , -- 18.195 , 0.27134643214208 , -- 18.2 , 0.276614811069614 , -- 18.205 , 0.281132591864889 , -- 18.21 , 0.284412543870369 , -- 18.215 , 0.285966261493111 , -- 18.22 , 0.28537109719781 , -- 18.225 , 0.282316011041418 , -- 18.23 , 0.276621372715182 , -- 18.235 , 0.268228573189369 , -- 18.24 , 0.257171332184819 , -- 18.245 , 0.243536231265936 , -- 18.25 , 0.227433656521336 , -- 18.255 , 0.208982058948683 , -- 18.26 , 0.188316971988387 , -- 18.265 , 0.165617801602736 , -- 18.27 , 0.141146408794358 , -- 18.275 , 0.115280086715596 , -- 18.28 , 8.852986599304000E-02 , -- 18.285 , 6.153122175946150E-02 , -- 18.29 , 3.501087677361560E-02 , -- 18.295 , 9.728375745511450E-03 , -- 18.3 , -1.358945599970610E-02 , -- 18.305 , -3.431372431462720E-02 , -- 18.31 , -5.195992570184670E-02 , -- 18.315 , -6.621459033346280E-02 , -- 18.32 , -7.693590669330690E-02 , -- 18.325 , -8.413813135115721E-02 , -- 18.33 , -8.796246104481401E-02 , -- 18.335 , -8.865026558137970E-02 , -- 18.34 , -8.651948855745679E-02 , -- 18.345 , -8.194991749053140E-02 , -- 18.35 , -7.537263942731640E-02 , -- 18.355 , -6.726122085666700E-02 , -- 18.36 , -5.811712688388060E-02 , -- 18.365 , -4.844978592925620E-02 , -- 18.37 , -3.874961154322750E-02 , -- 18.375 , -2.946321539637920E-02 , -- 18.38 , -2.097389378477130E-02 , -- 18.385 , -1.359774681728760E-02 , -- 18.39 , -7.592927023032140E-03 , -- 18.395 , -3.182771456432360E-03 , -- 18.4 , -5.797783397815400E-04 , -- 18.405 , -3.403899532317900E-06 , -- 18.41 , -1.673453644507240E-03 , -- 18.415 , -5.782448384807060E-03 , -- 18.42 , -1.244176672900140E-02 , -- 18.425 , -2.161800758848600E-02 , -- 18.43 , -3.307323100644420E-02 , -- 18.435 , -4.633260284878780E-02 , -- 18.44 , -6.069252068692880E-02 , -- 18.445 , -7.527964829315580E-02 , -- 18.45 , -8.915230216299309E-02 , -- 18.455 , -0.10143296879817 , -- 18.46 , -0.11144311748952 , -- 18.465 , -0.11881688272356 , -- 18.47 , -0.12356683521081 , -- 18.475 , -0.12609239258508 , -- 18.48 , -0.12712667509216 , -- 18.485 , -0.12763705192334 , -- 18.49 , -0.12869455777906 , -- 18.495 , -0.13134291006952 , -- 18.5 , -0.13648385782305 , -- 18.505 , -0.14479654925278 , -- 18.51 , -0.15669435068272 , -- 18.515 , -0.17231899455012 , -- 18.52 , -0.19156053351027 , -- 18.525 , -0.2140948418449 , -- 18.53 , -0.23942532421762 , -- 18.535 , -0.26692808116807 , -- 18.54 , -0.29589366741626 , -- 18.545 , -0.32556987300455 , -- 18.55 , -0.35520167089443 , -- 18.555 , -0.38407157568151 , -- 18.56 , -0.41153207462536 , -- 18.565 , -0.43702839771631 , -- 18.57 , -0.46010162556848 , -- 18.575 , -0.4803753536196 , -- 18.58 , -0.49752469104796 , -- 18.585 , -0.51123932275576 , -- 18.59 , -0.52119100580172 , -- 18.595 , -0.52702031860061 , -- 18.6 , -0.52835074084744 , -- 18.605 , -0.52483178107225 , -- 18.61 , -0.51620504117931 , -- 18.615 , -0.50237569943468 , -- 18.62 , -0.4834730346886 , -- 18.625 , -0.45987873870396 , -- 18.63 , -0.43221396453591 , -- 18.635 , -0.40128199130244 , -- 18.64 , -0.36797809251035 , -- 18.645 , -0.33318247540211 , -- 18.65 , -0.2976655847206 , -- 18.655 , -0.26201863587465 , -- 18.66 , -0.22662902367112 , -- 18.665 , -0.19169728326541 , -- 18.67 , -0.15729264669158 , -- 18.675 , -0.1234229501959 , -- 18.68 , -9.010582719609091E-02 , -- 18.685 , -5.741817970014060E-02 , -- 18.69 , -2.552248385036910E-02 , -- 18.695 , 5.339196527069970E-03 , -- 18.7 , 3.486712311982680E-02 , -- 18.705 , 6.273660435450590E-02 , -- 18.71 , 8.862290998998250E-02 , -- 18.715 , 0.112218745947816 , -- 18.72 , 0.133237764611335 , -- 18.725 , 0.151417354399901 , -- 18.73 , 0.166520793732197 , -- 18.735 , 0.178358092928635 , -- 18.74 , 0.186819039757722 , -- 18.745 , 0.191918879888126 , -- 18.75 , 0.193841382081441 , -- 18.755 , 0.192966026117615 , -- 18.76 , 0.189861849245228 , -- 18.765 , 0.185243424802453 , -- 18.77 , 0.179886808055877 , -- 18.775 , 0.174523130427245 , -- 18.78 , 0.169727209876345 , -- 18.785 , 0.165828266795135 , -- 18.79 , 0.162860717438664 , -- 18.795 , 0.160568509105303 , -- 18.8 , 0.158460262202499 , -- 18.805 , 0.155903588032585 , -- 18.81 , 0.152236721793017 , -- 18.815 , 0.146874335438137 , -- 18.82 , 0.139388100075902 , -- 18.825 , 0.129551248829624 , -- 18.83 , 0.117346184292776 , -- 18.835 , 0.102944396398025 , -- 18.84 , 8.667203203856250E-02 , -- 18.845 , 6.897292950992250E-02 , -- 18.85 , 5.037981195577830E-02 , -- 18.855 , 3.149222301298260E-02 , -- 18.86 , 1.295788909713510E-02 , -- 18.865 , -4.552694712540460E-03 , -- 18.87 , -2.038471143298640E-02 , -- 18.875 , -3.395374370024890E-02 , -- 18.88 , -4.480974308295430E-02 , -- 18.885 , -5.269874412847760E-02 , -- 18.89 , -5.760475116618620E-02 , -- 18.895 , -5.975782869643340E-02 , -- 18.9 , -5.959990728708000E-02 , -- 18.905 , -5.771202182665640E-02 , -- 18.91 , -5.471620957553570E-02 , -- 18.915 , -5.117481281717030E-02 , -- 18.92 , -4.751155121434680E-02 , -- 18.925 , -4.397377050356170E-02 , -- 18.93 , -4.064613036051550E-02 , -- 18.935 , -3.750986634275660E-02 , -- 18.94 , -3.453164301123860E-02 , -- 18.945 , -3.175456679161500E-02 , -- 18.95 , -2.936540580184520E-02 , -- 18.955 , -2.771540773125420E-02 , -- 18.96 , -2.728673446781490E-02 , -- 18.965 , -2.860928038065850E-02 , -- 18.97 , -3.214733887015950E-02 , -- 18.975 , -3.818284412564310E-02 , -- 18.98 , -4.672302188795090E-02 , -- 18.985 , -5.745461744704080E-02 , -- 18.99 , -6.975424591801779E-02 , -- 18.995 , -8.275205425474760E-02 , -- 19.0 , -9.543348500501039E-02 , -- 19.005 , -0.10675671144965 , -- 19.01 , -0.11576388175306 , -- 19.015 , -0.12166743333762 , -- 19.02 , -0.12390264431233 , -- 19.025 , -0.12214656117846 , -- 19.03 , -0.11631154879176 , -- 19.035 , -0.10652423304446 , -- 19.04 , -9.310118520163460E-02 , -- 19.045 , -7.652590539072700E-02 , -- 19.05 , -5.743089586506230E-02 , -- 19.055 , -3.657596705689010E-02 , -- 19.06 , -1.481925977005460E-02 , -- 19.065 , 6.926924474783110E-03 , -- 19.07 , 2.775463368340260E-02 , -- 19.075 , 4.683156424739500E-02 , -- 19.08 , 6.347270763070770E-02 , -- 19.085 , 7.720227146370970E-02 , -- 19.09 , 8.779042470764520E-02 , -- 19.095 , 9.526029188212271E-02 , -- 19.1 , 9.986040447199600E-02 , -- 19.105 , 0.102009856725406 , -- 19.11 , 0.102225525300876 , -- 19.115 , 0.101047428528718 , -- 19.12 , 9.897427931868839E-02 , -- 19.125 , 9.642072648080460E-02 , -- 19.13 , 9.369918170530429E-02 , -- 19.135 , 9.102713402201090E-02 , -- 19.14 , 8.855073690832560E-02 , -- 19.145 , 8.637784747202421E-02 , -- 19.15 , 8.460889194052530E-02 , -- 19.155 , 8.335969452805890E-02 , -- 19.16 , 8.277035792073900E-02 , -- 19.165 , 8.300094888178290E-02 , -- 19.17 , 8.421449446395760E-02 , -- 19.175 , 8.655290215462839E-02 , -- 19.18 , 9.010941198122500E-02 , -- 19.185 , 9.490288969345520E-02 , -- 19.19 , 0.100856185025776 , -- 19.195 , 0.107783589409055 , -- 19.2 , 0.115386291208123 , -- 19.205 , 0.123260349877366 , -- 19.21 , 0.130913935378 , -- 19.215 , 0.137796521245135 , -- 19.22 , 0.143335849367096 , -- 19.225 , 0.14698030532155 , -- 19.23 , 0.148242029288944 , -- 19.235 , 0.146735661784648 , -- 19.24 , 0.142208324703231 , -- 19.245 , 0.134556865273917 , -- 19.25 , 0.123832305128576 , -- 19.255 , 0.110231039547548 , -- 19.26 , 9.407703422254150E-02 , -- 19.265 , 7.579763962651660E-02 , -- 19.27 , 5.589930332000480E-02 , -- 19.275 , 3.494345559651580E-02 , -- 19.28 , 1.352655612925890E-02 , -- 19.285 , -7.738281430620860E-03 , -- 19.29 , -2.823640126172170E-02 , -- 19.295 , -4.736851280459840E-02 , -- 19.3 , -6.456726778946650E-02 , -- 19.305 , -7.931522042729799E-02 , -- 19.31 , -9.116146754991310E-02 , -- 19.315 , -9.973543395603350E-02 , -- 19.32 , -0.10475595669325 , -- 19.325 , -0.10603430822357 , -- 19.33 , -0.10347284701214 , -- 19.335 , -9.706124752024230E-02 , -- 19.34 , -8.687430152469530E-02 , -- 19.345 , -7.307405512475940E-02 , -- 19.35 , -5.591887411984520E-02 , -- 19.355 , -3.577706479529710E-02 , -- 19.36 , -1.314335388833300E-02 , -- 19.365 , 1.134983613684490E-02 , -- 19.37 , 3.693079681400050E-02 , -- 19.375 , 6.270474265740390E-02 , -- 19.38 , 8.768905345507640E-02 , -- 19.385 , 0.1108686368144 , -- 19.39 , 0.1312644416171 , -- 19.395 , 0.148009041167522 , -- 19.4 , 0.160416739422417 , -- 19.405 , 0.168040427167663 , -- 19.41 , 0.170704607506662 , -- 19.415 , 0.168512624998284 , -- 19.42 , 0.161826470167071 , -- 19.425 , 0.151223327305197 , -- 19.43 , 0.137436526462059 , -- 19.435 , 0.12128787067038 , -- 19.44 , 0.103621500126964 , -- 19.445 , 8.524411667406280E-02 , -- 19.45 , 6.687930552254420E-02 , -- 19.455 , 4.913589731864990E-02 , -- 19.46 , 3.249281642772610E-02 , -- 19.465 , 1.729796363375550E-02 , -- 19.47 , 3.779772699936010E-03 , -- 19.475 , -7.933453913126739E-03 , -- 19.48 , -1.778837362450150E-02 , -- 19.485 , -2.578180319663970E-02 , -- 19.49 , -3.193743546434960E-02 , -- 19.495 , -3.628975661666560E-02 , -- 19.5 , -3.887558954382360E-02 , -- 19.505 , -3.973470241057670E-02 , -- 19.51 , -3.891788867951480E-02 , -- 19.515 , -3.649986139114820E-02 , -- 19.52 , -3.259249709820460E-02 , -- 19.525 , -2.735427053548850E-02 , -- 19.53 , -2.099133842643200E-02 , -- 19.535 , -1.374830536741160E-02 , -- 19.54 , -5.887877188928280E-03 , -- 19.545 , 2.336959611728440E-03 , -- 19.55 , 1.071436148192050E-02 , -- 19.555 , 1.910203440373310E-02 , -- 19.56 , 2.744608047788240E-02 , -- 19.565 , 3.578603089731680E-02 , -- 19.57 , 4.424249115467690E-02 , -- 19.575 , 5.298918396292150E-02 , -- 19.58 , 6.221237826554930E-02 , -- 19.585 , 7.206505940082400E-02 , -- 19.59 , 8.262287004060030E-02 , -- 19.595 , 9.385089818082880E-02 , -- 19.6 , 0.105586535210159 , -- 19.605 , 0.117542979202558 , -- 19.61 , 0.129332330456747 , -- 19.615 , 0.140505656304056 , -- 19.62 , 0.150602470682144 , -- 19.625 , 0.159201510072528 , -- 19.63 , 0.165963272203869 , -- 19.635 , 0.170657754779367 , -- 19.64 , 0.173171986392552 , -- 19.645 , 0.173497060176099 , -- 19.65 , 0.171698563869022 , -- 19.655 , 0.167877117650055 , -- 19.66 , 0.162128958008132 , -- 19.665 , 0.154515020640188 , -- 19.67 , 0.145047978425579 , -- 19.675 , 0.133699089240968 , -- 19.68 , 0.120425826006013 , -- 19.685 , 0.105211954035009 , -- 19.69 , 8.811482794436119E-02 , -- 19.695 , 6.930362885349300E-02 , -- 19.7 , 4.908317786948910E-02 , -- 19.705 , 2.789284466062680E-02 , -- 19.71 , 6.282684187232620E-03 , -- 19.715 , -1.513293891731910E-02 , -- 19.72 , -3.573219349475490E-02 , -- 19.725 , -5.494565996060560E-02 , -- 19.73 , -7.230331792209500E-02 , -- 19.735 , -8.746611435403620E-02 , -- 19.74 , -0.10023408196077 , -- 19.745 , -0.11053680897542 , -- 19.75 , -0.11840927699064 , -- 19.755 , -0.12396609115553 , -- 19.76 , -0.12737940482213 , -- 19.765 , -0.12886942680431 , -- 19.77 , -0.12870508549978 , -- 19.775 , -0.12721486235372 , -- 19.78 , -0.12479696224801 , -- 19.785 , -0.12192134851853 , -- 19.79 , -0.11911512331687 , -- 19.795 , -0.11692852296234 , -- 19.8 , -0.1158828122011 , -- 19.805 , -0.11640862718208 , -- 19.81 , -0.11878469144379 , -- 19.815 , -0.12309145404105 , -- 19.82 , -0.12918833366224 , -- 19.825 , -0.13672125838288 , -- 19.83 , -0.14515938284391 , -- 19.835 , -0.15385497532022 , -- 19.84 , -0.16211467849934 , -- 19.845 , -0.16927092799142 , -- 19.85 , -0.1747405815055 , -- 19.855 , -0.17806542050622 , -- 19.86 , -0.17893075004105 , -- 19.865 , -0.17716517197334 , -- 19.87 , -0.1727273398208 , -- 19.875 , -0.16568659834495 , -- 19.88 , -0.15620370102824 , -- 19.885 , -0.14451379659869 , -- 19.89 , -0.13091402606184 , -- 19.895 , -0.11575112780621 , -- 19.9 , -9.940839096806510E-02 , -- 19.905 , -8.228798219382000E-02 , -- 19.91 , -6.479104079602420E-02 , -- 19.915 , -4.729626907194930E-02 , -- 19.92 , -3.014389625728430E-02 , -- 19.925 , -1.362770379699480E-02 , -- 19.93 , 1.998432435284760E-03 , -- 19.935 , 1.650283145918720E-02 , -- 19.94 , 2.964895620060110E-02 , -- 19.945 , 4.116860136833410E-02 , -- 19.95 , 5.074351304162170E-02 , -- 19.955 , 5.800645031803000E-02 , -- 19.96 , 6.256532313956960E-02 , -- 19.965 , 6.405233292472851E-02 , -- 19.97 , 6.218959865152200E-02 , -- 19.975 , 5.686184515599930E-02 , -- 19.98 , 4.817972906533240E-02 , -- 19.985 , 3.651967859402010E-02 , -- 19.99 , 2.252985493696160E-02 , -- 19.995 , 7.097071756102240E-03 , -- 20.0 , -8.721812839652310E-03 , -- 20.005 , -2.379447424676810E-02 , -- 20.01 , -3.701839037090120E-02 , -- 20.015 , -4.742092878891140E-02 , -- 20.02 , -5.423951270215350E-02 , -- 20.025 , -5.697258922350620E-02 , -- 20.03 , -5.539776158916270E-02 , -- 20.035 , -4.956057087520670E-02 , -- 20.04 , -3.974179526714170E-02 , -- 20.045 , -2.641288342533750E-02 , -- 20.05 , -1.019081782994870E-02 , -- 20.055 , 8.202447545571230E-03 , -- 20.06 , 2.797116679219240E-02 , -- 20.065 , 4.827036868959560E-02 , -- 20.07 , 6.822566739672180E-02 , -- 20.075 , 8.695562572496580E-02 , -- 20.08 , 0.103598292547575 , -- 20.085 , 0.117345557097572 , -- 20.09 , 0.127481089438341 , -- 20.095 , 0.133420394415517 , -- 20.1 , 0.134744188882336 , -- 20.105 , 0.131221676654994 , -- 20.11 , 0.122818973076751 , -- 20.115 , 0.109691680974573 , -- 20.12 , 9.216522604322611E-02 , -- 20.125 , 7.070600814518090E-02 , -- 20.13 , 4.589147778332150E-02 , -- 20.135 , 1.838180387523030E-02 , -- 20.14 , -1.110108370552780E-02 , -- 20.145 , -4.178877084026370E-02 , -- 20.15 , -7.287571484484311E-02 , -- 20.155 , -0.10352963470195 , -- 20.16 , -0.13290387884342 , -- 20.165 , -0.16015839093613 , -- 20.17 , -0.18448715088686 , -- 20.175 , -0.20515328670567 , -- 20.18 , -0.22152568111903 , -- 20.185 , -0.23311328473587 , -- 20.19 , -0.23959100455607 , -- 20.195 , -0.24081433909493 , -- 20.2 , -0.23682050088862 , -- 20.205 , -0.22781739014645 , -- 20.21 , -0.21416412518464 , -- 20.215 , -0.19634582016096 , -- 20.22 , -0.17494767238438 , -- 20.225 , -0.15062916150452 , -- 20.23 , -0.12410162176008 , -- 20.235 , -9.610482601536199E-02 , -- 20.24 , -6.738446390246500E-02 , -- 20.245 , -3.866506506796110E-02 , -- 20.25 , -1.062408132283030E-02 , -- 20.255 , 1.613821656425260E-02 , -- 20.26 , 4.112363448240460E-02 , -- 20.265 , 6.395563455415000E-02 , -- 20.27 , 8.438638743734070E-02 , -- 20.275 , 0.10229225024046 , -- 20.28 , 0.11765525248804 , -- 20.285 , 0.13053719119583 , -- 20.29 , 0.141047644803831 , -- 20.295 , 0.14931741898274 , -- 20.3 , 0.155478926240496 , -- 20.305 , 0.159660339201315 , -- 20.31 , 0.161990227205732 , -- 20.315 , 0.162612590283051 , -- 20.32 , 0.161703234926074 , -- 20.325 , 0.159483350064339 , -- 20.33 , 0.156221155279841 , -- 20.335 , 0.152221918187124 , -- 20.34 , 0.147804677752111 , -- 20.345 , 0.143271172359312 , -- 20.35 , 0.138873332096741 , -- 20.355 , 0.134787926819641 , -- 20.36 , 0.131103697853831 , -- 20.365 , 0.127825557460833 , -- 20.37 , 0.12489405648423 , -- 20.375 , 0.122216684366155 , -- 20.38 , 0.119703338338164 , -- 20.385 , 0.117298332826065 , -- 20.39 , 0.115002111347558 , -- 20.395 , 0.1128792665639 , -- 20.4 , 0.111051600017025 , -- 20.405 , 0.109680624221402 , -- 20.41 , 0.108942958893076 , -- 20.415 , 0.109006468464252 , -- 20.42 , 0.110010955231372 , -- 20.425 , 0.112056904842183 , -- 20.43 , 0.115202427994996 , -- 20.435 , 0.119466647868312 , -- 20.44 , 0.124835559019734 , -- 20.445 , 0.131267773242386 , -- 20.45 , 0.138696105432056 , -- 20.455 , 0.14702533406325 , -- 20.46 , 0.156125727838975 , -- 20.465 , 0.165825042690333 , -- 20.47 , 0.0 , -- ), -- INTERPOL='LIN', -- PROL_DROITE='CONSTANT', -- PROL_GAUCHE='EXCLU',); -- -- --ACCELV1=DEFI_FONCTION(NOM_PARA='INST', -- VALE= --( -- 0.0 , 0.0 , -- 1.000000000000000E-02 , 1.310000000000000E-03 , -- 2.000000000000000E-02 , 7.200000000000000E-04 , -- 3.000000000000000E-02 , -1.160000000000000E-03 , -- 4.000000000000000E-02 , -4.010000000000000E-03 , -- 5.000000000000000E-02 , -8.580000000000001E-03 , -- 6.000000000000000E-02 , -1.459000000000000E-02 , -- 7.000000000000001E-02 , -1.920000000000000E-02 , -- 8.000000000000000E-02 , -1.947000000000000E-02 , -- 9.000000000000000E-02 , -1.781000000000000E-02 , -- 0.1 , -1.970000000000000E-02 , -- 0.11 , -2.520000000000000E-02 , -- 0.12 , -3.281000000000000E-02 , -- 0.13 , -4.377000000000000E-02 , -- 0.14 , -5.504000000000000E-02 , -- 0.15 , -5.797000000000000E-02 , -- 0.16 , -4.627000000000000E-02 , -- 0.17 , -2.536000000000000E-02 , -- 0.18 , -6.700000000000000E-03 , -- 0.19 , 7.849999999999999E-03 , -- 0.2 , 2.168000000000000E-02 , -- 0.21 , 3.643000000000000E-02 , -- 0.22 , 5.686000000000000E-02 , -- 0.23 , 8.019999999999999E-02 , -- 0.24 , 8.942000000000000E-02 , -- 0.25 , 7.790000000000000E-02 , -- 0.26 , 6.301000000000000E-02 , -- 0.27 , 5.860000000000000E-02 , -- 0.28 , 5.444000000000000E-02 , -- 0.29 , 3.314000000000000E-02 , -- 0.3 , -4.730000000000000E-03 , -- 0.31 , -3.492000000000000E-02 , -- 0.32 , -3.413000000000000E-02 , -- 0.33 , -7.530000000000000E-03 , -- 0.34 , 1.991000000000000E-02 , -- 0.35 , 2.983000000000000E-02 , -- 0.36 , 2.482000000000000E-02 , -- 0.37 , 1.676000000000000E-02 , -- 0.38 , 4.890000000000000E-03 , -- 0.39 , -1.521000000000000E-02 , -- 0.4 , -3.575000000000000E-02 , -- 0.41 , -5.053000000000000E-02 , -- 0.42 , -6.325000000000000E-02 , -- 0.43 , -7.273000000000000E-02 , -- 0.44 , -7.520000000000000E-02 , -- 0.45 , -8.463000000000000E-02 , -- 0.46 , -0.11597 , -- 0.47 , -0.1564 , -- 0.48 , -0.18027 , -- 0.49 , -0.17201 , -- 0.5 , -0.13845 , -- 0.51 , -0.1016 , -- 0.52 , -6.390999999999999E-02 , -- 0.53 , -1.035000000000000E-02 , -- 0.54 , 5.961000000000000E-02 , -- 0.55 , 0.12972 , -- 0.56 , 0.18788 , -- 0.57 , 0.23015 , -- 0.58 , 0.23082 , -- 0.59 , 0.1643 , -- 0.6 , 6.750000000000000E-02 , -- 0.61 , 7.450000000000000E-03 , -- 0.62 , 1.664000000000000E-02 , -- 0.63 , 8.058000000000000E-02 , -- 0.64 , 0.15546 , -- 0.65 , 0.2133 , -- 0.66 , 0.24265 , -- 0.67 , 0.21922 , -- 0.68 , 0.1295 , -- 0.69 , 1.220000000000000E-03 , -- 0.7 , -0.12397 , -- 0.71 , -0.1882 , -- 0.72 , -0.17059 , -- 0.73 , -0.11119 , -- 0.74 , -9.375000000000000E-02 , -- 0.75 , -0.15419 , -- 0.76 , -0.21371 , -- 0.77 , -0.19269 , -- 0.78 , -0.12556 , -- 0.79 , -8.054000000000000E-02 , -- 0.8 , -5.658000000000000E-02 , -- 0.81 , -2.563000000000000E-02 , -- 0.82 , -1.082000000000000E-02 , -- 0.83 , -6.067000000000000E-02 , -- 0.84 , -0.16876 , -- 0.85 , -0.26933 , -- 0.86 , -0.31693 , -- 0.87 , -0.3189 , -- 0.88 , -0.31999 , -- 0.89 , -0.32387 , -- 0.9 , -0.35623 , -- 0.91 , -0.38483 , -- 0.92 , -0.36307 , -- 0.93 , -0.29278 , -- 0.94 , -0.18821 , -- 0.95 , -6.119000000000000E-02 , -- 0.96 , 3.932000000000000E-02 , -- 0.97 , 7.092000000000000E-02 , -- 0.98 , 3.394000000000000E-02 , -- 0.99 , 1.056000000000000E-02 , -- 1.0 , 3.006000000000000E-02 , -- 1.01 , 4.384000000000000E-02 , -- 1.02 , 1.582000000000000E-02 , -- 1.03 , -2.452000000000000E-02 , -- 1.04 , -3.991000000000000E-02 , -- 1.05 , -4.053000000000000E-02 , -- 1.06 , -4.416000000000000E-02 , -- 1.07 , -6.185000000000000E-02 , -- 1.08 , -0.10165 , -- 1.09 , -0.13542 , -- 1.1 , -0.142 , -- 1.11 , -0.13819 , -- 1.12 , -0.13187 , -- 1.13 , -0.11765 , -- 1.14 , -8.853000000000000E-02 , -- 1.15 , -4.957000000000000E-02 , -- 1.16 , -2.751000000000000E-02 , -- 1.17 , -4.837000000000000E-02 , -- 1.18 , -0.11303 , -- 1.19 , -0.16115 , -- 1.2 , -0.1365 , -- 1.21 , -9.369000000000000E-02 , -- 1.22 , -0.10681 , -- 1.23 , -0.16911 , -- 1.24 , -0.23593 , -- 1.25 , -0.27067 , -- 1.26 , -0.27471 , -- 1.27 , -0.25731 , -- 1.28 , -0.19103 , -- 1.29 , -7.716000000000001E-02 , -- 1.3 , 1.100000000000000E-03 , -- 1.31 , -4.582000000000000E-02 , -- 1.32 , -0.19352 , -- 1.33 , -0.32144 , -- 1.34 , -0.37399 , -- 1.35 , -0.40308 , -- 1.36 , -0.45452 , -- 1.37 , -0.51071 , -- 1.38 , -0.52231 , -- 1.39 , -0.45018 , -- 1.4 , -0.30537 , -- 1.41 , -0.15517 , -- 1.42 , -7.362000000000000E-02 , -- 1.43 , -9.615000000000000E-02 , -- 1.44 , -0.17148 , -- 1.45 , -0.17476 , -- 1.46 , -8.399000000000000E-02 , -- 1.47 , -2.696000000000000E-02 , -- 1.48 , -6.808000000000000E-02 , -- 1.49 , -0.12817 , -- 1.5 , -0.12265 , -- 1.51 , -6.149000000000000E-02 , -- 1.52 , -8.380000000000000E-03 , -- 1.53 , 1.139000000000000E-02 , -- 1.54 , 5.830000000000000E-03 , -- 1.55 , -2.002000000000000E-02 , -- 1.56 , -3.584000000000000E-02 , -- 1.57 , -1.060000000000000E-03 , -- 1.58 , 6.028000000000000E-02 , -- 1.59 , 8.509000000000000E-02 , -- 1.6 , 9.515000000000000E-02 , -- 1.61 , 0.14372 , -- 1.62 , 0.17863 , -- 1.63 , 0.16098 , -- 1.64 , 0.15227 , -- 1.65 , 0.16265 , -- 1.66 , 0.1009 , -- 1.67 , -8.347000000000000E-02 , -- 1.68 , -0.28571 , -- 1.69 , -0.3845 , -- 1.7 , -0.42649 , -- 1.71 , -0.48045 , -- 1.72 , -0.48546 , -- 1.73 , -0.34744 , -- 1.74 , -4.460000000000000E-02 , -- 1.75 , 0.31704 , -- 1.76 , 0.56244 , -- 1.77 , 0.61288 , -- 1.78 , 0.56235 , -- 1.79 , 0.56046 , -- 1.8 , 0.58601 , -- 1.81 , 0.50428 , -- 1.82 , 0.34783 , -- 1.83 , 0.2707 , -- 1.84 , 0.32579 , -- 1.85 , 0.43838 , -- 1.86 , 0.49734 , -- 1.87 , 0.46993 , -- 1.88 , 0.42104 , -- 1.89 , 0.39656 , -- 1.9 , 0.37011 , -- 1.91 , 0.3211 , -- 1.92 , 0.27122 , -- 1.93 , 0.2175 , -- 1.94 , 0.1251 , -- 1.95 , 3.090000000000000E-03 , -- 1.96 , -9.401000000000000E-02 , -- 1.97 , -0.13751 , -- 1.98 , -0.12623 , -- 1.99 , -3.147000000000000E-02 , -- 2.0 , 0.15999 , -- 2.01 , 0.39077 , -- 2.02 , 0.57348 , -- 2.03 , 0.61086 , -- 2.04 , 0.4807 , -- 2.05 , 0.29864 , -- 2.06 , 0.18108 , -- 2.07 , 0.167 , -- 2.08 , 0.23579 , -- 2.09 , 0.28543 , -- 2.1 , 0.21887 , -- 2.11 , 6.136000000000000E-02 , -- 2.12 , -8.754000000000001E-02 , -- 2.13 , -0.18795 , -- 2.14 , -0.28217 , -- 2.15 , -0.39328 , -- 2.16 , -0.47351 , -- 2.17 , -0.45659 , -- 2.18 , -0.38611 , -- 2.19 , -0.40359 , -- 2.2 , -0.49671 , -- 2.21 , -0.47831 , -- 2.22 , -0.24834 , -- 2.23 , 9.692000000000001E-02 , -- 2.24 , 0.36832 , -- 2.25 , 0.49779 , -- 2.26 , 0.55588 , -- 2.27 , 0.55074 , -- 2.28 , 0.47652 , -- 2.29 , 0.42596 , -- 2.3 , 0.45439 , -- 2.31 , 0.4758 , -- 2.32 , 0.36011 , -- 2.33 , 9.916999999999999E-02 , -- 2.34 , -0.22081 , -- 2.35 , -0.53559 , -- 2.36 , -0.73055 , -- 2.37 , -0.68219 , -- 2.38 , -0.46512 , -- 2.39 , -0.29795 , -- 2.4 , -0.29155 , -- 2.41 , -0.37205 , -- 2.42 , -0.45321 , -- 2.43 , -0.52678 , -- 2.44 , -0.53549 , -- 2.45 , -0.39903 , -- 2.46 , -0.17073 , -- 2.47 , 4.007000000000000E-02 , -- 2.48 , 0.19098 , -- 2.49 , 0.23016 , -- 2.5 , 0.11487 , -- 2.51 , -3.277000000000000E-02 , -- 2.52 , -2.678000000000000E-02 , -- 2.53 , 0.14456 , -- 2.54 , 0.33564 , -- 2.55 , 0.43459 , -- 2.56 , 0.47636 , -- 2.57 , 0.56106 , -- 2.58 , 0.69871 , -- 2.59 , 0.78021 , -- 2.6 , 0.69033 , -- 2.61 , 0.48738 , -- 2.62 , 0.37542 , -- 2.63 , 0.44792 , -- 2.64 , 0.63115 , -- 2.65 , 0.80303 , -- 2.66 , 0.86913 , -- 2.67 , 0.81861 , -- 2.68 , 0.67639 , -- 2.69 , 0.44981 , -- 2.7 , 0.19577 , -- 2.71 , 1.762000000000000E-02 , -- 2.72 , -7.475000000000000E-02 , -- 2.73 , -0.18543 , -- 2.74 , -0.31712 , -- 2.75 , -0.30763 , -- 2.76 , -5.022000000000000E-02 , -- 2.77 , 0.36264 , -- 2.78 , 0.71418 , -- 2.79 , 0.86474 , -- 2.8 , 0.91391 , -- 2.81 , 0.97578 , -- 2.82 , 0.99997 , -- 2.83 , 0.90663 , -- 2.84 , 0.71448 , -- 2.85 , 0.55982 , -- 2.86 , 0.55183 , -- 2.87 , 0.63744 , -- 2.88 , 0.70292 , -- 2.89 , 0.68299 , -- 2.9 , 0.58616 , -- 2.91 , 0.47484 , -- 2.92 , 0.38822 , -- 2.93 , 0.3229 , -- 2.94 , 0.25296 , -- 2.95 , 0.16705 , -- 2.96 , 0.10044 , -- 2.97 , 7.353000000000000E-02 , -- 2.98 , 4.790000000000000E-02 , -- 2.99 , -3.974000000000000E-02 , -- 3.0 , -0.21989 , -- 3.01 , -0.43388 , -- 3.02 , -0.59094 , -- 3.03 , -0.68752 , -- 3.04 , -0.77344 , -- 3.05 , -0.84165 , -- 3.06 , -0.87592 , -- 3.07 , -0.92165 , -- 3.08 , -0.98681 , -- 3.09 , -0.9813 , -- 3.1 , -0.85134 , -- 3.11 , -0.71226 , -- 3.12 , -0.70318 , -- 3.13 , -0.73062 , -- 3.14 , -0.63434 , -- 3.15 , -0.49621 , -- 3.16 , -0.46434 , -- 3.17 , -0.4895 , -- 3.18 , -0.43989 , -- 3.19 , -0.297 , -- 3.2 , -0.12264 , -- 3.21 , 5.685000000000000E-02 , -- 3.22 , 0.20721 , -- 3.23 , 0.29127 , -- 3.24 , 0.37167 , -- 3.25 , 0.47314 , -- 3.26 , 0.48428 , -- 3.27 , 0.34199 , -- 3.28 , 0.14378 , -- 3.29 , 2.014000000000000E-02 , -- 3.3 , -3.310000000000000E-03 , -- 3.31 , 3.046000000000000E-02 , -- 3.32 , 7.851000000000000E-02 , -- 3.33 , 0.1222 , -- 3.34 , 0.19291 , -- 3.35 , 0.2916 , -- 3.36 , 0.38011 , -- 3.37 , 0.46514 , -- 3.38 , 0.52328 , -- 3.39 , 0.51669 , -- 3.4 , 0.4727 , -- 3.41 , 0.38682 , -- 3.42 , 0.22939 , -- 3.43 , 1.800000000000000E-02 , -- 3.44 , -0.199 , -- 3.45 , -0.40018 , -- 3.46 , -0.5733 , -- 3.47 , -0.72332 , -- 3.48 , -0.82419 , -- 3.49 , -0.83348 , -- 3.5 , -0.74258 , -- 3.51 , -0.61694 , -- 3.52 , -0.56099 , -- 3.53 , -0.61112 , -- 3.54 , -0.71023 , -- 3.55 , -0.78959 , -- 3.56 , -0.85129 , -- 3.57 , -0.93566 , -- 3.58 , -0.99997 , -- 3.59 , -0.92052 , -- 3.6 , -0.6664 , -- 3.61 , -0.3873 , -- 3.62 , -0.25033 , -- 3.63 , -0.24161 , -- 3.64 , -0.18701 , -- 3.65 , 9.379999999999999E-03 , -- 3.66 , 0.11381 , -- 3.67 , 0.16743 , -- 3.68 , 0.16297 , -- 3.69 , 0.1216 , -- 3.7 , 5.279000000000000E-02 , -- 3.71 , -9.607000000000000E-02 , -- 3.72 , -0.30972 , -- 3.73 , -0.35938 , -- 3.74 , -0.19296 , -- 3.75 , 6.919000000000000E-02 , -- 3.76 , 0.27173 , -- 3.77 , 0.34172 , -- 3.78 , 0.31251 , -- 3.79 , 0.24099 , -- 3.8 , 0.15009 , -- 3.81 , 0.10136 , -- 3.82 , 0.18046 , -- 3.83 , 0.36244 , -- 3.84 , 0.47034 , -- 3.85 , 0.36939 , -- 3.86 , 0.15689 , -- 3.87 , 1.108000000000000E-02 , -- 3.88 , 3.990000000000000E-03 , -- 3.89 , 0.11976 , -- 3.9 , 0.24956 , -- 3.91 , 0.21477 , -- 3.92 , -3.172000000000000E-02 , -- 3.93 , -0.24232 , -- 3.94 , -0.1514 , -- 3.95 , 0.12645 , -- 3.96 , 0.3411 , -- 3.97 , 0.48457 , -- 3.98 , 0.61705 , -- 3.99 , 0.70283 , -- 4.0 , 0.70328 , -- 4.01 , 0.62998 , -- 4.02 , 0.53518 , -- 4.03 , 0.44668 , -- 4.04 , 0.36172 , -- 4.05 , 0.31406 , -- 4.06 , 0.32888 , -- 4.07 , 0.35459 , -- 4.08 , 0.32512 , -- 4.09 , 0.25195 , -- 4.1 , 0.20405 , -- 4.11 , 0.22648 , -- 4.12 , 0.30571 , -- 4.13 , 0.37309 , -- 4.14 , 0.35283 , -- 4.15 , 0.24118 , -- 4.16 , 0.11162 , -- 4.17 , 1.458000000000000E-02 , -- 4.18 , -7.364000000000000E-02 , -- 4.19 , -0.1521 , -- 4.2 , -0.14128 , -- 4.21 , 2.440000000000000E-02 , -- 4.22 , 0.2852 , -- 4.23 , 0.45129 , -- 4.24 , 0.38982 , -- 4.25 , 0.15588 , -- 4.26 , -0.11495 , -- 4.27 , -0.31375 , -- 4.28 , -0.42086 , -- 4.29 , -0.48904 , -- 4.3 , -0.52097 , -- 4.31 , -0.49168 , -- 4.32 , -0.4234 , -- 4.33 , -0.36559 , -- 4.34 , -0.36994 , -- 4.35 , -0.42675 , -- 4.36 , -0.45696 , -- 4.37 , -0.39583 , -- 4.38 , -0.24523 , -- 4.39 , -7.371999999999999E-02 , -- 4.4 , 5.577000000000000E-02 , -- 4.41 , 0.13029 , -- 4.42 , 0.17 , -- 4.43 , 0.21223 , -- 4.44 , 0.25214 , -- 4.45 , 0.25221 , -- 4.46 , 0.20971 , -- 4.47 , 0.15915 , -- 4.48 , 0.13965 , -- 4.49 , 0.1015 , -- 4.5 , -5.693000000000000E-02 , -- 4.51 , -0.30165 , -- 4.52 , -0.49413 , -- 4.53 , -0.5601 , -- 4.54 , -0.5473 , -- 4.55 , -0.52318 , -- 4.56 , -0.43186 , -- 4.57 , -0.21177 , -- 4.58 , 5.701000000000000E-02 , -- 4.59 , 0.26717 , -- 4.6 , 0.3673 , -- 4.61 , 0.3813 , -- 4.62 , 0.40079 , -- 4.63 , 0.39365 , -- 4.64 , 0.18973 , -- 4.65 , -0.17373 , -- 4.66 , -0.40285 , -- 4.67 , -0.36957 , -- 4.68 , -0.23873 , -- 4.69 , -0.13623 , -- 4.7 , -1.420000000000000E-02 , -- 4.71 , 0.15954 , -- 4.72 , 0.31583 , -- 4.73 , 0.4076 , -- 4.74 , 0.44925 , -- 4.75 , 0.43323 , -- 4.76 , 0.36783 , -- 4.77 , 0.32597 , -- 4.78 , 0.34835 , -- 4.79 , 0.36693 , -- 4.8 , 0.28138 , -- 4.81 , 0.11386 , -- 4.82 , -4.390000000000000E-02 , -- 4.83 , -0.20925 , -- 4.84 , -0.42702 , -- 4.85 , -0.62277 , -- 4.86 , -0.72429 , -- 4.87 , -0.7462 , -- 4.88 , -0.75887 , -- 4.89 , -0.77194 , -- 4.9 , -0.72951 , -- 4.91 , -0.66245 , -- 4.92 , -0.67709 , -- 4.93 , -0.80669 , -- 4.94 , -0.95972 , -- 4.95 , -0.99997 , -- 4.96 , -0.88454 , -- 4.97 , -0.69049 , -- 4.98 , -0.52094 , -- 4.99 , -0.3957 , -- 5.0 , -0.24286 , -- 5.01 , -3.739000000000000E-02 , -- 5.02 , 0.10577 , -- 5.03 , 0.17347 , -- 5.04 , 0.16886 , -- 5.05 , 0.14491 , -- 5.06 , 0.14907 , -- 5.07 , 0.17361 , -- 5.08 , 0.20083 , -- 5.09 , 0.21954 , -- 5.1 , 0.2328 , -- 5.11 , 0.2575 , -- 5.12 , 0.28932 , -- 5.13 , 0.31126 , -- 5.14 , 0.29244 , -- 5.15 , 0.19772 , -- 5.16 , 5.796000000000000E-02 , -- 5.17 , -6.429000000000000E-02 , -- 5.18 , -5.218000000000000E-02 , -- 5.19 , 9.539000000000000E-02 , -- 5.2 , 0.20966 , -- 5.21 , 0.15862 , -- 5.22 , 1.473000000000000E-02 , -- 5.23 , -3.926000000000000E-02 , -- 5.24 , 8.541000000000000E-02 , -- 5.25 , 0.31423 , -- 5.26 , 0.44181 , -- 5.27 , 0.30949 , -- 5.28 , -4.230000000000000E-03 , -- 5.29 , -0.32893 , -- 5.3 , -0.59096 , -- 5.31 , -0.72514 , -- 5.32 , -0.65562 , -- 5.33 , -0.42079 , -- 5.34 , -0.1588 , -- 5.35 , 2.904000000000000E-02 , -- 5.36 , 0.10308 , -- 5.37 , 4.177000000000000E-02 , -- 5.38 , -6.319000000000000E-02 , -- 5.39 , -4.705000000000000E-02 , -- 5.4 , 9.604000000000000E-02 , -- 5.41 , 0.24518 , -- 5.42 , 0.30632 , -- 5.43 , 0.23914 , -- 5.44 , 9.232000000000000E-02 , -- 5.45 , -1.776000000000000E-02 , -- 5.46 , -7.690000000000000E-03 , -- 5.47 , 7.241000000000000E-02 , -- 5.48 , 9.512000000000000E-02 , -- 5.49 , 8.989000000000000E-02 , -- 5.5 , 0.19384 , -- 5.51 , 0.35667 , -- 5.52 , 0.38627 , -- 5.53 , 0.27202 , -- 5.54 , 0.22809 , -- 5.55 , 0.35372 , -- 5.56 , 0.49889 , -- 5.57 , 0.54618 , -- 5.58 , 0.55561 , -- 5.59 , 0.6075 , -- 5.6 , 0.65833 , -- 5.61 , 0.62315 , -- 5.62 , 0.54314 , -- 5.63 , 0.5024 , -- 5.64 , 0.49951 , -- 5.65 , 0.50238 , -- 5.66 , 0.459 , -- 5.67 , 0.32065 , -- 5.68 , 0.12297 , -- 5.69 , -4.304000000000000E-02 , -- 5.7 , -0.12348 , -- 5.71 , -0.16939 , -- 5.72 , -0.26337 , -- 5.73 , -0.37116 , -- 5.74 , -0.40828 , -- 5.75 , -0.39748 , -- 5.76 , -0.42458 , -- 5.77 , -0.49729 , -- 5.78 , -0.51741 , -- 5.79 , -0.39554 , -- 5.8 , -0.19178 , -- 5.81 , -6.471000000000000E-02 , -- 5.82 , -6.743000000000000E-02 , -- 5.83 , -0.1271 , -- 5.84 , -0.1634 , -- 5.85 , -0.13345 , -- 5.86 , -6.090000000000000E-02 , -- 5.87 , 2.519000000000000E-02 , -- 5.88 , 0.14903 , -- 5.89 , 0.28064 , -- 5.9 , 0.34038 , -- 5.91 , 0.3104 , -- 5.92 , 0.22998 , -- 5.93 , 0.15353 , -- 5.94 , 0.1055 , -- 5.95 , 7.457000000000000E-02 , -- 5.96 , 5.763000000000000E-02 , -- 5.97 , 8.033999999999999E-02 , -- 5.98 , 0.14644 , -- 5.99 , 0.1332 , -- 6.0 , -7.482000000000000E-02 , -- 6.01 , -0.36556 , -- 6.02 , -0.55895 , -- 6.03 , -0.59056 , -- 6.04 , -0.46664 , -- 6.05 , -0.26194 , -- 6.06 , -7.546000000000000E-02 , -- 6.07 , 7.784000000000001E-02 , -- 6.08 , 0.23755 , -- 6.09 , 0.36836 , -- 6.1 , 0.37298 , -- 6.11 , 0.26509 , -- 6.12 , 0.15102 , -- 6.13 , 6.525000000000000E-02 , -- 6.14 , -1.695000000000000E-02 , -- 6.15 , -0.10207 , -- 6.16 , -0.1821 , -- 6.17 , -0.26644 , -- 6.18 , -0.32842 , -- 6.19 , -0.24869 , -- 6.2 , 2.279000000000000E-02 , -- 6.21 , 0.37255 , -- 6.22 , 0.6758 , -- 6.23 , 0.86221 , -- 6.24 , 0.91467 , -- 6.25 , 0.89167 , -- 6.26 , 0.84631 , -- 6.27 , 0.74074 , -- 6.28 , 0.49841 , -- 6.29 , 0.16761 , -- 6.3 , -4.544000000000000E-02 , -- 6.31 , -2.644000000000000E-02 , -- 6.32 , 9.400000000000000E-02 , -- 6.33 , 0.16063 , -- 6.34 , 0.18176 , -- 6.35 , 0.20612 , -- 6.36 , 0.22068 , -- 6.37 , 0.22211 , -- 6.38 , 0.23664 , -- 6.39 , 0.24671 , -- 6.4 , 0.1861 , -- 6.41 , 0.10676 , -- 6.42 , 0.2039 , -- 6.43 , 0.4894 , -- 6.44 , 0.7178 , -- 6.45 , 0.73624 , -- 6.46 , 0.64197 , -- 6.47 , 0.61236 , -- 6.48 , 0.66281 , -- 6.49 , 0.6407 , -- 6.5 , 0.48402 , -- 6.51 , 0.28743 , -- 6.52 , 0.1436 , -- 6.53 , 6.140000000000000E-02 , -- 6.54 , -1.770000000000000E-03 , -- 6.55 , -6.498000000000000E-02 , -- 6.56 , -0.12251 , -- 6.57 , -0.16577 , -- 6.58 , -0.20217 , -- 6.59 , -0.28219 , -- 6.6 , -0.37605 , -- 6.61 , -0.34257 , -- 6.62 , -0.12814 , -- 6.63 , 0.1706 , -- 6.64 , 0.38468 , -- 6.65 , 0.39384 , -- 6.66 , 0.26746 , -- 6.67 , 0.18207 , -- 6.68 , 0.19512 , -- 6.69 , 0.22133 , -- 6.7 , 0.209 , -- 6.71 , 0.17146 , -- 6.72 , 6.763000000000000E-02 , -- 6.73 , -0.13527 , -- 6.74 , -0.37496 , -- 6.75 , -0.55764 , -- 6.76 , -0.58824 , -- 6.77 , -0.44844 , -- 6.78 , -0.27116 , -- 6.79 , -0.19551 , -- 6.8 , -0.18978 , -- 6.81 , -9.911000000000000E-02 , -- 6.82 , 0.11626 , -- 6.83 , 0.30541 , -- 6.84 , 0.3521 , -- 6.85 , 0.27698 , -- 6.86 , 0.10781 , -- 6.87 , -0.13553 , -- 6.88 , -0.3724 , -- 6.89 , -0.51163 , -- 6.9 , -0.49535 , -- 6.91 , -0.29991 , -- 6.92 , -1.034000000000000E-02 , -- 6.93 , 0.19111 , -- 6.94 , 0.1843 , -- 6.95 , 6.730000000000000E-03 , -- 6.96 , -0.21507 , -- 6.97 , -0.41983 , -- 6.98 , -0.58894 , -- 6.99 , -0.63614 , -- 7.0 , -0.54698 , -- 7.01 , -0.44682 , -- 7.02 , -0.42416 , -- 7.03 , -0.46132 , -- 7.04 , -0.48084 , -- 7.05 , -0.43504 , -- 7.06 , -0.34615 , -- 7.07 , -0.23496 , -- 7.08 , -0.13072 , -- 7.09 , -5.857000000000000E-02 , -- 7.1 , 1.753000000000000E-02 , -- 7.11 , 0.10141 , -- 7.12 , 0.12684 , -- 7.13 , 9.014000000000000E-02 , -- 7.14 , 0.11682 , -- 7.15 , 0.28896 , -- 7.16 , 0.48134 , -- 7.17 , 0.54721 , -- 7.18 , 0.49147 , -- 7.19 , 0.35746 , -- 7.2 , 0.17093 , -- 7.21 , -6.870000000000000E-03 , -- 7.22 , -7.575999999999999E-02 , -- 7.23 , -4.320000000000000E-03 , -- 7.24 , 6.714000000000001E-02 , -- 7.25 , 2.620000000000000E-03 , -- 7.26 , -0.12071 , -- 7.27 , -0.16453 , -- 7.28 , -0.1671 , -- 7.29 , -0.24591 , -- 7.3 , -0.36246 , -- 7.31 , -0.39855 , -- 7.32 , -0.33851 , -- 7.33 , -0.22608 , -- 7.34 , -0.1129 , -- 7.35 , -3.976000000000000E-02 , -- 7.36 , 5.950000000000000E-03 , -- 7.37 , 4.231000000000000E-02 , -- 7.38 , 9.320000000000001E-02 , -- 7.39 , 0.21161 , -- 7.4 , 0.37502 , -- 7.41 , 0.46085 , -- 7.42 , 0.42852 , -- 7.43 , 0.39911 , -- 7.44 , 0.48134 , -- 7.45 , 0.61862 , -- 7.46 , 0.65845 , -- 7.47 , 0.52488 , -- 7.48 , 0.27775 , -- 7.49 , 2.611000000000000E-02 , -- 7.5 , -0.16858 , -- 7.51 , -0.35917 , -- 7.52 , -0.64888 , -- 7.53 , -0.93894 , -- 7.54 , -0.99997 , -- 7.55 , -0.79545 , -- 7.56 , -0.50022 , -- 7.57 , -0.31055 , -- 7.58 , -0.28451 , -- 7.59 , -0.32788 , -- 7.6 , -0.34293 , -- 7.61 , -0.30914 , -- 7.62 , -0.29364 , -- 7.63 , -0.36128 , -- 7.64 , -0.43128 , -- 7.65 , -0.41928 , -- 7.66 , -0.39651 , -- 7.67 , -0.43324 , -- 7.68 , -0.4592 , -- 7.69 , -0.3661 , -- 7.7 , -0.17726 , -- 7.71 , -7.930000000000000E-03 , -- 7.72 , 9.228000000000000E-02 , -- 7.73 , 0.12711 , -- 7.74 , 0.10315 , -- 7.75 , 9.070000000000000E-03 , -- 7.76 , -0.1676 , -- 7.77 , -0.37078 , -- 7.78 , -0.48702 , -- 7.79 , -0.42176 , -- 7.8 , -0.20091 , -- 7.81 , -7.270000000000000E-03 , -- 7.82 , 3.404000000000000E-02 , -- 7.83 , 2.700000000000000E-03 , -- 7.84 , -4.730000000000000E-03 , -- 7.85 , -2.107000000000000E-02 , -- 7.86 , -7.763000000000000E-02 , -- 7.87 , -0.11332 , -- 7.88 , -9.217000000000000E-02 , -- 7.89 , -7.226000000000000E-02 , -- 7.9 , -0.10282 , -- 7.91 , -0.18072 , -- 7.92 , -0.27112 , -- 7.93 , -0.33308 , -- 7.94 , -0.37009 , -- 7.95 , -0.41046 , -- 7.96 , -0.46542 , -- 7.97 , -0.51679 , -- 7.98 , -0.48695 , -- 7.99 , -0.31766 , -- 8.0 , -0.11193 , -- 8.01 , -1.808000000000000E-02 , -- 8.02 , -9.790000000000000E-03 , -- 8.03 , 7.910000000000000E-03 , -- 8.04 , 2.892000000000000E-02 , -- 8.05 , 5.256000000000000E-02 , -- 8.06 , 0.15118 , -- 8.07 , 0.33598 , -- 8.08 , 0.47411 , -- 8.09 , 0.4184 , -- 8.1 , 0.22182 , -- 8.11 , 6.008000000000000E-02 , -- 8.12 , 7.820000000000001E-03 , -- 8.13 , 3.031000000000000E-02 , -- 8.14 , 6.139000000000000E-02 , -- 8.15 , 9.475000000000000E-02 , -- 8.16 , 0.1711 , -- 8.17 , 0.25375 , -- 8.18 , 0.32694 , -- 8.19 , 0.47654 , -- 8.2 , 0.71476 , -- 8.21 , 0.92354 , -- 8.22 , 0.99997 , -- 8.23 , 0.96174 , -- 8.24 , 0.85956 , -- 8.25 , 0.67462 , -- 8.26 , 0.42666 , -- 8.27 , 0.21402 , -- 8.28 , 8.068000000000000E-02 , -- 8.29 , -2.572000000000000E-02 , -- 8.3 , -0.18823 , -- 8.31 , -0.43016 , -- 8.32 , -0.69265 , -- 8.33 , -0.84523 , -- 8.34 , -0.78451 , -- 8.35 , -0.5823 , -- 8.36 , -0.39951 , -- 8.37 , -0.3009 , -- 8.38 , -0.28826 , -- 8.39 , -0.34762 , -- 8.4 , -0.40794 , -- 8.41 , -0.37827 , -- 8.42 , -0.24945 , -- 8.43 , -0.10703 , -- 8.44 , -1.106000000000000E-02 , -- 8.45 , 6.251000000000000E-02 , -- 8.46 , 0.1419 , -- 8.47 , 0.19928 , -- 8.48 , 0.18798 , -- 8.49 , 0.11645 , -- 8.5 , 4.575000000000000E-02 , -- 8.51 , 4.959000000000000E-02 , -- 8.52 , 0.17716 , -- 8.53 , 0.34359 , -- 8.54 , 0.36584 , -- 8.55 , 0.23915 , -- 8.56 , 0.18171 , -- 8.57 , 0.30089 , -- 8.58 , 0.43922 , -- 8.59 , 0.40395 , -- 8.6 , 0.15759 , -- 8.61 , -0.16407 , -- 8.62 , -0.36165 , -- 8.63 , -0.39041 , -- 8.64 , -0.35247 , -- 8.65 , -0.31056 , -- 8.66 , -0.24355 , -- 8.67 , -9.318000000000000E-02 , -- 8.68 , 7.779999999999999E-02 , -- 8.69 , 5.175000000000000E-02 , -- 8.7 , -0.23925 , -- 8.71 , -0.59171 , -- 8.72 , -0.77473 , -- 8.73 , -0.75474 , -- 8.74 , -0.64528 , -- 8.75 , -0.48987 , -- 8.76 , -0.29956 , -- 8.77 , -0.1701 , -- 8.78 , -0.13175 , -- 8.79 , -0.10789 , -- 8.8 , -4.978000000000000E-02 , -- 8.81 , 4.376000000000000E-02 , -- 8.82 , 0.15205 , -- 8.83 , 0.2202 , -- 8.84 , 0.17479 , -- 8.85 , 2.103000000000000E-02 , -- 8.86 , -0.14172 , -- 8.87 , -0.26548 , -- 8.88 , -0.38534 , -- 8.89 , -0.50451 , -- 8.9 , -0.53404 , -- 8.91 , -0.38116 , -- 8.92 , -0.11525 , -- 8.93 , 7.395000000000000E-02 , -- 8.94 , 0.10361 , -- 8.95 , 6.577000000000000E-02 , -- 8.96 , 6.259000000000001E-02 , -- 8.97 , 5.649000000000000E-02 , -- 8.98 , -3.880000000000000E-03 , -- 8.99 , -2.390000000000000E-02 , -- 9.0 , 7.305000000000000E-02 , -- 9.01 , 0.19452 , -- 9.02 , 0.2608 , -- 9.03 , 0.35267 , -- 9.04 , 0.5391 , -- 9.05 , 0.73389 , -- 9.06 , 0.83545 , -- 9.07 , 0.82904 , -- 9.08 , 0.72024 , -- 9.09 , 0.51294 , -- 9.1 , 0.23736 , -- 9.11 , -4.577000000000000E-02 , -- 9.12 , -0.26395 , -- 9.13 , -0.38853 , -- 9.14 , -0.43089 , -- 9.15 , -0.4349 , -- 9.16 , -0.41682 , -- 9.17 , -0.37537 , -- 9.18 , -0.32465 , -- 9.19 , -0.29702 , -- 9.2 , -0.32491 , -- 9.21 , -0.3466 , -- 9.22 , -0.28185 , -- 9.23 , -0.19619 , -- 9.24 , -0.14637 , -- 9.25 , -9.772000000000000E-02 , -- 9.26 , -7.858999999999999E-02 , -- 9.27 , -0.13191 , -- 9.28 , -0.21558 , -- 9.29 , -0.24568 , -- 9.3 , -0.18549 , -- 9.31 , -9.976000000000000E-02 , -- 9.32 , -6.297000000000000E-02 , -- 9.33 , -8.577000000000000E-02 , -- 9.34 , -0.11997 , -- 9.35 , -5.070000000000000E-02 , -- 9.36 , 0.19743 , -- 9.37 , 0.55636 , -- 9.38 , 0.86649 , -- 9.39 , 0.99997 , -- 9.4 , 0.95787 , -- 9.41 , 0.80859 , -- 9.42 , 0.58733 , -- 9.43 , 0.34042 , -- 9.44 , 0.15629 , -- 9.45 , 7.298000000000000E-02 , -- 9.46 , 3.103000000000000E-02 , -- 9.47 , -1.360000000000000E-03 , -- 9.48 , 2.567000000000000E-02 , -- 9.49 , 9.848000000000000E-02 , -- 9.5 , 0.13363 , -- 9.51 , 0.10499 , -- 9.52 , 1.947000000000000E-02 , -- 9.53 , -0.11686 , -- 9.54 , -0.25475 , -- 9.55 , -0.33284 , -- 9.56 , -0.37717 , -- 9.57 , -0.45927 , -- 9.58 , -0.53679 , -- 9.59 , -0.50988 , -- 9.6 , -0.4323 , -- 9.61 , -0.46891 , -- 9.62 , -0.62414 , -- 9.63 , -0.67897 , -- 9.64 , -0.46893 , -- 9.65 , -0.10561 , -- 9.66 , 0.12896 , -- 9.67 , 7.442000000000000E-02 , -- 9.68 , -0.13619 , -- 9.69 , -0.25497 , -- 9.7 , -0.19615 , -- 9.71 , -5.295000000000000E-02 , -- 9.72 , 5.399000000000000E-02 , -- 9.73 , 8.438000000000000E-02 , -- 9.74 , 7.897000000000000E-02 , -- 9.75 , 0.11239 , -- 9.76 , 0.18699 , -- 9.77 , 0.19038 , -- 9.78 , 0.13535 , -- 9.79 , 0.20938 , -- 9.8 , 0.43787 , -- 9.81 , 0.63937 , -- 9.82 , 0.67742 , -- 9.83 , 0.58799 , -- 9.84 , 0.49876 , -- 9.85 , 0.4183 , -- 9.86 , 0.29948 , -- 9.87 , 0.22905 , -- 9.88 , 0.2606 , -- 9.89 , 0.28847 , -- 9.9 , 0.22616 , -- 9.91 , 0.12545 , -- 9.92 , 8.956000000000000E-02 , -- 9.93 , 0.12928 , -- 9.94 , 0.15076 , -- 9.95 , 4.544000000000000E-02 , -- 9.96 , -0.20722 , -- 9.97 , -0.49063 , -- 9.98 , -0.6894 , -- 9.99 , -0.80485 , -- 10.0 , -0.84771 , -- 10.01 , -0.76807 , -- 10.02 , -0.56037 , -- 10.03 , -0.32503 , -- 10.04 , -0.15016 , -- 10.05 , -3.882000000000000E-02 , -- 10.06 , 6.110000000000000E-03 , -- 10.07 , -2.178000000000000E-02 , -- 10.08 , -6.615000000000000E-02 , -- 10.09 , -3.796000000000000E-02 , -- 10.1 , 8.788000000000000E-02 , -- 10.11 , 0.2149 , -- 10.12 , 0.23018 , -- 10.13 , 0.14302 , -- 10.14 , 3.300000000000000E-02 , -- 10.15 , -5.442000000000000E-02 , -- 10.16 , -9.190000000000000E-02 , -- 10.17 , -5.636000000000000E-02 , -- 10.18 , 1.760000000000000E-03 , -- 10.19 , -4.910000000000000E-03 , -- 10.2 , -7.645000000000000E-02 , -- 10.21 , -0.16067 , -- 10.22 , -0.22708 , -- 10.23 , -0.23139 , -- 10.24 , -0.12101 , -- 10.25 , 7.537000000000001E-02 , -- 10.26 , 0.24004 , -- 10.27 , 0.32546 , -- 10.28 , 0.38826 , -- 10.29 , 0.41863 , -- 10.3 , 0.35794 , -- 10.31 , 0.23222 , -- 10.32 , 0.11401 , -- 10.33 , 1.697000000000000E-02 , -- 10.34 , -0.10766 , -- 10.35 , -0.25136 , -- 10.36 , -0.35757 , -- 10.37 , -0.41565 , -- 10.38 , -0.3843 , -- 10.39 , -0.22915 , -- 10.4 , -7.590000000000000E-03 , -- 10.41 , 0.24235 , -- 10.42 , 0.48677 , -- 10.43 , 0.65383 , -- 10.44 , 0.70515 , -- 10.45 , 0.61222 , -- 10.46 , 0.40693 , -- 10.47 , 0.24331 , -- 10.48 , 0.2277 , -- 10.49 , 0.27807 , -- 10.5 , 0.24063 , -- 10.51 , 9.018000000000000E-02 , -- 10.52 , -8.182000000000000E-02 , -- 10.53 , -0.23302 , -- 10.54 , -0.37812 , -- 10.55 , -0.4703 , -- 10.56 , -0.41592 , -- 10.57 , -0.24651 , -- 10.58 , -0.12814 , -- 10.59 , -0.13 , -- 10.6 , -0.17581 , -- 10.61 , -0.22261 , -- 10.62 , -0.29974 , -- 10.63 , -0.40731 , -- 10.64 , -0.49694 , -- 10.65 , -0.51567 , -- 10.66 , -0.38399 , -- 10.67 , -6.413000000000001E-02 , -- 10.68 , 0.26417 , -- 10.69 , 0.33331 , -- 10.7 , 0.13429 , -- 10.71 , -8.293000000000000E-02 , -- 10.72 , -0.1463 , -- 10.73 , -0.13542 , -- 10.74 , -0.20542 , -- 10.75 , -0.35982 , -- 10.76 , -0.44591 , -- 10.77 , -0.37107 , -- 10.78 , -0.25668 , -- 10.79 , -0.25179 , -- 10.8 , -0.31124 , -- 10.81 , -0.28374 , -- 10.82 , -0.12758 , -- 10.83 , 1.490000000000000E-02 , -- 10.84 , 1.229000000000000E-02 , -- 10.85 , -6.356000000000001E-02 , -- 10.86 , -5.771000000000000E-02 , -- 10.87 , 8.679000000000001E-02 , -- 10.88 , 0.31097 , -- 10.89 , 0.53347 , -- 10.9 , 0.68419 , -- 10.91 , 0.65081 , -- 10.92 , 0.4251 , -- 10.93 , 0.19891 , -- 10.94 , 0.11666 , -- 10.95 , 0.13796 , -- 10.96 , 0.14749 , -- 10.97 , 9.375000000000000E-02 , -- 10.98 , 2.569000000000000E-02 , -- 10.99 , -1.828000000000000E-02 , -- 11.0 , -6.660000000000000E-03 , -- 11.01 , 9.803000000000001E-02 , -- 11.02 , 0.2156 , -- 11.03 , 0.2608 , -- 11.04 , 0.28376 , -- 11.05 , 0.31446 , -- 11.06 , 0.30511 , -- 11.07 , 0.25332 , -- 11.08 , 0.19284 , -- 11.09 , 0.1152 , -- 11.1 , 1.948000000000000E-02 , -- 11.11 , -8.540000000000001E-03 , -- 11.12 , -8.070000000000001E-03 , -- 11.13 , 5.720000000000000E-03 , -- 11.14 , 5.899000000000000E-02 , -- 11.15 , 0.13421 , -- 11.16 , 0.26053 , -- 11.17 , 0.41353 , -- 11.18 , 0.51092 , -- 11.19 , 0.52002 , -- 11.2 , 0.50124 , -- 11.21 , 0.5386 , -- 11.22 , 0.65388 , -- 11.23 , 0.8058 , -- 11.24 , 0.93844 , -- 11.25 , 0.99997 , -- 11.26 , 0.96789 , -- 11.27 , 0.87593 , -- 11.28 , 0.80065 , -- 11.29 , 0.79192 , -- 11.3 , 0.8141 , -- 11.31 , 0.8052 , -- 11.32 , 0.74262 , -- 11.33 , 0.61546 , -- 11.34 , 0.41975 , -- 11.35 , 0.22346 , -- 11.36 , 0.14585 , -- 11.37 , 0.18339 , -- 11.38 , 0.21495 , -- 11.39 , 0.22018 , -- 11.4 , 0.23766 , -- 11.41 , 0.19769 , -- 11.42 , 1.272000000000000E-02 , -- 11.43 , -0.33277 , -- 11.44 , -0.5999 , -- 11.45 , -0.66307 , -- 11.46 , -0.54941 , -- 11.47 , -0.30754 , -- 11.48 , 9.150000000000000E-03 , -- 11.49 , 0.33567 , -- 11.5 , 0.62395 , -- 11.51 , 0.82292 , -- 11.52 , 0.92488 , -- 11.53 , 0.94922 , -- 11.54 , 0.90162 , -- 11.55 , 0.81535 , -- 11.56 , 0.68529 , -- 11.57 , 0.48301 , -- 11.58 , 0.28744 , -- 11.59 , 0.21968 , -- 11.6 , 0.31463 , -- 11.61 , 0.4858 , -- 11.62 , 0.58845 , -- 11.63 , 0.57005 , -- 11.64 , 0.49055 , -- 11.65 , 0.39877 , -- 11.66 , 0.2819 , -- 11.67 , 0.11731 , -- 11.68 , -6.177000000000000E-02 , -- 11.69 , -0.1701 , -- 11.7 , -0.21434 , -- 11.71 , -0.36528 , -- 11.72 , -0.67236 , -- 11.73 , -0.88398 , -- 11.74 , -0.82736 , -- 11.75 , -0.67582 , -- 11.76 , -0.64387 , -- 11.77 , -0.69937 , -- 11.78 , -0.68858 , -- 11.79 , -0.5758 , -- 11.8 , -0.46315 , -- 11.81 , -0.45051 , -- 11.82 , -0.51549 , -- 11.83 , -0.51468 , -- 11.84 , -0.35292 , -- 11.85 , -0.11964 , -- 11.86 , -1.117000000000000E-02 , -- 11.87 , -0.1357 , -- 11.88 , -0.40276 , -- 11.89 , -0.63738 , -- 11.9 , -0.73699 , -- 11.91 , -0.69661 , -- 11.92 , -0.58112 , -- 11.93 , -0.46357 , -- 11.94 , -0.38497 , -- 11.95 , -0.33617 , -- 11.96 , -0.26831 , -- 11.97 , -0.19582 , -- 11.98 , -0.16518 , -- 11.99 , -0.14401 , -- 12.0 , -7.318000000000000E-02 , -- 12.01 , 7.769000000000000E-02 , -- 12.02 , 0.26041 , -- 12.03 , 0.37046 , -- 12.04 , 0.40569 , -- 12.05 , 0.44476 , -- 12.06 , 0.50231 , -- 12.07 , 0.52622 , -- 12.08 , 0.47631 , -- 12.09 , 0.35672 , -- 12.1 , 0.14838 , -- 12.11 , -0.13846 , -- 12.12 , -0.36979 , -- 12.13 , -0.47711 , -- 12.14 , -0.54786 , -- 12.15 , -0.62333 , -- 12.16 , -0.64749 , -- 12.17 , -0.58515 , -- 12.18 , -0.46856 , -- 12.19 , -0.35151 , -- 12.2 , -0.26225 , -- 12.21 , -0.22214 , -- 12.22 , -0.22853 , -- 12.23 , -0.19257 , -- 12.24 , -2.725000000000000E-02 , -- 12.25 , 0.18283 , -- 12.26 , 0.25344 , -- 12.27 , 0.12964 , -- 12.28 , -9.258000000000000E-02 , -- 12.29 , -0.29733 , -- 12.3 , -0.42242 , -- 12.31 , -0.45343 , -- 12.32 , -0.38158 , -- 12.33 , -0.24116 , -- 12.34 , -0.13557 , -- 12.35 , -0.11938 , -- 12.36 , -0.14999 , -- 12.37 , -0.17426 , -- 12.38 , -0.16707 , -- 12.39 , -0.12211 , -- 12.4 , -6.938000000000000E-02 , -- 12.41 , -5.365000000000000E-02 , -- 12.42 , -6.988999999999999E-02 , -- 12.43 , -0.10537 , -- 12.44 , -0.18301 , -- 12.45 , -0.26683 , -- 12.46 , -0.27079 , -- 12.47 , -0.18067 , -- 12.48 , -5.357000000000000E-02 , -- 12.49 , 5.621000000000000E-02 , -- 12.5 , 0.12411 , -- 12.51 , 0.1349 , -- 12.52 , 0.10552 , -- 12.53 , 8.767000000000000E-02 , -- 12.54 , 5.312000000000000E-02 , -- 12.55 , -7.994000000000000E-02 , -- 12.56 , -0.28316 , -- 12.57 , -0.43439 , -- 12.58 , -0.45819 , -- 12.59 , -0.39875 , -- 12.6 , -0.3257 , -- 12.61 , -0.21617 , -- 12.62 , -5.834000000000000E-02 , -- 12.63 , 6.234000000000000E-02 , -- 12.64 , 7.834000000000001E-02 , -- 12.65 , 2.524000000000000E-02 , -- 12.66 , -4.370000000000000E-03 , -- 12.67 , 2.088000000000000E-02 , -- 12.68 , 3.738000000000000E-02 , -- 12.69 , -5.780000000000000E-03 , -- 12.7 , -7.783000000000000E-02 , -- 12.71 , -0.10293 , -- 12.72 , -5.917000000000000E-02 , -- 12.73 , -2.088000000000000E-02 , -- 12.74 , -4.084000000000000E-02 , -- 12.75 , -7.596000000000000E-02 , -- 12.76 , -7.527000000000000E-02 , -- 12.77 , -4.418000000000000E-02 , -- 12.78 , -2.046000000000000E-02 , -- 12.79 , -2.682000000000000E-02 , -- 12.8 , -2.654000000000000E-02 , -- 12.81 , 3.635000000000000E-02 , -- 12.82 , 0.12352 , -- 12.83 , 0.13159 , -- 12.84 , 4.372000000000000E-02 , -- 12.85 , -6.480000000000000E-02 , -- 12.86 , -0.1361 , -- 12.87 , -0.17058 , -- 12.88 , -0.1883 , -- 12.89 , -0.19167 , -- 12.9 , -0.19116 , -- 12.91 , -0.20869 , -- 12.92 , -0.23797 , -- 12.93 , -0.28017 , -- 12.94 , -0.36467 , -- 12.95 , -0.46778 , -- 12.96 , -0.49324 , -- 12.97 , -0.38894 , -- 12.98 , -0.2225 , -- 12.99 , -9.676000000000000E-02 , -- 13.0 , -5.153000000000000E-02 , -- 13.01 , -5.856000000000000E-02 , -- 13.02 , -6.265000000000000E-02 , -- 13.03 , -3.700000000000000E-02 , -- 13.04 , 8.800000000000001E-03 , -- 13.05 , 4.189000000000000E-02 , -- 13.06 , 1.048000000000000E-02 , -- 13.07 , -8.393000000000000E-02 , -- 13.08 , -0.17214 , -- 13.09 , -0.21986 , -- 13.1 , -0.25265 , -- 13.11 , -0.28696 , -- 13.12 , -0.29845 , -- 13.13 , -0.27534 , -- 13.14 , -0.25187 , -- 13.15 , -0.25011 , -- 13.16 , -0.27425 , -- 13.17 , -0.33551 , -- 13.18 , -0.41051 , -- 13.19 , -0.45406 , -- 13.2 , -0.44533 , -- 13.21 , -0.38727 , -- 13.22 , -0.30756 , -- 13.23 , -0.24203 , -- 13.24 , -0.20129 , -- 13.25 , -0.16106 , -- 13.26 , -9.457000000000000E-02 , -- 13.27 , -2.440000000000000E-02 , -- 13.28 , 7.040000000000000E-03 , -- 13.29 , 8.600000000000000E-03 , -- 13.3 , 1.981000000000000E-02 , -- 13.31 , 4.834000000000000E-02 , -- 13.32 , 7.178000000000000E-02 , -- 13.33 , 8.525000000000001E-02 , -- 13.34 , 0.1107 , -- 13.35 , 0.15822 , -- 13.36 , 0.21564 , -- 13.37 , 0.27468 , -- 13.38 , 0.32506 , -- 13.39 , 0.34096 , -- 13.4 , 0.32619 , -- 13.41 , 0.32491 , -- 13.42 , 0.34842 , -- 13.43 , 0.36279 , -- 13.44 , 0.34026 , -- 13.45 , 0.2756 , -- 13.46 , 0.18648 , -- 13.47 , 9.881000000000000E-02 , -- 13.48 , 3.222000000000000E-02 , -- 13.49 , 1.061000000000000E-02 , -- 13.5 , 4.343000000000000E-02 , -- 13.51 , 9.372000000000000E-02 , -- 13.52 , 0.10628 , -- 13.53 , 7.198000000000000E-02 , -- 13.54 , 3.458000000000000E-02 , -- 13.55 , 2.182000000000000E-02 , -- 13.56 , 1.377000000000000E-02 , -- 13.57 , -1.295000000000000E-02 , -- 13.58 , -4.297000000000000E-02 , -- 13.59 , -4.232000000000000E-02 , -- 13.6 , -1.224000000000000E-02 , -- 13.61 , 1.559000000000000E-02 , -- 13.62 , 1.639000000000000E-02 , -- 13.63 , -1.544000000000000E-02 , -- 13.64 , -5.384000000000000E-02 , -- 13.65 , -7.287000000000000E-02 , -- 13.66 , -8.747000000000001E-02 , -- 13.67 , -0.10976 , -- 13.68 , -0.11529 , -- 13.69 , -8.388000000000000E-02 , -- 13.7 , -3.945000000000000E-02 , -- 13.71 , -2.420000000000000E-02 , -- 13.72 , -3.630000000000000E-02 , -- 13.73 , -3.928000000000000E-02 , -- 13.74 , -2.207000000000000E-02 , -- 13.75 , -5.590000000000000E-03 , -- 13.76 , -9.450000000000000E-03 , -- 13.77 , -2.752000000000000E-02 , -- 13.78 , -4.478000000000000E-02 , -- 13.79 , -6.457000000000000E-02 , -- 13.8 , -8.530000000000000E-02 , -- 13.81 , -8.704000000000001E-02 , -- 13.82 , -5.918000000000000E-02 , -- 13.83 , -3.830000000000000E-03 , -- 13.84 , 7.192000000000000E-02 , -- 13.85 , 0.14312 , -- 13.86 , 0.17488 , -- 13.87 , 0.16315 , -- 13.88 , 0.14274 , -- 13.89 , 0.14017 , -- 13.9 , 0.14556 , -- 13.91 , 0.13989 , -- 13.92 , 0.12104 , -- 13.93 , 9.578000000000000E-02 , -- 13.94 , 7.056999999999999E-02 , -- 13.95 , 5.257000000000000E-02 , -- 13.96 , 4.283000000000000E-02 , -- 13.97 , 3.754000000000000E-02 , -- 13.98 , 3.580000000000000E-02 , -- 13.99 , 3.422000000000000E-02 , -- 14.0 , 2.593000000000000E-02 , -- 14.01 , 4.220000000000000E-03 , -- 14.02 , -1.590000000000000E-02 , -- 14.03 , -2.929000000000000E-02 , -- 14.04 , 4.251000000000000E-02 , -- 14.05 , 5.369000000000000E-02 , -- 14.06 , 6.154000000000000E-02 , -- 14.07 , 6.560000000000001E-02 , -- 14.08 , 6.591000000000000E-02 , -- 14.09 , 6.272000000000000E-02 , -- 14.1 , 5.704000000000000E-02 , -- 14.11 , 5.054000000000000E-02 , -- 14.12 , 4.304000000000000E-02 , -- 14.13 , 3.569000000000000E-02 , -- 14.14 , 2.953000000000000E-02 , -- 14.15 , 2.591000000000000E-02 , -- 14.16 , 2.479000000000000E-02 , -- 14.17 , 2.511000000000000E-02 , -- 14.18 , 2.581000000000000E-02 , -- 14.19 , 2.493000000000000E-02 , -- 14.2 , 2.314000000000000E-02 , -- 14.21 , 2.027000000000000E-02 , -- 14.22 , 1.935000000000000E-02 , -- 14.23 , 2.023000000000000E-02 , -- 14.24 , 2.506000000000000E-02 , -- 14.25 , 3.099000000000000E-02 , -- 14.26 , 3.760000000000000E-02 , -- 14.27 , 4.262000000000000E-02 , -- 14.28 , 4.532000000000000E-02 , -- 14.29 , 4.802000000000000E-02 , -- 14.3 , 5.005000000000000E-02 , -- 14.31 , 5.302000000000000E-02 , -- 14.32 , 5.416000000000000E-02 , -- 14.33 , 5.517000000000000E-02 , -- 14.34 , 5.543000000000000E-02 , -- 14.35 , 5.403000000000000E-02 , -- 14.36 , 5.095000000000000E-02 , -- 14.37 , 4.660000000000000E-02 , -- 14.38 , 4.407000000000000E-02 , -- 14.39 , 4.359000000000000E-02 , -- 14.4 , 4.649000000000000E-02 , -- 14.41 , 4.927000000000000E-02 , -- 14.42 , 5.116000000000000E-02 , -- 14.43 , 5.246000000000000E-02 , -- 14.44 , 5.290000000000000E-02 , -- 14.45 , 5.342000000000000E-02 , -- 14.46 , 5.301000000000000E-02 , -- 14.47 , 5.389000000000000E-02 , -- 14.48 , 5.518000000000000E-02 , -- 14.49 , 5.594000000000000E-02 , -- 14.5 , 5.543000000000000E-02 , -- 14.51 , 5.542000000000000E-02 , -- 14.52 , 5.677000000000000E-02 , -- 14.53 , 5.746000000000000E-02 , -- 14.54 , 5.802000000000000E-02 , -- 14.55 , 5.847000000000000E-02 , -- 14.56 , 5.842000000000000E-02 , -- 14.57 , 5.750000000000000E-02 , -- 14.58 , 5.606000000000000E-02 , -- 14.59 , 5.592000000000000E-02 , -- 14.6 , 5.517000000000000E-02 , -- 14.61 , 5.439000000000000E-02 , -- 14.62 , 5.392000000000000E-02 , -- 14.63 , 5.395000000000000E-02 , -- 14.64 , 5.260000000000000E-02 , -- 14.65 , 5.031000000000000E-02 , -- 14.66 , 4.883000000000000E-02 , -- 14.67 , 4.944000000000000E-02 , -- 14.68 , 5.215000000000000E-02 , -- 14.69 , 5.627000000000000E-02 , -- 14.7 , 6.244000000000000E-02 , -- 14.71 , 6.783000000000000E-02 , -- 14.72 , 7.159000000000000E-02 , -- 14.73 , 7.149999999999999E-02 , -- 14.74 , 6.673000000000000E-02 , -- 14.75 , 5.755000000000000E-02 , -- 14.76 , 4.539000000000000E-02 , -- 14.77 , 3.504000000000000E-02 , -- 14.78 , 2.721000000000000E-02 , -- 14.79 , 2.308000000000000E-02 , -- 14.8 , 2.125000000000000E-02 , -- 14.81 , 2.022000000000000E-02 , -- 14.82 , 1.831000000000000E-02 , -- 14.83 , 1.547000000000000E-02 , -- 14.84 , 1.321000000000000E-02 , -- 14.85 , 1.112000000000000E-02 , -- 14.86 , 1.025000000000000E-02 , -- 14.87 , 9.549999999999999E-03 , -- 14.88 , 1.040000000000000E-02 , -- 14.89 , 1.059000000000000E-02 , -- 14.9 , 1.108000000000000E-02 , -- 14.91 , 1.195000000000000E-02 , -- 14.92 , 1.452000000000000E-02 , -- 14.93 , 1.809000000000000E-02 , -- 14.94 , 2.029000000000000E-02 , -- 14.95 , 2.323000000000000E-02 , -- 14.96 , 2.515000000000000E-02 , -- 14.97 , 2.836000000000000E-02 , -- 14.98 , 3.278000000000000E-02 , -- 14.99 , 3.934000000000000E-02 , -- 15.00 , 0.0 , -- ), -- INTERPOL='LIN', -- PROL_DROITE='CONSTANT', -- PROL_GAUCHE='EXCLU',); -- -- -- -- diff --cc Tests/testcomm9/forma12c.comm index 5e74e201,5e74e201..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm9/forma12c.comm +++ /dev/null @@@ -1,773 -1,773 +1,0 @@@ --# MODIF DATE 12/05/2005 AUTEUR DURAND C.DURAND --# TITRE TP ANALYSE SISMIQUE --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2004 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. --# ====================================================================== --# RESPONSABLE BOYERE E.BOYERE --#----------------------------------------------------------------------- --# --# ANALYSE RIS12 TR4 REGLEMENTAIRE --# SCENARIO 1 --# GL1(X,Y) + GL2(Z) --# --#----------------------------------------------------------------------- -- --DEBUT(CODE=_F(NOM ='FORMA12C',NIV_PUB_WEB='INTERNET')) -- --MAILLAGE=LIRE_MAILLAGE(INFO=2) -- --MODELE=AFFE_MODELE( -- MAILLAGE=MAILLAGE, -- AFFE=( -- _F(GROUP_MA='GPOU_D_T', -- PHENOMENE='MECANIQUE', -- MODELISATION='POU_D_T',), -- _F(GROUP_MA='GPOU_C_T', -- PHENOMENE='MECANIQUE', -- MODELISATION='POU_C_T',), -- _F(GROUP_MA='GDIS_TR', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_TR',), -- ), -- ) -- --IMPR_RESU(FORMAT='CASTEM',UNITE=37, -- MODELE=MODELE, -- RESU=_F( -- MAILLAGE=MAILLAGE)) -- -- -- --#----------------------------------------------------------------------- --# CARACTERISTIQUES DES ELEMENTS --#----------------------------------------------------------------------- -- -- --CARA=AFFE_CARA_ELEM( -- MODELE=MODELE, -- POUTRE=( -- _F(GROUP_MA='GMEL0301', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.00711),), -- _F(GROUP_MA='GMEL0501', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL0601', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL0701', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1001', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1101', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1201', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1501', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1701', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1801', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL1901', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2001', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2101', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2201', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.0034),), -- _F(GROUP_MA='GMEL2401', -- SECTION='CERCLE', -- CARA=('R','EP'), -- VALE=(0.08415,0.00711),),), -- DISCRET=(_F(MAILLE='M0801I02', -- CARA='M_TR_D_N', -- VALE=(36.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0),), -- _F(MAILLE='M1301I02', -- CARA='M_TR_D_N', -- VALE=(36.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0),),), -- DEFI_ARC=(_F(GROUP_MA='GMEL0601', -- CENTRE=(466.39260860000002,107.5500031,0.27747499939999998), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL1101', -- CENTRE=(466.16400149999998,107.3214035,3.7724525930000001), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL1701', -- CENTRE=(466.16400149999998,106.4785995,4.2335472110000003), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL1901', -- CENTRE=(466.16400149999998,106.4785995,8.7655010220000005), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,), -- _F(GROUP_MA='GMEL2101', -- CENTRE=(466.16400149999998,107.4713974,9.2274990080000006), -- RAYON=0.22859999540000001, -- COEF_FLEX_XY=14.43145561, -- COEF_FLEX_XZ=14.43145561,),),) -- --#----------------------------------------------------------------------- --# DEFINITION DES MATERIAUX --#----------------------------------------------------------------------- -- --MATP01=DEFI_MATERIAU(ELAS=_F(E=1.97E11, -- NU=0.3, -- RHO=1.3108749019999999E4, -- ALPHA=1.639999937E-05,),) --MATP03=DEFI_MATERIAU(ELAS=_F(E=1.97E11, -- NU=0.3, -- RHO=1.956015625E4, -- ALPHA=1.639999937E-05,),) -- --#----------------------------------------------------------------------- --# DEFINITION DES SUPPORTS --#----------------------------------------------------------------------- -- --SUPPORT=AFFE_CHAR_MECA( -- MODELE=MODELE, -- DDL_IMPO=( --# PF1 ET PF2 -- _F( NOEUD = ('N02__I00', 'N01__I00',), -- DX = 0., DY = 0., DZ = 0., DRX = 0., DRY = 0., DRZ = 0.), --# GL1 -- _F( NOEUD = 'N0701I00', -- DX = 0., DY = 0.), --# GL2 -- _F( NOEUD = 'N1201I00', -- DZ = 0.), -- ), -- ) -- --#----------------------------------------------------------------------- --# DEFINITION DES CHAMPS DE MATERIAUX --#----------------------------------------------------------------------- -- --CHMATP=AFFE_MATERIAU(MAILLAGE=MAILLAGE, -- AFFE=(_F(GROUP_MA='GMAT01', -- MATER=MATP01, -- ), -- _F(GROUP_MA='GMAT03', -- MATER=MATP03, -- ),),) -- --#----------------------------------------------------------------------- --# ASSEMBLAGE MATRICE MASSE ET RIGIDITE --#----------------------------------------------------------------------- -- --MACRO_MATR_ASSE(MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- CHARGE=SUPPORT, -- NUME_DDL=CO('NUMDDL'), -- MATR_ASSE=(_F(MATRICE=CO("MATRRIGI"), -- OPTION='RIGI_MECA',), -- _F(MATRICE=CO("MATRMASS"), -- OPTION='MASS_MECA',),),); -- -- --#----------------------------------------------------------------------- --# ASSEMBLAGE DU SECOND MEMBRE --#----------------------------------------------------------------------- -- --INCLUDE(UNITE=22) -- --CHSEIX=CALC_CHAR_SEISME( MATR_MASS=MATRMASS, -- DIRECTION=(1., 0., 0.,), MONO_APPUI='OUI' -- ) --CHSEIY=CALC_CHAR_SEISME( MATR_MASS=MATRMASS, -- DIRECTION=(0., 1., 0.,), MONO_APPUI='OUI' -- ) --CHSEIZ=CALC_CHAR_SEISME( MATR_MASS=MATRMASS, -- DIRECTION=(0., 0., 1.,), MONO_APPUI='OUI' -- ) -- --#----------------------------------------------------------------------- --# CALCUL DES MODES --#----------------------------------------------------------------------- --MASSINER=POST_ELEM( -- MODELE=MODELE, -- CHARGE=SUPPORT, -- CARA_ELEM=CARA, -- CHAM_MATER=CHMATP, -- MASS_INER=_F( TOUT = 'OUI',) -- ) --MODES=MACRO_MODE_MECA( -- MATR_A=MATRRIGI, -- MATR_B=MATRMASS, -- CALC_FREQ=_F( -- FREQ_MIN = 0.0, -- FREQ_MAX = 33.0, -- NB_BLOC_FREQ = 1), -- VERI_MODE=_F( STOP_ERREUR = 'NON'), -- NORM_MODE=_F( -- NORME = 'MASS_GENE', -- ), -- IMPRESSION=_F( TOUT_PARA = 'OUI') -- ) -- --# TEST_RESU UNIQUEMENT POUR FAIRE CAS TEST --TEST_RESU(RESU=(_F(RESULTAT=MODES, -- NUME_ORDRE=1, -- PARA='FREQ', -- VALE= 4.5135794612152, -- PRECISION=1e-05, -- REFERENCE='NON_REGRESSION', -- VERSION='7.3.19',))) -- --MODES=CALC_ELEM( -- reuse=MODES, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=MODES,) -- --########################################################### --#---- REPONSE TRANSITOIRE PAR SUPERPOSITION MODALE ------ --#---- MONO APPUI GRANDEURS RELATIVES ------ --########################################################### -- --# DEFINITION DES INSTANTS DE RECUPERATION -- --L_RECU=DEFI_LIST_REEL( DEBUT=0., -- INTERVALLE=_F( -- JUSQU_A = 20.47, -- PAS = 0.01) -- ) -- --#---------------------------------------------------- --#------------- PROJECTION SUR LA BASE MODALE -------- --#---------------------------------------------------- --MACRO_PROJ_BASE( -- BASE=MODES, -- MATR_ASSE_GENE=( -- _F( -- MATRICE=CO("MASSEGEN"), -- MATR_ASSE=MATRMASS, -- ), -- _F( -- MATRICE=CO("RIGIDGEN"), -- MATR_ASSE=MATRRIGI, -- ), -- ), -- VECT_ASSE_GENE=( -- _F( -- VECTEUR=CO("EFGENX"), -- VECT_ASSE=CHSEIX, -- ), -- _F( -- VECTEUR=CO("EFGENY"), -- VECT_ASSE=CHSEIY, -- ), -- _F( -- VECTEUR=CO("EFGENZ"), -- VECT_ASSE=CHSEIZ, -- ), -- ), -- ) -- --#------------------------------------------------------------------ --#-------------- RESOLUTION DU PB GENERALISE ----------------------- --#-------------- SANS CORRECTION STATIQUE -------------------------- --#------------------------------------------------------------------ --GSCR=DYNA_TRAN_MODAL( -- MASS_GENE=MASSEGEN, -- RIGI_GENE=RIGIDGEN, -- AMOR_REDUIT=0.02, -- EXCIT=( -- _F( -- VECT_GENE=EFGENX, -- FONC_MULT=ACCELH1, -- ), -- _F( -- VECT_GENE=EFGENY, -- FONC_MULT=ACCELH1, -- ), -- _F( -- VECT_GENE=EFGENZ, -- FONC_MULT=ACCELV1, -- ), -- ), -- INCREMENT=_F( -- INST_INIT = 0., -- INST_FIN =20.47, -- PAS = 0.001 -- ), -- ) -- --#-------------------------------------------------------------- --#---- RESTITUTION GRANDEUR PHYSIQUE DANS LE REPERE RELATIF --#--- SANS CORRECTION STATIQUE --#-------------------------------------------------------------- --# RESTITUTION GLOBALE DU CHAMP DE DEPLACEMENT RELATIF A CHAQUE INSTANT --# DE LA LISTE L_RECU --RGSCR=REST_GENE_PHYS( -- RESU_GENE=GSCR, -- INTERPOL='LIN', -- LIST_INST=L_RECU, -- #TOUT_INST='OUI', -- TOUT_CHAM='OUI', -- ) --DPSCR=CREA_CHAMP( -- TYPE_CHAM='NOEU_DEPL_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR, -- NOM_CHAM='DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) --TDPSCR=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_MAX_R', -- GROUP_NO='GNSTR01', -- CHAM_GD=DPSCR, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- -- --# RESTITUTION GLOBALE DU CHAMP EFGE_ELNO_DEPL A CHAQUE INSTANT --# DE LA LISTE L_RECU --RGSCR=CALC_ELEM( -- reuse=RGSCR, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=RGSCR,) --EFSCR=CREA_CHAMP( -- TYPE_CHAM='ELNO_SIEF_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR, -- NOM_CHAM='EFGE_ELNO_DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) --TEFSCR=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_MAX_R', -- GROUP_NO='GNSTR01', -- CHAM_GD=EFSCR, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) --IMPR_TABLE( -- TABLE=TEFSCR, -- FORMAT='TABLEAU', -- ) -- --########################################################### --#---- REPONSE TRANSITOIRE PAR SUPERPOSITION MODALE ------ --#---- MULTI APPUIS GRANDEURS ABSOLUES ------ --########################################################### -- --# DEFINITION EXCITATION MULTIPLE -- --MSTA=MODE_STATIQUE( -- MATR_RIGI=MATRRIGI, -- MATR_MASS=MATRMASS, -- MODE_STAT=_F(TOUT='OUI',AVEC_CMP=('DX','DY','DZ'),),) -- -- --CHSEIXM=CALC_CHAR_SEISME( -- MATR_MASS=MATRMASS, -- DIRECTION=(1., 0., 0.,), -- MODE_STAT=MSTA, -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ) -- --CHSEIYM=CALC_CHAR_SEISME( -- MATR_MASS=MATRMASS, -- DIRECTION=(0., 1., 0.,), -- MODE_STAT=MSTA, -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ) -- --CHSEIZM=CALC_CHAR_SEISME( -- MATR_MASS=MATRMASS, -- DIRECTION=(0., 0., 1.,), -- MODE_STAT=MSTA, -- NOEUD=('N02__I00','N01__I00','N1201I00',), -- ) -- --MACRO_PROJ_BASE( -- BASE=MODES, -- MATR_ASSE_GENE=( -- _F( -- MATRICE=CO("MASGEN2"), -- MATR_ASSE=MATRMASS, -- ), -- _F( -- MATRICE=CO("RIGGEN2"), -- MATR_ASSE=MATRRIGI, -- ), -- ), -- VECT_ASSE_GENE=( -- _F( -- VECTEUR=CO("EFX2"), -- VECT_ASSE=CHSEIXM, -- ), -- _F( -- VECTEUR=CO("EFY2"), -- VECT_ASSE=CHSEIYM, -- ), -- _F( -- VECTEUR=CO("EFZ2"), -- VECT_ASSE=CHSEIZM, -- ), -- ), -- ) -- -- --VITESH1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=ACCELH1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) --DEPLAH1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=VITESH1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) --VITESV1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=ACCELV1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) --DEPLAV1=CALC_FONCTION( -- INTEGRE=_F(FONCTION=VITESV1,METHODE='TRAPEZE',), -- PROL_DROITE='CONSTANT' ) -- --GSCA=DYNA_TRAN_MODAL( -- MASS_GENE=MASGEN2, -- RIGI_GENE=RIGGEN2, -- AMOR_REDUIT=0.02, -- MODE_STAT=MSTA, -- EXCIT=( -- _F( -- VECT_GENE=EFX2, -- ACCE=ACCELH1, -- VITE=VITESH1, -- DEPL=DEPLAH1, -- MULT_APPUI='OUI', -- DIRECTION=(1.,0.,0.,), -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ), -- _F( -- VECT_GENE=EFY2, -- ACCE=ACCELH1, -- VITE=VITESH1, -- DEPL=DEPLAH1, -- MULT_APPUI='OUI', -- DIRECTION=(0.,1.,0.,), -- NOEUD=('N02__I00','N01__I00','N0701I00',), -- ), -- _F( -- VECT_GENE=EFZ2, -- ACCE=ACCELV1, -- VITE=VITESV1, -- DEPL=DEPLAV1, -- MULT_APPUI='OUI', -- DIRECTION=(0.,0.,1.,), -- NOEUD=('N02__I00','N01__I00','N1201I00',), -- ), -- ), -- INCREMENT=_F( -- INST_INIT = 0., -- INST_FIN =20.47, -- PAS = 0.001 -- ), -- ) -- -- --# RESTITUTION GRANDEURS ABSOLUES --#------------------------------- -- --RGSCA=REST_GENE_PHYS( -- RESU_GENE=GSCA, -- INTERPOL='LIN', -- LIST_INST=L_RECU, -- TOUT_CHAM='OUI', -- MULT_APPUI='OUI', -- ) -- --# DEPLACEMENTS -- --DPSCA=CREA_CHAMP( -- TYPE_CHAM='NOEU_DEPL_R', -- OPERATION='EXTR', -- RESULTAT=RGSCA, -- NOM_CHAM='DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TDPSCA=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_MAX_A', -- GROUP_NO='GNSTR01', -- CHAM_GD=DPSCA, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=TDPSCA, -- FORMAT='TABLEAU', -- ) -- --# EFFORTS -- --RGSCA=CALC_ELEM( -- reuse=RGSCA, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=RGSCA,) -- --EFSCA=CREA_CHAMP( -- TYPE_CHAM='ELNO_SIEF_R', -- OPERATION='EXTR', -- RESULTAT=RGSCA, -- NOM_CHAM='EFGE_ELNO_DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TEFSCA=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_MAX_A', -- GROUP_NO='GNSTR01', -- CHAM_GD=EFSCA, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) --IMPR_TABLE( -- TABLE=TEFSCA, -- FORMAT='TABLEAU', -- ) -- -- --# RESTITUTION GRANDEURS RELATIVES --#------------------------------- -- --# DEPLACEMENTS -- --RGSCR2=REST_GENE_PHYS( -- RESU_GENE=GSCA, -- INTERPOL='LIN', -- LIST_INST=L_RECU, -- TOUT_CHAM='OUI', -- ) -- --DPSCR2=CREA_CHAMP( -- TYPE_CHAM='NOEU_DEPL_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR2, -- NOM_CHAM='DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TDPSCR2=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_MAX_R2', -- GROUP_NO='GNSTR01', -- CHAM_GD=DPSCR2, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=TDPSCR2, -- FORMAT='TABLEAU', -- ) -- --# EFFORTS -- --RGSCR2=CALC_ELEM( -- reuse=RGSCR2, -- MODELE=MODELE, -- CHAM_MATER=CHMATP, -- CARA_ELEM=CARA, -- OPTION=( -- 'EFGE_ELNO_DEPL', -- ), -- RESULTAT=RGSCR2,) -- --EFSCR2=CREA_CHAMP( -- TYPE_CHAM='ELNO_SIEF_R', -- OPERATION='EXTR', -- RESULTAT=RGSCR2, -- NOM_CHAM='EFGE_ELNO_DEPL', -- TYPE_MAXI='MAXI', -- TYPE_RESU='VALE', -- TOUT_ORDRE='OUI' -- ) -- --TEFSCR2=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_MAX_R2', -- GROUP_NO='GNSTR01', -- CHAM_GD=EFSCR2, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=TEFSCR2, -- FORMAT='TABLEAU', -- ) -- --########################################################### --#------REPONSE SPECTRALE PAR SUPERPOSITION MODALE--------- --########################################################### -- --# CALCUL DU SPECTRE DE REPONSE OSCILLATEUR EN PSEUDO ACCELERATION ABSOLUE --# NAPPE SRO FONCTION DE AMORTISSEMENT --#------------------------------------------------------------------------ --SROXY=CALC_FONCTION( -- SPEC_OSCI=_F( -- FONCTION=ACCELH1, -- AMOR_REDUIT=(0.02,0.05,0.10), -- NORME=9.81, -- ), -- ) --SROZ=CALC_FONCTION( -- SPEC_OSCI=_F( -- FONCTION=ACCELV1, -- AMOR_REDUIT=(0.02,0.05,0.10), -- NORME=9.81, -- ), -- ) -- -- --#----------------------------------------------- --# REPONSE SPECTRALE SANS CORRECTION STATIQUE --#----------------------------------------------- --SPEC=COMB_SISM_MODAL( -- MODE_MECA=MODES, -- AMOR_REDUIT=0.02, -- MASS_INER=MASSINER, -- EXCIT=_F( -- MONO_APPUI='OUI', -- TRI_SPEC='OUI', -- SPEC_OSCI=(SROXY,SROXY,SROZ), -- ECHELLE=(9.81,9.81,9.81),), -- COMB_MODE=_F(TYPE='CQC',), -- COMB_DIRECTION=_F( TYPE = 'QUAD',), -- OPTION=( -- 'DEPL', -- 'EFGE_ELNO_DEPL', -- ), -- ) -- --EFSPEC=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'EFGE_SPEC', -- GROUP_NO='GNSTR01', -- RESULTAT=SPEC, -- NOM_CHAM='EFGE_ELNO_DEPL', -- NUME_ORDRE=4, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=EFSPEC, -- FORMAT='TABLEAU', -- ) -- --DPSPEC=POST_RELEVE_T( -- ACTION= -- _F( -- INTITULE = 'DEPL_SPEC', -- GROUP_NO='GNSTR01', -- RESULTAT=SPEC, -- NOM_CHAM='DEPL', -- NUME_ORDRE=4, -- TOUT_CMP='OUI', -- OPERATION ='EXTRACTION', -- ), -- ) -- --IMPR_TABLE( -- TABLE=DPSPEC, -- FORMAT='TABLEAU', -- ) -- -- -- --FIN() -- -- -- -- -- -- diff --cc Tests/testcomm9/g.comm index 8756209b,8756209b..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/g.comm +++ /dev/null @@@ -1,11 -1,11 +1,0 @@@ --DEBUT() --sensible=[2.1E11, 0.3, 1.E-6, 1.E-6, ] -- --# parse: -affectation --n=len(sensible) --PS=[None]*n -- --#for i in range(n): --# PS[i]=DEFI_PARA_SENSI(VALE=sensible[i]) -- --FIN() diff --cc Tests/testcomm9/hplp101b.comm index ef2790a1,ef2790a1..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm9/hplp101b.comm +++ /dev/null @@@ -1,189 -1,189 +1,0 @@@ --# MODIF DATE 09/05/2006 AUTEUR REZETTE C.REZETTE --# TITRE FISSURE AU CENTRE D'UNE PLAQUE MINCE RECTANGULAIRE FAISANT --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2004 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. --# ====================================================================== --# OBSTACLE A UN FLUC DE CHALEUR UNIFORME EN MILIEU ISOTROPE --# --# TESTE LES DERIVEES DE G DANS LE CAS D'UN CHARGEMENT EN FORCE DE VOLUME -- --DEBUT( CODE=_F( NOM = 'HPLP101B',NIV_PUB_WEB='INTERNET')) -- --YOUNG = DEFI_PARA_SENSI(VALE=1.) --FORC = DEFI_PARA_SENSI(VALE=1.) -- --MA=LIRE_MAILLAGE( ) -- --MA=DEFI_GROUP( reuse=MA, MAILLAGE=MA, -- CREA_GROUP_NO=_F( -- GROUP_MA = ( 'LP9P10', 'LP9P10B', -- 'LP8P9', 'LP8P9B', -- )) -- ) -- --MO=AFFE_MODELE( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- PHENOMENE = 'MECANIQUE', -- MODELISATION = 'C_PLAN') -- ) --ZERO = DEFI_CONSTANTE(VALE=0.) --NU = DEFI_CONSTANTE(VALE=0.3) --ALPHA = DEFI_CONSTANTE(VALE=0.) -- --MAT=DEFI_MATERIAU(ELAS_FO=_F( E = YOUNG, NU = NU, -- TEMP_DEF_ALPHA =20., -- ALPHA = ALPHA, RHO=7800.,)) -- --CHMAT=AFFE_MATERIAU( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- MATER = MAT) -- ) -- --CH=AFFE_CHAR_MECA_F( MODELE=MO, -- FORCE_INTERNE=_F(TOUT='OUI',FY=FORC,), -- DDL_IMPO=( -- _F( GROUP_NO = 'LP8P9', -- DX = ZERO), -- _F( GROUP_NO = 'LP8P9B', -- DX = ZERO), -- _F( GROUP_NO = 'P11', -- DY = ZERO)) -- ) -- --DEP=MECA_STATIQUE( MODELE=MO, CHAM_MATER=CHMAT, -- SENSIBILITE = (FORC), -- EXCIT=_F( CHARGE = CH), -- ) -- --DEP=CALC_ELEM(reuse=DEP,RESULTAT=DEP, -- SENSIBILITE = (FORC), -- OPTION=('EPSI_ELGA_DEPL','SIEF_ELGA_DEPL',),) -- --FOND=DEFI_FOND_FISS( MAILLAGE=MA, -- FOND_FISS=_F( GROUP_NO = ('P0',)), -- NORMALE=(0., 1., 0.,) -- ) -- --THETA0=CALC_THETA( MODELE=MO, -- THETA_2D=_F( GROUP_NO = ('P0',), -- MODULE = 1., -- R_INF = 3.75E-5, -- R_SUP = 7.50E-5), -- DIRECTION=(1., 0., 0.,) -- ) -- --G0=CALC_G( RESULTAT=DEP, -- THETA=_F(THETA=THETA0), -- SYME_CHAR='SANS', -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT') -- ) -- --DG0=CALC_G( RESULTAT=DEP, -- SENSIBILITE = (FORC), -- THETA=_F(THETA=THETA0), -- SYME_CHAR='SANS', -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT') -- ) -- --TEST_TABLE( TABLE=DG0, -- NOM_PARA='DG/DF', -- SENSIBILITE = (FORC), -- VALE=1.06E-2, -- REFERENCE='ANALYTIQUE', -- PRECISION=0.0005 ) --FIN() -- --THETA01=CALC_THETA( MODELE=MO, -- THETA_2D=_F( GROUP_NO = ('P0',), -- MODULE = 1., -- R_INF = 7.50E-5, -- R_SUP = 1.125E-4), -- DIRECTION=(1., 0., 0.,) -- ) -- --G1=CALC_G( RESULTAT=DEP, -- THETA=_F(THETA=THETA01), -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT'), -- SYME_CHAR='SANS' -- ) -- --DG1=CALC_G( RESULTAT=DEP, -- SENSIBILITE = (FORC), -- THETA=_F(THETA=THETA01), -- SYME_CHAR='SANS', -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT') -- ) -- --TEST_TABLE( TABLE=DG1, -- NOM_PARA='G', -- SENSIBILITE = (FORC), -- REFERENCE='ANALYTIQUE', -- VALE=1.06E-2, -- PRECISION=0.0005 ) -- --# --# DERIVEE PAR RAPPORT A E --# -- --DEP2=MECA_STATIQUE( MODELE=MO, CHAM_MATER=CHMAT, -- SENSIBILITE = (YOUNG), -- EXCIT=_F( CHARGE = CH), -- ) -- --DEP2=CALC_ELEM(reuse=DEP2,RESULTAT=DEP2, -- SENSIBILITE = (YOUNG), -- OPTION=('EPSI_ELGA_DEPL','SIEF_ELGA_DEPL',),) -- -- --DG2=CALC_G( RESULTAT=DEP2, -- SENSIBILITE = (YOUNG), -- THETA=_F(THETA=THETA0), -- SYME_CHAR='SANS', -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT') -- ) -- --TEST_TABLE( TABLE=DG2, -- NOM_PARA='G', -- SENSIBILITE = (YOUNG), -- REFERENCE='ANALYTIQUE', -- VALE=-5.3E-3, -- PRECISION=0.0005 ) -- -- --DG3=CALC_G( RESULTAT=DEP2, -- SENSIBILITE = (YOUNG), -- THETA=_F(THETA=THETA01), -- SYME_CHAR='SANS', -- COMP_ELAS=_F( RELATION = 'ELAS', -- DEFORMATION = 'PETIT') -- ) -- --TEST_TABLE( TABLE=DG3, -- NOM_PARA='G', -- VALE=-5.3E-3, -- SENSIBILITE = (YOUNG), -- REFERENCE='ANALYTIQUE', -- PRECISION=0.0005 ) -- -- --FIN() -- diff --cc Tests/testcomm9/hsnv100h.comm index e23f47d5,e23f47d5..00000000 deleted file mode 100755,100755 --- a/Tests/testcomm9/hsnv100h.comm +++ /dev/null @@@ -1,46 -1,46 +1,0 @@@ --# MODIF DATE 23/10/2006 AUTEUR VABHHTS J.PELLET --# TITRE THERMO-PLASTICITE EN TRACTION SIMPLE (MODELISATION:C_PLAN) --# CONFIGURATION MANAGEMENT OF EDF VERSION --# ====================================================================== --# COPYRIGHT (C) 1991 - 2006 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. --# ====================================================================== --# -- --DEBUT(CODE=_F( NOM = 'HSNV100H',NIV_PUB_WEB='INTRANET'),IMPR_MACRO='OUI',DEBUG=_F(SDVERI='OUI')) -- --#...................................................................... --# CAS TEST THERMOPLASTICITE ELEMENTAIRE --#...................................................................... --# DEFINITION DES CARACTERISTIQUES DU MATERIAU --# -- --MAIL=LIRE_MAILLAGE( ) -- --INCLUDE_MATERIAU(TYPE_MODELE='REF', -- TYPE_VALE='NOMI', -- NOM_AFNOR='Z2CND1712', -- VARIANTE='A', -- NOM_MATER='MONMAT', -- UNITE_LONGUEUR='MM' -- ) -- --CHMAT=AFFE_MATERIAU( MAILLAGE=MAIL,AFFE=( -- _F( TOUT='OUI', MATER = MONMAT), -- ),) -- --# -- --FIN() diff --cc Tests/testcomm9/incmat.comm index 705a1cbd,705a1cbd..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/incmat.comm +++ /dev/null @@@ -1,7 -1,7 +1,0 @@@ --DEBUT() --MA=LIRE_MAILLAGE() --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) -- --FIN() diff --cc Tests/testcomm9/param1.comm index 79172614,79172614..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/param1.comm +++ /dev/null @@@ -1,36 -1,36 +1,0 @@@ -- --DEBUT() --TEMP_MOY=50. --coef0 = 1.E-3 -- --A0=DEFI_FONCTION( NOM_PARA='TEMP', -- PROL_DROITE='EXCLU', -- PROL_GAUCHE='EXCLU', -- VALE=( -- 20. ,14.7 *coef0, -- 50. ,15.2 *coef0, -- 100. ,15.8 *coef0, -- 150. ,16.7 *coef0, -- 200. ,17.2 *coef0, -- 250. ,18. *coef0, -- 300. ,18.6 *coef0, -- 350. ,19.3 *coef0, -- 400. ,20. *coef0, -- 450. ,20.5 *coef0, -- 500. ,21.1 *coef0, -- 550. ,21.7 *coef0, -- 600. ,22.2 *coef0, -- 650. ,22.7 *coef0, -- 700. ,23.2 *coef0, -- 750. ,23.7 *coef0, -- 800. ,24.1 *coef0, -- 950. ,26.67 *coef0, -- 1150. ,29.24 *coef0, -- 1370. ,32.06 *coef0, -- )) -- --DEFI_MATERIAU( ELAS=_F( RHO = 1.E08, -- NU = 0.3, -- E = A0(TEMP_MOY))) -- --FIN() diff --cc Tests/testcomm9/param2.com0 index 2d32a387,2d32a387..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/param2.com0 +++ /dev/null @@@ -1,4 -1,4 +1,0 @@@ --POURSUITE(); --l1=DEFI_LIST_ENTI(DEBUT=mon_param,); --FIN(); -- diff --cc Tests/testcomm9/param2.comm index 19c8eeb2,19c8eeb2..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/param2.comm +++ /dev/null @@@ -1,4 -1,4 +1,0 @@@ --DEBUT(); --mon_param = 2; --m=LIRE_MAILLAGE() --FIN(); diff --cc Tests/testcomm9/param3.11 index 236ca5ca,236ca5ca..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/param3.11 +++ /dev/null @@@ -1,2 -1,2 +1,0 @@@ --x=45 --y=77 diff --cc Tests/testcomm9/param3.12 index 2c2a2157,2c2a2157..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/param3.12 +++ /dev/null @@@ -1,1 -1,1 +1,0 @@@ --d=5;f=7 diff --cc Tests/testcomm9/param3.com0 index d5a0bbf5,d5a0bbf5..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/param3.com0 +++ /dev/null @@@ -1,11 -1,11 +1,0 @@@ --POURSUITE(); --l1=DEFI_LIST_ENTI(DEBUT=2*mon_param+1,); --l2=DEFI_LIST_ENTI(DEBUT=a[1]); --INCLUDE_MATERIAU( NOM_AFNOR='18MND5', TYPE_MODELE='REF', -- VARIANTE='A', TYPE_VALE='NOMI', -- NOM_MATER='MAT3', INFO=1 ) --INCLUDE(UNITE=11) --INCLUDE(UNITE=12) -- --FIN(); -- diff --cc Tests/testcomm9/param3.comm index b7a38ea2,b7a38ea2..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/param3.comm +++ /dev/null @@@ -1,5 -1,5 +1,0 @@@ --DEBUT(); --mon_param = 2; --m=LIRE_MAILLAGE() --a=[1,2,3,4];b=2 --FIN(); diff --cc Tests/testcomm9/pars1.comm index 53e7f325,53e7f325..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/pars1.comm +++ /dev/null @@@ -1,61 -1,61 +1,0 @@@ --DEBUT() --a=1 # comment --c=32.3 # comment -- --aa='string # bizarre' --a="string # bizarre" -- --b="string ( bizarre" -- --d="""string multi --line --""" --e="""string multi # ssssssssssss --line --""" --P='''string # bizarre' #profondeur ' # autre --bbb''' -- --#comment --#comment --#comment -- --#commenta --##XXXX=CHARGE(RAYON=0.1E-2,VALE=(0.12E-1,0.54E-5,0.1),MCF=_F(VALE=0.3E-5), --## V="toto", -- ## ) --#commentb -- --##CH=CHARGE(RAYON=0.1E-2,VALE=(0.12E-1,0.54E-5,0.1),MCF=_F(VALE=0.3E-5), --## MCF2=(_F(VALE=0.3E-4,GROUP_MA='GMA0601'),_F(VALE=0.3E-2)), --## VALE_C=[0.12E-3,0.54E-1,0.1], -- ## ) --MA=LIRE_MAILLAGE() --a=(10, --#commentc --12,13) -- --#commentd --P=1 #profondeur --#commente --aaa=(10, --11, #commentc --12,13) --xx=EVAL("13.26") -- --fmt_raison='-'*80+''' -- -- Exception erreur_Fatale interceptee -- Raison : %s -- --'''+'-'*80+'xxxxxxxxxxxxxxxx\n' -- --# commen """ --# commen ''' --# commen ' --# commen " --BETA=3.41557E-08 -- --a=8.3 ; #position -- --FIN() diff --cc Tests/testcomm9/parseur.comm index 92aaf898,92aaf898..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/parseur.comm +++ /dev/null @@@ -1,74 -1,74 +1,0 @@@ --DEBUT() --P1 = 9.8; -- --P2 = 8.8; -- --P3 = 7; -- --P5 = P3*P1; -- --P6 = P1-3; -- --P4 = [2,3,4]; -- --a = 1. --b=3 --c= 3 * 5 --cc="b+3" --d= 4 + \ -- 5 \ -- -4 --e=LIRE_MAILLAGE() --##MA=LIRE_MAILLAGE() --x=(1,2) --y=[3, --#comme --4] --z="a" --zz='v' --u='''aaaa --bbbb''' --#ne marche pas avec le parseur actuel --#if 1: --# a=45 --#else: --# a=5.6 --d={"a":0} --e={"a":0, --#comme --"d":4} --#ne marche pas avec le parseur actuel --#a==1 --s="-"*80 --fmt_raison='-'*80+''' -- -- Exception erreur_Fatale interceptee -- Raison : %s -- --'''+'-'*80+'xxxxxxxxxxxxxxxx\n' -- --# commen """ --# commen ''' --# commen ' --# commen " --BETA=3.41557E-08 -- --C_0=105.7 -- --C_EQ_I05=69.1 -- --C_EQ_E05=69.1 -- --C_EQ_I10=51.6 -- --C_EQ_E10=69.1 -- --FL_INT05 = FORMULE(NOM_PARA='TEMP',VALE=''' --(0.5*BETA / ((C_0 - C_EQ_I05 )**2) -- * (TEMP - (2.*C_0 - C_EQ_I05 ))*(TEMP - C_EQ_I05 ))''') -- --zz=8.9; --#ne marche pas avec le parseur actuel --#zz=8.9;aa=10 #position -- --FIN() diff --cc Tests/testcomm9/testcomm.py index a0b40af6,fb9dfbb9..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/testcomm.py +++ /dev/null @@@ -1,70 -1,70 +1,0 @@@ --import os,glob,sys --import unittest --import difflib -- --import prefs --from InterfaceTK import appli -- --def add_param(j,pos,nom,valeur): - co=j.addentite("PARAMETRE",pos) - co.set_nom(nom) - co=j.addEntite("PARAMETRE",pos) - co.setNom(nom) -- co.set_valeur(valeur) -- return co -- --def add_mcsimp(obj,nom,valeur): - mcs=obj.get_child(nom,restreint='oui') - mcs=obj.getChild(nom,restreint='oui') -- if mcs is None: - pos=obj.get_index_child(nom) - mcs=obj.addentite(nom,pos) - mcs.set_valeur(mcs.eval_val(valeur)) - pos=obj.getIndexChild(nom) - mcs=obj.addEntite(nom,pos) - mcs.set_valeur(mcs.evalVal(valeur)) -- return mcs -- --def cdiff(text1,text2): -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- --class TestCase(unittest.TestCase): -- app=None -- def setUp(self): -- if self.app == None: -- self.app=appli.STANDALONE(version='v9') -- pass -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- -- i=0 -- files= os.path.join(os.path.dirname(__file__),"*.comm") -- for f in glob.glob(os.path.join(prefs.INSTALLDIR,files)): -- for o in ('3','2','1','0','m'): -- f=f[:-1]+o -- if os.path.isfile(f):break -- -- i=i+1 -- exec """def test%s(self,file="%s"): -- "fichier:%s" -- self.commtest(file) --""" % (i,f,f) -- del i -- -- def commtest(self,file): -- """ Test generique""" -- #print file -- name=os.path.splitext(os.path.basename(file))[0] -- errfile=os.path.join(os.path.dirname(__file__),name+".err") -- err="" -- if os.path.isfile(errfile): -- f=open(errfile) -- err=f.read() -- f.close() -- j=self.app.openJDC(file=file) - assert j.cr.get_mess_exception() == "" - assert j.cr.getMessException() == "" -- -- if err == "": - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- else: -- txt=str(j.report()) -- assert txt == err,cdiff(err,txt) -- - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- j.supprime() -- assert sys.getrefcount(j) == 2,sys.getrefcount(j) diff --cc Tests/testcomm9/titi.comm index a235be8a,a235be8a..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/titi.comm +++ /dev/null @@@ -1,69 -1,69 +1,0 @@@ --DEBUT() --YOUNG = DEFI_PARA_SENSI(VALE=1.) --FORC = DEFI_PARA_SENSI(VALE=1.) --MA=LIRE_MAILLAGE() --MA=DEFI_GROUP( reuse=MA, MAILLAGE=MA, -- CREA_GROUP_NO=_F( -- GROUP_MA = ( 'LP9P10', 'LP9P10B', -- 'LP8P9', 'LP8P9B', -- )) -- ) -- --MO=AFFE_MODELE( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- PHENOMENE = 'MECANIQUE', -- MODELISATION = 'C_PLAN') -- ) --ZERO = DEFI_CONSTANTE(VALE=0.) --NU = DEFI_CONSTANTE(VALE=0.3) --ALPHA = DEFI_CONSTANTE(VALE=0.) -- --MAT=DEFI_MATERIAU(ELAS_FO=_F( E = YOUNG, NU = NU, -- TEMP_DEF_ALPHA =20., -- ALPHA = ALPHA, RHO=7800.,)) -- --CHMAT=AFFE_MATERIAU( MAILLAGE=MA, -- AFFE=_F( TOUT = 'OUI', -- MATER = MAT) -- ) -- --CH=AFFE_CHAR_MECA_F( MODELE=MO, -- FORCE_INTERNE=_F(TOUT='OUI',FY=FORC,), -- DDL_IMPO=( -- _F( GROUP_NO = 'LP8P9', -- DX = ZERO), -- _F( GROUP_NO = 'LP8P9B', -- DX = ZERO), -- _F( GROUP_NO = 'P11', -- DY = ZERO)) -- ) -- --DEP=MECA_STATIQUE( MODELE=MO, CHAM_MATER=CHMAT, -- SENSIBILITE = (FORC), -- EXCIT=_F( CHARGE = CH), -- ) -- --DEP=CALC_ELEM(reuse=DEP,RESULTAT=DEP, -- SENSIBILITE = (FORC), -- OPTION=('EPSI_ELGA_DEPL','SIEF_ELGA_DEPL',),) -- --FOND=DEFI_FOND_FISS( MAILLAGE=MA, -- FOND_FISS=_F( GROUP_NO = ('P0',)), -- NORMALE=(0., 1., 0.,) -- ) -- --THETA0=CALC_THETA( MODELE=MO, -- THETA_2D=_F( GROUP_NO = ('P0',), -- MODULE = 1., -- R_INF = 3.75E-5, -- R_SUP = 7.50E-5), -- DIRECTION=(1., 0., 0.,) -- ) -- -- --FIN() --MA1=LIRE_MAILLAGE() --MO1=AFFE_MODELE( MAILLAGE=MA1, AFFE=_F( TOUT = 'OUI', -- PHENOMENE = 'MECANIQUE', MODELISATION = 'C_PLAN')) -- --FIN() diff --cc Tests/testcomm9/toto.comm index 1bd3e3da,1bd3e3da..00000000 deleted file mode 100644,100644 --- a/Tests/testcomm9/toto.comm +++ /dev/null @@@ -1,7 -1,7 +1,0 @@@ --DEBUT() -- --MA=LIRE_MAILLAGE(UNITE=20, --#cocococo=LIRE_MAILLAGE(UNITE=20, -- VERI_MAIL=_F(VERIF='OUI',), -- INFO=1,); --FIN() diff --cc Tests/testelem/az.comm index 3d5fa743,3d5fa743..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/az.comm +++ /dev/null @@@ -1,114 -1,114 +1,0 @@@ -- --DEBUT(); --P1 = 9.8; -- --P2 = 8.8; -- --P3 = 7; -- --P5 = (P3 * P1); -- --P6 = (P1 - 3); -- --P4 = [2, 3, 4]; -- -- --#Pas trouve shellpanel -- --MAILLA2=LIRE_MAILLAGE(UNITE=P4[1],); -- --aaa = FORMULE(VALE='a+z', -- NOM_PARA=('a','z',),); -- --MAIL=LIRE_MAILLAGE(UNITE=P3,); -- --# 'LIRE_MAILLAGE', 'UNITE' --> uniquebasepanel -- --az = FORMULE(VALE='aaaaa', -- NOM_PARA=('ae','inst',),); -- --AFFE1=AFFE_MODELE(MAILLAGE=MAIL, -- AFFE=(_F(GROUP_MA=('RESSORT','eee',), -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_MA='MASSES', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO=('GNP3','GNP5','GNP6','GNP7','GNP8','GNP9','GNP10','GNP11','GNP12',), -- PHENOMENE='ACOUSTIQUE', -- MODELISATION='PLAN',),),); -- --MOD=AFFE_MODELE(MAILLAGE=MAIL, -- AFFE=(_F(GROUP_MA='RESSORT', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_MA='MASSES', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(TOUT='OUI', -- PHENOMENE='THERMIQUE', -- MODELISATION='COQUE',),),); -- --CARA=AFFE_CARA_ELEM(MODELE=MOD, -- POUTRE=_F(GROUP_MA='MA', -- SECTION='CERCLE', -- CARA='R', -- VALE=(3.0,P6,),),); -- --# 'AFFE_MODELE', 'MAILLAGE' --> uniqueassdpanel --# AFFE_MODELE', 'AFFE', 'GROUP_MA' --> plusieursbasepanel --# 'AFFE_MODELE', 'AFFE', 'PHENOMENE' --> uniqueintopanel --# 'AFFE_MODELE', 'AFFE', 'b_mecanique'--> plusieursintopanel -- --F1=DEFI_FONCTION(NOM_PARA='DX',VALE=(5.0,3.0, -- P4[1],P3, -- ),); -- --F3=DEFI_FONCTION(NOM_PARA='DRX',VALE_C=(5.0,7.0,9.0, -- 9.0,8.0,7.0, -- ),); -- --# 'DEFI_FONCTION', 'VALE' --> fonctionpanel -- --MATER2=DEFI_MATERIAU(ELAS=_F(E=100000000000.0, -- NU=0.0,), -- ECRO_ASYM_LINE=_F(DC_SIGM_EPSI=0.0, -- SY_C=200000000.0, -- DT_SIGM_EPSI=0.0, -- SY_T=50000000.0,),); -- --PS1=DEFI_PARA_SENSI(VALE=1.0,); -- --PS2=DEFI_PARA_SENSI(VALE=1.0,); -- --PS3=DEFI_PARA_SENSI(VALE=1.0,); -- --CHMAT2=AFFE_MATERIAU(MAILLAGE=MAIL, -- AFFE=_F(TOUT='OUI', -- MATER=MATER2,),); -- --AAAZ=AFFE_CHAR_THER(MODELE=AFFE1, -- TEMP_IMPO=_F(TOUT='OUI', -- TEMP=0.0,),); -- --TH1=THER_LINEAIRE(MODELE=AFFE1, -- CHAM_MATER=CHMAT2, -- EXCIT=_F(CHARGE=AAAZ,), -- SENSIBILITE=(PS1,PS2,),); -- --# 'THER_LINEAIRE', 'SENSIBILITE' --> plusieursassdpanel -- --ACA1=AFFE_CHAR_ACOU(MODELE=AFFE1, -- PRES_IMPO=_F(TOUT='OUI', -- PRES=('RI',3.0,3.0,),),); -- --# 'AFFE_CHAR_ACOU', 'PRES_IMPO', 'PRES' --> uniquecomppanel -- --MACRO_MATR_ASSE(MODELE=AFFE1, -- NUME_DDL=CO('DDL1'), -- MATR_ASSE=_F(MATRICE=CO('MAT1'), -- OPTION='RIGI_THER',),); -- --# 'MACRO_MATR_ASSE', 'MATR_ASSE', 'MATRICE' --> uniquesdcopanel -- --FIN(); diff --cc Tests/testelem/azv6.comm index 422743da,422743da..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/azv6.comm +++ /dev/null @@@ -1,112 -1,112 +1,0 @@@ -- --DEBUT(); --P1 = 9.8; -- --P2 = 8.8; -- --P3 = 7; -- --P5 = (P3 * P1); -- --P6 = (P1 - 3); -- --P4 = [2, 3, 4]; -- -- --#Pas trouve shellpanel -- --MAILLA2=LIRE_MAILLAGE(UNITE=P4[1],); -- --aaa = FORMULE(REEL='(a+z) = (a,z)',); -- --MAIL=LIRE_MAILLAGE(UNITE=P3,); -- --# 'LIRE_MAILLAGE', 'UNITE' --> uniquebasepanel -- --az = FORMULE(REEL='(aaaaa) = (ae,inst)',); -- --AFFE1=AFFE_MODELE(MAILLAGE=MAIL, -- AFFE=(_F(GROUP_MA=('RESSORT','eee',), -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_MA='MASSES', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_NO=('GNP3','GNP5','GNP6','GNP7','GNP8','GNP9','GNP10','GNP11','GNP12',), -- PHENOMENE='ACOUSTIQUE', -- MODELISATION='PLAN',),),); -- --MOD=AFFE_MODELE(MAILLAGE=MAIL, -- AFFE=(_F(GROUP_MA='RESSORT', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(GROUP_MA='MASSES', -- PHENOMENE='MECANIQUE', -- MODELISATION='DIS_T',), -- _F(TOUT='OUI', -- PHENOMENE='THERMIQUE', -- MODELISATION='COQUE',),),); -- --CARA=AFFE_CARA_ELEM(MODELE=MOD, -- POUTRE=_F(GROUP_MA='MA', -- SECTION='CERCLE', -- CARA='R', -- VALE=(3.0,P6,),),); -- --# 'AFFE_MODELE', 'MAILLAGE' --> uniqueassdpanel --# AFFE_MODELE', 'AFFE', 'GROUP_MA' --> plusieursbasepanel --# 'AFFE_MODELE', 'AFFE', 'PHENOMENE' --> uniqueintopanel --# 'AFFE_MODELE', 'AFFE', 'b_mecanique'--> plusieursintopanel -- --F1=DEFI_FONCTION(NOM_PARA='DX',VALE=(5.0,3.0, -- P4[1],P3, -- ),); -- --F3=DEFI_FONCTION(NOM_PARA='DRX',VALE_C=(5.0,7.0,9.0, -- 9.0,8.0,7.0, -- ),); -- --# 'DEFI_FONCTION', 'VALE' --> fonctionpanel -- --MATER2=DEFI_MATERIAU(ELAS=_F(E=100000000000.0, -- NU=0.0,), -- ECRO_ASYM_LINE=_F(DC_SIGM_EPSI=0.0, -- SY_C=200000000.0, -- DT_SIGM_EPSI=0.0, -- SY_T=50000000.0,),); -- --PS1=DEFI_PARA_SENSI(VALE=1.0,); -- --PS2=DEFI_PARA_SENSI(VALE=1.0,); -- --PS3=DEFI_PARA_SENSI(VALE=1.0,); -- --CHMAT2=AFFE_MATERIAU(MAILLAGE=MAIL, -- AFFE=_F(TOUT='OUI', -- MATER=MATER2,),); -- --AAAZ=AFFE_CHAR_THER(MODELE=AFFE1, -- TEMP_IMPO=_F(TOUT='OUI', -- TEMP=0.0,),); -- --TH1=THER_LINEAIRE(MODELE=AFFE1, -- CHAM_MATER=CHMAT2, -- EXCIT=_F(CHARGE=AAAZ,), -- SENSIBILITE=(PS1,PS2,),); -- --# 'THER_LINEAIRE', 'SENSIBILITE' --> plusieursassdpanel -- --ACA1=AFFE_CHAR_ACOU(MODELE=AFFE1, -- PRES_IMPO=_F(TOUT='OUI', -- PRES=('RI',3.0,3.0,),),); -- --# 'AFFE_CHAR_ACOU', 'PRES_IMPO', 'PRES' --> uniquecomppanel -- --MACRO_MATR_ASSE(MODELE=AFFE1, -- NUME_DDL=CO('DDL1'), -- MATR_ASSE=_F(MATRICE=CO('MAT1'), -- OPTION='RIGI_THER',),); -- --# 'MACRO_MATR_ASSE', 'MATR_ASSE', 'MATRICE' --> uniquesdcopanel -- --FIN(); diff --cc Tests/testelem/cata1.py index 0c9334c6,7733dda8..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/cata1.py +++ /dev/null @@@ -1,82 -1,82 +1,0 @@@ --from Accas import SIMP,FACT,OPER,ASSD,AsException,AsType --import Noyau -- --class CATA: -- def __init__(self): - CONTEXT.unset_current_cata() - CONTEXT.set_current_cata(self) - CONTEXT.unsetCurrentCata() - CONTEXT.setCurrentCata(self) -- def enregistre(self,cmd): -- pass -- --cata=CATA() -- --class concept(ASSD,Noyau.AsBase):pass -- --OP1 = OPER(nom='OP1',op=1,sd_prod=concept, -- a=SIMP(typ='I'), -- c=SIMP(typ='I',position='global'), -- ) -- --class concept2(ASSD,Noyau.AsBase):pass --class concept3(ASSD,Noyau.AsBase):pass -- --def op2_prod(TYPE_RESU,**args): -- if TYPE_RESU == "TRANS" : return concept2 -- if TYPE_RESU == "HARMO" : return concept3 -- raise AsException("type de concept resultat non prevu") -- --OP2=OPER(nom='OP2',op=2,sd_prod=op2_prod, -- TYPE_RESU =SIMP(statut='f',typ='TXM',defaut="TRANS",into=("TRANS","HARMO") ), -- ) -- --def op3_prod(MATR,**args): -- if AsType(MATR) == concept : return concept2 -- raise AsException("type de concept resultat non prevu") -- --OP3=OPER(nom='OP3',op=3,sd_prod=op3_prod, -- MATR =SIMP(statut='o',typ=concept), -- ) -- --def op4_prod(MESURE,**args): -- vale=MESURE['NOM_PARA'] -- if vale == 'INST' : return concept -- raise AsException("type de concept resultat non prevu") -- --OP4=OPER(nom='OP4',op=4,sd_prod=op4_prod, -- MESURE =FACT(statut='o',min=01,max=01, -- NOM_PARA =SIMP(statut='f',typ='TXM',defaut="INST",into=("INST",) ), -- ) -- ) -- --def op5_prod(FFT,**args): -- if (FFT != None) : - vale=FFT.get_child('FONCTION').get_valeur() - vale=FFT.getChild('FONCTION').getValeur() -- if (AsType(vale) == concept ) : return concept -- if (AsType(vale) == concept2) : return concept2 -- raise AsException("type de concept resultat non prevu") -- -- --OP5=OPER(nom='OP5',op=5,sd_prod=op5_prod, -- FFT =FACT(statut='f',min=1,max=1, -- FONCTION =SIMP(statut='o',typ=(concept,concept2) ) -- ), -- ) -- --def op6_prod(FILTRE,**args): -- vale=FILTRE[0]['MODE'] -- if AsType(vale) == concept : return concept -- if AsType(vale) == concept2 : return concept2 -- raise AsException("type de concept resultat non prevu") -- --OP6=OPER(nom='OP6',op=6,sd_prod=op6_prod, -- FILTRE =FACT(statut='o',min=01,max='**', -- MODE =SIMP(statut='o',typ=(concept,concept2) ), -- ) -- ) -- --OP7=OPER(nom='OP7',op=7,sd_prod=concept, -- FILTRE =FACT(statut='o',min=01,max='**', -- MODE =SIMP(statut='o',typ=(concept,concept2) ), -- ) -- ) -- diff --cc Tests/testelem/cata2.py index b8460ff2,f0422177..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/cata2.py +++ /dev/null @@@ -1,67 -1,67 +1,0 @@@ --from Accas import SIMP,FACT,OPER,ASSD,AsException,AsType,CO,MACRO --import Noyau -- -- --class CATA: -- def __init__(self): - CONTEXT.unset_current_cata() - CONTEXT.set_current_cata(self) - CONTEXT.unsetCurrentCata() - CONTEXT.setCurrentCata(self) -- def enregistre(self,cmd): -- pass -- --cata=CATA() -- --class concept(ASSD,Noyau.AsBase):pass -- --OP1 = OPER(nom='OP1',op=1,sd_prod=concept, -- a=SIMP(typ='I'), -- c=SIMP(typ='I',position='global'), -- ) -- --class concept2(ASSD,Noyau.AsBase):pass --class concept3(ASSD,Noyau.AsBase):pass -- --def op2_prod(self,MATR,**args): - self.type_sdprod(MATR,concept2) - self.typeSDProd(MATR,concept2) -- return concept -- --OP2=MACRO(nom='OP2',op=-2,sd_prod=op2_prod, -- MATR=SIMP(statut='o',typ=(CO,concept2)), -- ) -- --def op3_prod(self,MATR,**args): -- for m in MATR: -- t=m['CHAM'] - if t == 'R':self.type_sdprod(m['MM'],concept) - if t == 'R':self.typeSDProd(m['MM'],concept) -- return concept -- --OP3=MACRO(nom='OP3',op=-3,sd_prod=op3_prod, -- MATR=FACT(statut='f',min=1,max='**', -- CHAM=SIMP(statut='o',typ='TXM',into=("R","I"),), -- MM=SIMP(statut='o',typ=(CO,concept)), -- ), -- ) -- -- --def op4_prod(self,MATR,**args): -- if MATR == None :raise AsException("impossible recuperer mot cle facteur par defaut") -- return concept -- --OP4=MACRO(nom='OP4',op=-4,sd_prod=op4_prod, -- MATR=FACT(statut='d',min=1,max='**', -- CHAM=SIMP(statut='f',typ='TXM',defaut="R"), -- ), -- ) --OP5=MACRO(nom='OP5',op=-2,sd_prod=op2_prod, MATR=SIMP(statut='o',typ=CO),) -- --def OP6_ops(self,MATR,**args): -- """ -- """ -- ier=0 -- self.set_icmd(1) -- self.DeclareOut('cc',self.sd) -- cc=OP2(MATR=MATR) -- return ier -- --OP6=MACRO(nom='OP6',op=OP6_ops,sd_prod=op2_prod, MATR=SIMP(statut='o',typ=CO),) -- diff --cc Tests/testelem/cata3.py index d9c95f28,76ecaa60..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/cata3.py +++ /dev/null @@@ -1,83 -1,83 +1,0 @@@ --from Accas import SIMP,FACT,OPER,ASSD,AsException,AsType,CO,MACRO,JDC_CATA -- --class concept(ASSD):pass -- --JdC=JDC_CATA(code="ASTER") -- --OP1 = OPER(nom='OP1',op=1,sd_prod=concept, -- a=SIMP(typ='I'), -- c=SIMP(typ='I',position='global'), -- ) -- --class concept2(ASSD):pass --class concept3(ASSD):pass -- --def op2_prod(self,MATR,**args): - self.type_sdprod(MATR,concept2) - self.typeSDProd(MATR,concept2) -- return concept -- --OP2=MACRO(nom='OP2',op=-2,sd_prod=op2_prod, -- MATR=SIMP(statut='o',typ=(CO,concept2)), -- ) -- --def op3_prod(self,MATR,**args): -- for m in MATR: -- t=m['CHAM'] - if t == 'R':self.type_sdprod(m['MM'],concept) - if t == 'R':self.typeSDProd(m['MM'],concept) -- return concept -- --OP3=MACRO(nom='OP3',op=-3,sd_prod=op3_prod, -- MATR=FACT(statut='f',min=1,max='**', -- CHAM=SIMP(statut='o',typ='TXM',into=("R","I"),), -- MM=SIMP(statut='o',typ=(CO,concept)), -- ), -- ) -- -- --def op4_prod(self,MATR,**args): -- if MATR == None :raise AsException("impossible recuperer mot cle facteur par defaut") -- return concept -- --OP4=MACRO(nom='OP4',op=-4,sd_prod=op4_prod, -- MATR=FACT(statut='d',min=1,max='**', -- CHAM=SIMP(statut='f',typ='TXM',defaut="R"), -- ), -- ) -- --def INCLUDE_prod(self,UNITE,**args): -- """ Fonction sd_prod pour la macro include -- """ -- # Si unite a change on reevalue le fichier associe -- if not hasattr(self,'unite') or self.unite != UNITE: -- f,text=self.get_file(unite=UNITE) -- self.unite=UNITE -- self.fichier_init = f -- # on execute le texte fourni dans le contexte forme par -- # le contexte de l etape pere (global au sens Python) -- # et le contexte de l etape (local au sens Python) -- code=compile(text,f,'exec') - if self.jdc and self.jdc.par_lot == 'NON': - if self.jdc and self.jdc.parLot == 'NON': -- # On est en mode commande par commande -- # On teste la validite de la commande avec interruption eventuelle -- cr=self.report() -- self.parent.cr.add(cr) -- if not cr.estvide(): -- raise EOFError -- d={} -- self.g_context = d -- self.contexte_fichier_init = d -- exec code in self.parent.g_context,d -- --def INCLUDE_context(self,d): -- """ Fonction op_init pour macro INCLUDE -- """ -- for k,v in self.g_context.items(): -- d[k]=v -- --INCLUDE=MACRO(nom="INCLUDE",op=-1, -- sd_prod=INCLUDE_prod, -- op_init=INCLUDE_context, -- #fichier_ini=1, -- UNITE = SIMP(statut='o',typ='I'), --); -- diff --cc Tests/testelem/cata5.py index cb015867,8187d209..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/cata5.py +++ /dev/null @@@ -1,205 -1,205 +1,0 @@@ --# -*- coding: iso-8859-15 -*- --from Accas import SIMP,FACT,OPER,ASSD,AsException,AsType,CO,MACRO,JDC_CATA --import Noyau --JdC=JDC_CATA(code="ASTER") -- --class concept(ASSD,Noyau.AsBase):pass --class concept2(ASSD,Noyau.AsBase):pass --class concept3(ASSD,Noyau.AsBase):pass --class concept4(concept2):pass -- --def OP_ops(self,MATR,**args): -- ier=0 -- self.set_icmd(1) -- return ier -- --def op2_prod(self,MATR,**args): - self.type_sdprod(MATR,concept2) - self.typeSDProd(MATR,concept2) -- return concept --OP1=MACRO(nom='OP1',op=OP_ops,sd_prod=op2_prod, MATR=SIMP(statut='o',typ=CO),) --OP2=MACRO(nom='OP2',op=OP_ops,sd_prod=op2_prod, MATR=SIMP(statut='o',typ=(CO,concept2)),) --OP10=MACRO(nom='OP10',op=OP_ops,sd_prod=op2_prod, MATR=SIMP(statut='o',typ=concept2),) --OP11=MACRO(nom='OP11',op=OP_ops,sd_prod=concept, MATR=SIMP(statut='o',typ=concept2),) --OP12=MACRO(nom='OP12',op=OP_ops,sd_prod=concept, MATR=SIMP(statut='o',typ=CO),) --OP13=MACRO(nom='OP13',op=OP_ops,sd_prod=concept, MATR=SIMP(statut='o',typ=(CO,concept2)),) -- --def op3_prod(self,MATR,**args): -- for m in MATR: -- t=m['CHAM'] - if t == 'R':self.type_sdprod(m['MM'],concept) - if t == 'R':self.typeSDProd(m['MM'],concept) -- return concept --OP3=MACRO(nom='OP3',op=OP_ops,sd_prod=op3_prod, -- MATR=FACT(statut='f',min=1,max='**', -- CHAM=SIMP(statut='o',typ='TXM',into=("R","I"),), -- MM=SIMP(statut='o',typ=(CO,concept)),),) -- --def op4_prod(self,MATR,**args): -- if MATR == None :raise AsException("impossible recuperer mot cle facteur par defaut") -- return concept --OP4=MACRO(nom='OP4',op=OP_ops,sd_prod=op4_prod, -- MATR=FACT(statut='d',min=1,max='**', -- CHAM=SIMP(statut='f',typ='TXM',defaut="R"),),) -- --OP5=MACRO(nom='OP5',op=OP_ops,sd_prod=op2_prod, MATR=SIMP(statut='o',typ=CO),) -- --def op6_prod(self,MATR,**args): - self.type_sdprod(MATR,concept4) - self.typeSDProd(MATR,concept4) -- return concept --def OP6_ops(self,MATR,**args): -- ier=0 -- self.set_icmd(1) -- self.DeclareOut('cc',self.sd) -- cc=OP2(MATR=MATR) -- return ier --OP6=MACRO(nom='OP6',op=OP6_ops,sd_prod=op6_prod, MATR=SIMP(statut='o',typ=CO),) -- --def OP7_ops(self,MATR,**args): -- ier=0 -- self.set_icmd(1) -- self.DeclareOut('cc',self.sd) -- cc=OP8(MATR=MATR) -- return ier --OP7=MACRO(nom='OP7',op=OP7_ops,sd_prod=op2_prod, MATR=SIMP(statut='o',typ=CO),) -- --OP8=MACRO(nom='OP8',op=OP_ops,sd_prod=op6_prod, MATR=SIMP(statut='o',typ=(CO,concept4)),) -- --def OP9_ops(self,MATR,**args): -- ier=0 -- self.set_icmd(1) -- self.DeclareOut('cc',self.sd) -- cc=OP10(MATR=MATR) -- return ier --OP9=MACRO(nom='OP9',op=OP9_ops,sd_prod=op6_prod, MATR=SIMP(statut='o',typ=CO),) --def OP14_ops(self,MATR,**args): -- ier=0 -- self.set_icmd(1) -- self.DeclareOut('cc',self.sd) -- cc=OP1(MATR=MATR) -- return ier --OP14=MACRO(nom='OP14',op=OP14_ops,sd_prod=op6_prod, MATR=SIMP(statut='o',typ=CO),) --def OP15_ops(self,MATR,**args): -- ier=0 -- self.set_icmd(1) -- self.DeclareOut('cc',self.sd) -- cc=OP11(MATR=MATR) -- return ier --OP15=MACRO(nom='OP15',op=OP15_ops,sd_prod=op6_prod, MATR=SIMP(statut='o',typ=CO),) --def OP16_ops(self,MATR,**args): -- ier=0 -- self.set_icmd(1) -- self.DeclareOut('cc',self.sd) -- cc=OP12(MATR=MATR) -- return ier --OP16=MACRO(nom='OP16',op=OP16_ops,sd_prod=op6_prod, MATR=SIMP(statut='o',typ=CO),) --def OP17_ops(self,MATR,**args): -- ier=0 -- self.set_icmd(1) -- self.DeclareOut('cc',self.sd) -- cc=OP13(MATR=MATR) -- return ier --OP17=MACRO(nom='OP17',op=OP17_ops,sd_prod=op6_prod, MATR=SIMP(statut='o',typ=CO),) -- --def OP18_ops(self,MATR,**args): -- ier=0 -- self.set_icmd(1) -- self.DeclareOut('cc',self.sd) -- cc=OP6(MATR=MATR) -- dd=OP2(MATR=MATR) -- ee=OP11(MATR=MATR) -- return ier --OP18=MACRO(nom='OP18',op=OP18_ops,sd_prod=op6_prod, MATR=SIMP(statut='o',typ=CO),) --OP20=MACRO(nom='OP20',op=OP_ops,sd_prod=op6_prod, MATR=SIMP(statut='o',typ=CO), -- MATRB=SIMP(statut='o',typ=CO),) --def OP19_ops(self,MATR,**args): -- ier=0 -- self.set_icmd(1) -- self.DeclareOut('cc',self.sd) -- cc=OP20(MATR=MATR,MATRB=MATR) -- return ier --OP19=MACRO(nom='OP19',op=OP19_ops,sd_prod=op6_prod, MATR=SIMP(statut='o',typ=CO),) -- --OP21=OPER(nom='OP21',op=1,sd_prod=concept) --def OP22_ops(self,MATR,**args): -- ier=0 -- self.set_icmd(1) -- self.DeclareOut('cc',self.sd) -- cc=OP21() -- return ier --OP22=MACRO(nom='OP22',op=OP22_ops,sd_prod=op6_prod, MATR=SIMP(statut='o',typ=CO),) -- --import pickle --import Accas -- --def poursuite_sdprod(self,PAR_LOT): -- j=self.jdc -- #j.UserError=j.codex.error -- j.actif_status=1 -- j.fico=None - j.set_par_lot(PAR_LOT) - j.set_parLot(PAR_LOT) -- if hasattr(self,'already_init'):return -- self.already_init=None -- context={} -- try: -- file=open("pick.1",'r') -- # Le contexte sauvegardé a été picklé en une seule fois. Il est seulement -- # possible de le récupérer en bloc. Si cette opération echoue, on ne récupère -- # aucun objet. -- context=pickle.load(file) -- file.close() -- except: -- # En cas d'erreur on ignore le contenu du fichier -- import traceback -- traceback.print_exc() -- pass -- for k,v in context.items(): -- if isinstance(v,Accas.ASSD): -- self.parent.NommerSdprod(v,k) -- self.g_context.update(context) -- return None -- --def poursuite(self,PAR_LOT): -- ier=0 -- self.set_icmd(1) -- return ier -- --POURSUITE=MACRO(nom='POURSUITE',op=poursuite,sd_prod=poursuite_sdprod,PAR_LOT=SIMP(typ='TXM',defaut='OUI')) -- --def fin(self): -- self.set_icmd(1) -- raise EOFError --FIN=MACRO(nom='FIN',op=fin,sd_prod=None) -- --def debut_sdprod(self,PAR_LOT): -- j=self.jdc -- #j.UserError=j.codex.error -- j.actif_status=1 -- j.fico=None - j.set_par_lot(PAR_LOT) - j.set_parLot(PAR_LOT) -- return None -- --def debut(self,PAR_LOT): -- ier=0 -- self.set_icmd(1) -- return ier -- --DEBUT=MACRO(nom='DEBUT',op=debut,sd_prod=debut_sdprod,PAR_LOT=SIMP(typ='TXM',defaut='OUI')) -- --class entier (ASSD): -- def __init__(self,valeur=None,**args): -- ASSD.__init__(self,**args) -- self.valeur=valeur -- -- def __adapt__(self,validator): -- if validator.name == "list": -- #validateur liste,cardinalité -- return (self,) -- elif validator.name == "type": -- #validateur type -- return validator.adapt(self.valeur or 0) -- else: -- #validateur into et valid -- return self -- -- def __repr__(self): -- return "" -- diff --cc Tests/testelem/params.comm index 46966b0c,46966b0c..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/params.comm +++ /dev/null @@@ -1,43 -1,43 +1,0 @@@ -- --DEBUT(); --a = 1.0; -- --b = 3; -- --c = 15; -- --d = 5; -- --x = (1, 2); -- --y = [3, 4]; -- --y2 = (y * 2); -- --z = 'a'; -- --zz = 'v'; -- --t = a; -- --v = """aaaa --bbbb"""; -- --xx = ceil(sqrt(d)); -- --yy = cos(3.1); -- --ax = sin(2); -- --bx = cos(xx); -- --cx = sin(xx); -- --zy = y[1]; -- -- --MA=LIRE_MAILLAGE(); -- --MB=LIRE_MAILLAGE(); -- --FIN(); diff --cc Tests/testelem/testaz76.py index c23919a3,13dc618a..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testaz76.py +++ /dev/null @@@ -1,399 -1,399 +1,0 @@@ --# coding=utf-8 -- --import os --import unittest --import difflib --import compare -- --import prefs --from InterfaceTK import appli -- --def add_param(j,pos,nom,valeur): - co=j.addentite("PARAMETRE",pos) - co.set_nom(nom) - co=j.addEntite("PARAMETRE",pos) - co.setNom(nom) -- co.set_valeur(valeur) -- return co -- --def add_mcsimp(obj,nom,valeur): - mcs=obj.get_child(nom,restreint='oui') - mcs=obj.getChild(nom,restreint='oui') -- if mcs is None: - pos=obj.get_index_child(nom) - mcs=obj.addentite(nom,pos) - mcs.set_valeur(mcs.eval_val(valeur)) - pos=obj.getIndexChild(nom) - mcs=obj.addEntite(nom,pos) - mcs.set_valeur(mcs.evalVal(valeur)) -- return mcs -- --def cdiff(text1,text2): -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- --class TestCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- -- def test000(self): -- """ Test de construction du fichier de commandes az.comm de zero""" -- -- app=appli.STANDALONE(version='v9') -- j=app.newJDC() --# commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) --# commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) --# parametres -- pos=0 -- pos=pos+1 -- co=add_param(j,pos,"P1","9.8") -- pos=pos+1 -- co=add_param(j,pos,"P2","8.8") -- pos=pos+1 -- co=add_param(j,pos,"P3","7") -- pos=pos+1 -- co=add_param(j,pos,"P5","P3*P1") -- pos=pos+1 -- co=add_param(j,pos,"P6","P1-3") -- pos=pos+1 -- co=add_param(j,pos,"P4","[2,3,4]") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur("Pas trouve shellpanel") --# commande LIRE_MAILLAGE -- pos=pos+1 - co=j.addentite("LIRE_MAILLAGE",pos) - test,mess=co.nomme_sd("MAILLA2") - mcs=co.addentite("UNITE") - valeur=mcs.eval_val("P4[1]") - co=j.addEntite("LIRE_MAILLAGE",pos) - test,mess=co.nommeSd("MAILLA2") - mcs=co.addEntite("UNITE") - valeur=mcs.evalVal("P4[1]") -- test=mcs.set_valeur(valeur) --# formule -- pos=pos+1 - co=j.addentite("FORMULE",pos) - co.update_formule_python(("aaa","REEL","a+z","(a,z)")) - co=j.addEntite("FORMULE",pos) - co.updateFormulePython(("aaa","REEL","a+z","(a,z)")) --# commande LIRE_MAILLAGE -- pos=pos+1 - ma=co=j.addentite("LIRE_MAILLAGE",pos) - test,mess=co.nomme_sd("MAIL") - mcs=co.addentite("UNITE") - valeur,validite=mcs.eval_valeur("P3") - ma=co=j.addEntite("LIRE_MAILLAGE",pos) - test,mess=co.nommeSd("MAIL") - mcs=co.addEntite("UNITE") - valeur,validite=mcs.evalValeur("P3") -- test=mcs.set_valeur(valeur) --# -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'LIRE_MAILLAGE', 'UNITE' --> uniquebasepanel") --# formule -- pos=pos+1 - co=j.addentite("FORMULE",pos) - co.update_formule_python(("az","REEL","aaaaa","(ae,inst)")) - co=j.addEntite("FORMULE",pos) - co.updateFormulePython(("az","REEL","aaaaa","(ae,inst)")) --# commande AFFE_MODELE -- pos=pos+1 - co=j.addentite("AFFE_MODELE",pos) - mcs=co.get_child("MAILLAGE") - valeur,validite=mcs.eval_valeur("MAIL") - co=j.addEntite("AFFE_MODELE",pos) - mcs=co.getChild("MAILLAGE") - valeur,validite=mcs.evalValeur("MAIL") -- assert valeur == ma.sd -- test=mcs.set_valeur(valeur) -- assert valeur == co["MAILLAGE"] - mcf=co.addentite("AFFE") - mcs=mcf[0].get_child("PHENOMENE") - valeur=mcs.eval_val_item('MECANIQUE') - mcf=co.addEntite("AFFE") - mcs=mcf[0].getChild("PHENOMENE") - valeur=mcs.evalValItem('MECANIQUE') -- assert valeur=='MECANIQUE',str(valeur) -- test=mcs.set_valeur(valeur) -- assert mcf["PHENOMENE"] == 'MECANIQUE' - mcs=mcf[0].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcs=mcf[0].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- assert mcf["MODELISATION"] == 'DIS_T' -- mcs=add_mcsimp(mcf[0],"GROUP_MA",('RESSORT','eee',)) -- - mcf=co.addentite("AFFE") - mcs=mcf[1].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('MECANIQUE')) - mcs=mcf[1].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcf=co.addEntite("AFFE") - mcs=mcf[1].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('MECANIQUE')) - mcs=mcf[1].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- mcs=add_mcsimp(mcf[1],"GROUP_MA",'MASSES') -- - mcf=co.addentite("AFFE") - mcs=mcf[2].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('ACOUSTIQUE')) - mcs=mcf[2].get_child("b_acoustique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('PLAN')) - mcf=co.addEntite("AFFE") - mcs=mcf[2].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('ACOUSTIQUE')) - mcs=mcf[2].getChild("b_acoustique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('PLAN')) -- #mcs=add_mcsimp(mcf[2],"GROUP_NO",'GNP3,GNP5,GNP6,GNP7,GNP8,GNP9,GNP10,GNP11,GNP12') -- mcs=add_mcsimp(mcf[2],"GROUP_NO","'GNP3','GNP5','GNP6','GNP7','GNP8','GNP9','GNP10','GNP11','GNP12'") -- - co.nomme_sd("AFFE1") - co.nommeSd("AFFE1") --# commande AFFE_MODELE -- pos=pos+1 - co=j.addentite("AFFE_MODELE",pos) - mcs=co.get_child("MAILLAGE") - mcs.set_valeur(mcs.eval_val("MAIL")) - co=j.addEntite("AFFE_MODELE",pos) - mcs=co.getChild("MAILLAGE") - mcs.set_valeur(mcs.evalVal("MAIL")) -- - mcf=co.addentite("AFFE") - mcs=mcf[0].get_child("PHENOMENE") - valeur=mcs.eval_val_item('MECANIQUE') - mcf=co.addEntite("AFFE") - mcs=mcf[0].getChild("PHENOMENE") - valeur=mcs.evalValItem('MECANIQUE') -- test=mcs.set_valeur(valeur) - mcs=mcf[0].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcs=mcf[0].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- mcs=add_mcsimp(mcf[0],"GROUP_MA",'RESSORT') -- - mcf=co.addentite("AFFE") - mcs=mcf[1].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('MECANIQUE')) - mcs=mcf[1].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcf=co.addEntite("AFFE") - mcs=mcf[1].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('MECANIQUE')) - mcs=mcf[1].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- mcs=add_mcsimp(mcf[1],"GROUP_MA",'MASSES') -- - mcf=co.addentite("AFFE") - mcs=mcf[2].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('THERMIQUE')) - mcs=mcf[2].get_child("b_thermique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('COQUE')) - mcf=co.addEntite("AFFE") - mcs=mcf[2].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('THERMIQUE')) - mcs=mcf[2].getChild("b_thermique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('COQUE')) -- mcs=add_mcsimp(mcf[2],"TOUT",'OUI') -- - co.nomme_sd("MOD") - co.nommeSd("MOD") --#CARA=AFFE_CARA_ELEM(MODELE=MOD, --# POUTRE=_F(GROUP_MA='MA', --# SECTION='CERCLE', --# CARA='R', --# VALE=(3.0,P6,),),); -- pos=pos+1 - co=j.addentite("AFFE_CARA_ELEM",pos) - mcs=co.get_child("MODELE") - mcs.set_valeur(mcs.eval_val("MOD")) - mcf=co.addentite("POUTRE") - mcs=mcf[0].get_child("SECTION") - mcs.set_valeur(mcs.eval_val('CERCLE')) - co=j.addEntite("AFFE_CARA_ELEM",pos) - mcs=co.getChild("MODELE") - mcs.set_valeur(mcs.evalVal("MOD")) - mcf=co.addEntite("POUTRE") - mcs=mcf[0].getChild("SECTION") - mcs.set_valeur(mcs.evalVal('CERCLE')) -- assert mcf[0]["SECTION"] == 'CERCLE' -- mcs=add_mcsimp(mcf[0],"GROUP_MA",'MA') - mcs=mcf[0].get_child("b_cercle").get_child("b_constant").get_child("CARA") - mcs.set_valeur(mcs.eval_val('R')) - mcs=mcf[0].get_child("b_cercle").get_child("b_constant").get_child("VALE") - mcs.set_valeur(mcs.eval_val('3.0,P6')) - co.nomme_sd("CARA") - mcs=mcf[0].getChild("b_cercle").getChild("b_constant").getChild("CARA") - mcs.set_valeur(mcs.evalVal('R')) - mcs=mcf[0].getChild("b_cercle").getChild("b_constant").getChild("VALE") - mcs.set_valeur(mcs.evalVal('3.0,P6')) - co.nommeSd("CARA") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- text=""" 'AFFE_MODELE', 'MAILLAGE' --> uniqueassdpanel -- AFFE_MODELE', 'AFFE', 'GROUP_MA' --> plusieursbasepanel -- 'AFFE_MODELE', 'AFFE', 'PHENOMENE' --> uniqueintopanel -- 'AFFE_MODELE', 'AFFE', 'b_mecanique'--> plusieursintopanel""" -- co.set_valeur(text) --#F1=DEFI_FONCTION(NOM_PARA='DX', --# VALE=(5.0,3.0,P4[1],P3,),); -- pos=pos+1 - co=j.addentite("DEFI_FONCTION",pos) - mcs=co.get_child("NOM_PARA") - mcs.set_valeur(mcs.eval_val("DX")) - mcs=co.addentite("VALE") - mcs.set_valeur(mcs.eval_val("5.0,3.0,P4[1],P3")) - co.nomme_sd("F1") - co=j.addEntite("DEFI_FONCTION",pos) - mcs=co.getChild("NOM_PARA") - mcs.set_valeur(mcs.evalVal("DX")) - mcs=co.addEntite("VALE") - mcs.set_valeur(mcs.evalVal("5.0,3.0,P4[1],P3")) - co.nommeSd("F1") --#F3=DEFI_FONCTION(NOM_PARA='DRX', --# VALE_C=(5.0,7.0,9.0,9.0,8.0,7.0,),); -- pos=pos+1 - co=j.addentite("DEFI_FONCTION",pos) - mcs=co.get_child("NOM_PARA") - mcs.set_valeur(mcs.eval_val("DRX")) - mcs=co.addentite("VALE_C") - mcs.set_valeur(mcs.eval_val("5.0,7.0,9.0,9.0,8.0,7.0")) - co.nomme_sd("F3") - co=j.addEntite("DEFI_FONCTION",pos) - mcs=co.getChild("NOM_PARA") - mcs.set_valeur(mcs.evalVal("DRX")) - mcs=co.addEntite("VALE_C") - mcs.set_valeur(mcs.evalVal("5.0,7.0,9.0,9.0,8.0,7.0")) - co.nommeSd("F3") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'DEFI_FONCTION', 'VALE' --> fonctionpanel ") --#MATER2=DEFI_MATERIAU(ELAS=_F(E=100000000000.0, --# NU=0.0,), --# ECRO_ASYM_LINE=_F(DC_SIGM_EPSI=0.0, --# SY_C=200000000.0, --# DT_SIGM_EPSI=0.0, --# SY_T=50000000.0,),); -- pos=pos+1 - co=j.addentite("DEFI_MATERIAU",pos) - mcf=co.addentite("ELAS") - mcs=mcf[0].get_child("E") - mcs.set_valeur(mcs.eval_val("100000000000.0")) - mcs=mcf[0].get_child("NU") - mcs.set_valeur(mcs.eval_val("0.0")) - mcf=co.addentite("ECRO_ASYM_LINE") - mcs=mcf[0].get_child("DC_SIGM_EPSI") - mcs.set_valeur(mcs.eval_val("0.0")) - mcs=mcf[0].get_child("DT_SIGM_EPSI") - mcs.set_valeur(mcs.eval_val("0.0")) - mcs=mcf[0].get_child("SY_C") - mcs.set_valeur(mcs.eval_val("200000000.0")) - mcs=mcf[0].get_child("SY_T") - mcs.set_valeur(mcs.eval_val("50000000.0")) - co.nomme_sd("MATER2") - co=j.addEntite("DEFI_MATERIAU",pos) - mcf=co.addEntite("ELAS") - mcs=mcf[0].getChild("E") - mcs.set_valeur(mcs.evalVal("100000000000.0")) - mcs=mcf[0].getChild("NU") - mcs.set_valeur(mcs.evalVal("0.0")) - mcf=co.addEntite("ECRO_ASYM_LINE") - mcs=mcf[0].getChild("DC_SIGM_EPSI") - mcs.set_valeur(mcs.evalVal("0.0")) - mcs=mcf[0].getChild("DT_SIGM_EPSI") - mcs.set_valeur(mcs.evalVal("0.0")) - mcs=mcf[0].getChild("SY_C") - mcs.set_valeur(mcs.evalVal("200000000.0")) - mcs=mcf[0].getChild("SY_T") - mcs.set_valeur(mcs.evalVal("50000000.0")) - co.nommeSd("MATER2") --#PS1=DEFI_PARA_SENSI(VALE=1.0,); --#PS2=DEFI_PARA_SENSI(VALE=1.0,); --#PS3=DEFI_PARA_SENSI(VALE=1.0,); -- pos=pos+1 - co=j.addentite("DEFI_PARA_SENSI",pos) - mcs=co.get_child("VALE") - mcs.set_valeur(mcs.eval_val("1.0")) - co.nomme_sd("PS1") - co=j.addEntite("DEFI_PARA_SENSI",pos) - mcs=co.getChild("VALE") - mcs.set_valeur(mcs.evalVal("1.0")) - co.nommeSd("PS1") -- pos=pos+1 - co=j.addentite("DEFI_PARA_SENSI",pos) - mcs=co.get_child("VALE") - mcs.set_valeur(mcs.eval_val("1.0")) - co.nomme_sd("PS2") - co=j.addEntite("DEFI_PARA_SENSI",pos) - mcs=co.getChild("VALE") - mcs.set_valeur(mcs.evalVal("1.0")) - co.nommeSd("PS2") -- pos=pos+1 - co=j.addentite("DEFI_PARA_SENSI",pos) - mcs=co.get_child("VALE") - mcs.set_valeur(mcs.eval_val("1.0")) - co.nomme_sd("PS3") - co=j.addEntite("DEFI_PARA_SENSI",pos) - mcs=co.getChild("VALE") - mcs.set_valeur(mcs.evalVal("1.0")) - co.nommeSd("PS3") --#CHMAT2=AFFE_MATERIAU(MAILLAGE=MAIL, --# AFFE=_F(TOUT='OUI', --# MATER=MATER2,),); -- pos=pos+1 - co=j.addentite("AFFE_MATERIAU",pos) - co=j.addEntite("AFFE_MATERIAU",pos) -- add_mcsimp(co,"MAILLAGE","MAIL") - mcf=co.get_child("AFFE") - mcf=co.getChild("AFFE") -- add_mcsimp(mcf[0],"TOUT","OUI") -- add_mcsimp(mcf[0],"MATER","MATER2") - co.nomme_sd("CHMAT2") - co.nommeSd("CHMAT2") --#AAAZ=AFFE_CHAR_THER(MODELE=AFFE1, --# TEMP_IMPO=_F(TOUT='OUI', --# TEMP=0.0,),); -- pos=pos+1 - co=j.addentite("AFFE_CHAR_THER",pos) - co=j.addEntite("AFFE_CHAR_THER",pos) -- add_mcsimp(co,"MODELE","AFFE1") - mcf=co.addentite("TEMP_IMPO") - mcf=co.addEntite("TEMP_IMPO") -- add_mcsimp(mcf[0],"TOUT","OUI") -- add_mcsimp(mcf[0],"TEMP","0.0") - co.nomme_sd("AAAZ") - co.nommeSd("AAAZ") --#TH1=THER_LINEAIRE(MODELE=AFFE1, --# CHAM_MATER=CHMAT2, --# EXCIT=_F(CHARGE=AAAZ,), --# SENSIBILITE=(PS1,PS2,),); -- pos=pos+1 - co=j.addentite("THER_LINEAIRE",pos) - co=j.addEntite("THER_LINEAIRE",pos) -- add_mcsimp(co,"MODELE","AFFE1") -- add_mcsimp(co,"CHAM_MATER","CHMAT2") - mcf=co.get_child("EXCIT") - mcf=co.getChild("EXCIT") -- add_mcsimp(mcf[0],"CHARGE","AAAZ") -- add_mcsimp(co,"SENSIBILITE","PS1,PS2") - co.nomme_sd("TH1") - co.nommeSd("TH1") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'THER_LINEAIRE', 'SENSIBILITE' --> plusieursassdpanel") --#ACA1=AFFE_CHAR_ACOU(MODELE=AFFE1, --# PRES_IMPO=_F(TOUT='OUI', --# PRES=('RI',3.0,3.0,),),); -- pos=pos+1 - co=j.addentite("AFFE_CHAR_ACOU",pos) - co=j.addEntite("AFFE_CHAR_ACOU",pos) -- add_mcsimp(co,"MODELE","AFFE1") - mcf=co.addentite("PRES_IMPO") - mcf=co.addEntite("PRES_IMPO") -- add_mcsimp(mcf[0],"TOUT","OUI") -- add_mcsimp(mcf[0],"PRES","'RI',3.0,3.0") - co.nomme_sd("ACA1") - co.nommeSd("ACA1") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'AFFE_CHAR_ACOU', 'PRES_IMPO', 'PRES' --> uniquecomppanel") -- --# 'AFFE_CHAR_ACOU', 'PRES_IMPO', 'PRES' --> uniquecomppanel -- --#MACRO_MATR_ASSE(MODELE=AFFE1, --# NUME_DDL=CO('DDL1'), --# MATR_ASSE=_F(MATRICE=CO('MAT1'), --# OPTION='RIGI_THER',),); -- pos=pos+1 - co=j.addentite("MACRO_MATR_ASSE",pos) - co=j.addEntite("MACRO_MATR_ASSE",pos) -- add_mcsimp(co,"MODELE","AFFE1") - mcs=co.get_child("NUME_DDL") - mcs=co.getChild("NUME_DDL") -- mcs.set_valeur_co('DDL1') - mcf=co.get_child("MATR_ASSE") - mcf=co.getChild("MATR_ASSE") -- add_mcsimp(mcf[0],"OPTION","RIGI_THER") - mcs=mcf[0].get_child("MATRICE") - mcs=mcf[0].getChild("MATRICE") -- mcs.set_valeur_co('MAT1') --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'MACRO_MATR_ASSE', 'MATR_ASSE', 'MATRICE' --> uniquesdcopanel") -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- - text1=app.get_text_JDC(j,'python') - text1=app.getTextJDC(j,'python') -- file=os.path.join(prefs.INSTALLDIR,"Tests/testelem/az.comm") -- f=open(file) -- text2=f.read() -- f.close() -- assert text1 == text2 , cdiff(text1,text2) -- -- def test001(self): -- """ Test de construction d'un fichier de commandes avec DEFI_LIST_REEL, fonction et parametre de zero""" -- -- app=appli.STANDALONE(version='v9') -- j=app.newJDC() --# commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) --# commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) --#parametre -- pos=0 -- pos=pos+1 -- co=add_param(j,pos,"P1","9.8") -- pos=pos+1 -- co=add_param(j,pos,"P2","sin(P1)") --# formule -- pos=pos+1 - co=j.addentite("FORMULE",pos) - co.update_formule_python(("aaa","REEL","a+z","(a,z)")) - co=j.addEntite("FORMULE",pos) - co.updateFormulePython(("aaa","REEL","a+z","(a,z)")) --#parametre de formule -- pos=pos+1 -- co=add_param(j,pos,"P3","aaa(P1,2.)") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","1.,2.,3.") - co.nomme_sd("LI1") - co.nommeSd("LI1") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","sin(1.)") - co.nomme_sd("LI2") - co.nommeSd("LI2") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","aaa(1.,2.)") - co.nomme_sd("LI3") - co.nommeSd("LI3") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","sin(1.,2)") - co.nomme_sd("LI4") - co.nommeSd("LI4") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","aaa(1.)") - co.nomme_sd("LI5") - co.nommeSd("LI5") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","1,sin(1.),2") - co.nomme_sd("LI6") - co.nommeSd("LI6") -- -- expected="""DEBUT CR validation : SansNom -- Etape : DEFI_LIST_REEL ligne : ... -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Concept retourné non défini ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Mot-clé simple : VALE -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 'sin(1.,2)' (de type ) n'est pas d'un type autorisé: ('R',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : VALE -- Fin Etape : DEFI_LIST_REEL -- Etape : DEFI_LIST_REEL ligne : ... -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Concept retourné non défini ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Mot-clé simple : VALE -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 'aaa(1.)' (de type ) n'est pas d'un type autorisé: ('R',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : VALE -- Fin Etape : DEFI_LIST_REEL --FIN CR validation :SansNom --""" -- msg=str( j.report()) -- assert compare.check(expected,msg),cdiff(expected,msg) diff --cc Tests/testelem/testbloc1.py index f8bb6902,f0e612a2..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testbloc1.py +++ /dev/null @@@ -1,176 -1,176 +1,0 @@@ --# coding=utf-8 --from Accas import SIMP,FACT,BLOC,UN_PARMI,OPER,ASSD,MACRO,_F --import Noyau -- --class concept(ASSD,Noyau.AsBase):pass -- --import unittest -- --class CATA: -- def __init__(self): - CONTEXT.unset_current_cata() - CONTEXT.set_current_cata(self) - CONTEXT.unsetCurrentCata() - CONTEXT.setCurrentCata(self) -- def enregistre(self,cmd): -- pass -- --cata=CATA() -- -- --OP1 = OPER(nom='OP1',op=1, sd_prod=concept, -- WWWW=SIMP(statut='o',typ='TXM', position='global'), -- XXXX=SIMP(typ='TXM', position='global',defaut='XXXX'), -- traitement=FACT(statut='o', -- TATA=SIMP(typ='TXM', position='global',defaut='DDD'), -- TTTT=SIMP(statut='o',typ='TXM', position='global',defaut='EEE'), -- UUUU=SIMP(typ='TXM', position='global'), -- VVVV=SIMP(statut='o',typ='TXM', position='global'), -- regles=( UN_PARMI('TYPE_RAFFINEMENT_LIBRE','TYPE_RAFFINEMENT_UNIFORME'),), -- TYPE_RAFFINEMENT_LIBRE = FACT(statut='f', -- RAFFINEMENT = SIMP(statut='o',typ='TXM', position='global', -- into=("LIBRE","UNIFORME",) ), -- DERAFFINEMENT = SIMP(statut='o',typ='TXM', position='global', -- into=("LIBRE",),), -- TOTO=SIMP(statut='o',typ='TXM', position='global'), -- # un mot cle global facultatif ne sera pas visible tant -- # qu'il n'aura pas de valeur meme s'il a un defaut -- TITI=SIMP(typ='TXM', position='global',defaut='BBB'), -- TUTU=SIMP(statut='o',typ='TXM', position='global',defaut='CCC'), -- ), -- b_maj_champ =BLOC(condition="(RAFFINEMENT!=None) or (DERAFFINEMENT!=None)", -- NITER =SIMP(statut='o',typ='I',), -- NOM_MED_MAILLAGE_NP1 =SIMP(statut='o',typ='TXM',), -- FICHIER_MED_MAILLAGE_NP1 =SIMP(statut='o',typ='TXM',), -- ), -- ), -- trait=FACT(statut='o', -- FFFF=SIMP(typ='TXM',), -- b_champ =BLOC(condition="WWWW=='WWWW'", -- N =SIMP(statut='o',typ='I',), -- ), -- ), --) -- --MACR_BIDON=OPER(nom="MACR_BIDON",op=None,sd_prod=concept, -- reentrant='n',UIinfo={"groupes":("Outils métier",)},fr="", -- NOM_CHAM=SIMP(statut='f',typ='TXM',into=('ACCE','DEPL'),position="global"), -- RESULTAT=FACT(statut='o',b_acce=BLOC(condition="NOM_CHAM=='ACCE'", -- VAL1=SIMP(statut='o',typ='R'), -- ), -- VAL2=SIMP(statut='o',typ='R'), -- ), -- ) --import pprint -- --class TestMCBlocCase(unittest.TestCase): -- -- def test001(self): -- """ bloc conditionnel declenche par mot cle global avec defaut -- """ -- mcf={'TYPE_RAFFINEMENT_LIBRE':{'TOTO':'AAA'}} -- co=OP1(traitement=mcf,WWWW='WWWW') -- mcfact=co.etape['traitement'] -- self.assertEqual(mcfact['TYPE_RAFFINEMENT_LIBRE']['DERAFFINEMENT'] , None) - dico=mcfact[0].cree_dict_valeurs(mcfact[0].mc_liste) - dico=mcfact[0].creeDictValeurs(mcfact[0].mc_liste) -- self.assertEqual(dico['DERAFFINEMENT'] , None) -- self.assertEqual(dico['RAFFINEMENT'] , None) -- self.assertEqual(dico['WWWW'] , 'WWWW') -- self.assertRaises(IndexError, mcfact.__getitem__, 'NITER') -- -- mcfact=co.etape['trait'][0] - dico=mcfact.cree_dict_valeurs(mcfact.mc_liste) - dico=mcfact.creeDictValeurs(mcfact.mc_liste) -- self.assertEqual(dico['DERAFFINEMENT'] , None) -- self.assertEqual(dico['RAFFINEMENT'] , None) -- self.assertEqual(dico['WWWW'] , 'WWWW') -- self.assertEqual(dico['TOTO'] , 'AAA') -- self.assertEqual(dico['TUTU'] , 'CCC') -- self.assertEqual(dico['FFFF'] , None) -- self.assertEqual(dico['VVVV'] , None) -- self.assertEqual(dico['TTTT'] , 'EEE') -- self.assertEqual(dico['XXXX'] , 'XXXX') -- self.assertEqual(mcfact['N'] , None) -- self.assertRaises(KeyError, dico.__getitem__, 'TITI') -- -- def test002(self): -- mcf={'TYPE_RAFFINEMENT_LIBRE':{'RAFFINEMENT':'LIBRE'},'NITER':1} -- co=OP1(traitement=mcf) -- mcfact=co.etape['traitement'] -- self.assertEqual(mcfact['TYPE_RAFFINEMENT_LIBRE']['RAFFINEMENT'] , 'LIBRE') -- self.assertEqual(mcfact['NITER'] , 1) -- -- def test003(self): -- co=MACR_BIDON(NOM_CHAM='ACCE',RESULTAT=_F(VAL2=3.4)) -- mcfact=co.etape['RESULTAT'] - self.assertEqual(co.etape.isvalid(), 0) - self.assertEqual(co.etape.isValid(), 0) -- -- def test004(self): -- mcf={'VVVV':'', -- 'TYPE_RAFFINEMENT_LIBRE':{'RAFFINEMENT':'LIBRE','DERAFFINEMENT':'LIBRE','TOTO':'AA'}, -- 'NITER':1, -- 'FICHIER_MED_MAILLAGE_NP1':'', -- 'NOM_MED_MAILLAGE_NP1':'', -- } -- co=OP1(traitement=mcf,WWWW="WWWW",trait={'N':1}) - val=co.etape.isvalid() - val=co.etape.isValid() -- if not val:msg=co.etape.report() -- else:msg="" - self.assertEqual(co.etape.isvalid() , 1,msg=msg) - self.assertEqual(co.etape.isValid() , 1,msg=msg) -- -- co=OP1(traitement=mcf,WWWW="WWWW") - val=co.etape.isvalid() - val=co.etape.isValid() -- if not val:msg=co.etape.report() -- else:msg="" - self.assertEqual(co.etape.isvalid() , 0,msg=msg) - self.assertEqual(co.etape.isValid() , 0,msg=msg) -- -- co=OP1(traitement=mcf,WWWW="WW",trait={'N':1}) - val=co.etape.isvalid() - val=co.etape.isValid() -- if not val:msg=co.etape.report() -- else:msg="" - self.assertEqual(co.etape.isvalid() , 0,msg=msg) - self.assertEqual(co.etape.isValid() , 0,msg=msg) -- -- co=OP1(traitement=mcf,WWWW="WW",trait={'FFFF':'X'}) - val=co.etape.isvalid() - val=co.etape.isValid() -- if not val:msg=co.etape.report() -- else:msg="" - self.assertEqual(co.etape.isvalid() , 1,msg=msg) - self.assertEqual(co.etape.isValid() , 1,msg=msg) -- -- co=OP1(traitement=mcf,WWWW="WW",) - val=co.etape.isvalid() - val=co.etape.isValid() -- if not val:msg=co.etape.report() -- else:msg="" - self.assertEqual(co.etape.isvalid() , 1,msg=msg) - self.assertEqual(co.etape.isValid() , 1,msg=msg) -- -- def test005(self): -- OP1 = OPER(nom='OP1',op=1, sd_prod=concept, -- MASS = FACT(statut='f',max='**', -- Y = SIMP(statut='f',typ='I',), -- Z = FACT(T=SIMP(typ='I')), -- ), -- b_mass = BLOC(condition = "MASS != None", -- MODE = SIMP(statut='o',typ='I',) -- ), -- bb_mass = BLOC(condition = "MASS and len(MASS) > 1 ", -- XX = SIMP(statut='o',typ='I',) -- ), -- bbb_mass = BLOC(condition = "MASS and MASS[0]['Y'] == 1 ", -- YY = SIMP(statut='o',typ='I',) -- ), -- bbbb_mass = BLOC(condition = "MASS and MASS[0]['Z'] and MASS[0]['Z'][0]['T'] == 1 ", -- ZZ = SIMP(statut='o',typ='I',) -- ), -- ) -- co=OP1() -- msg=co.etape.report() - self.assertEqual(co.etape.isvalid() , 1,msg=msg) - self.assertEqual(co.etape.isValid() , 1,msg=msg) -- co=OP1(MASS={},MODE=1) -- msg=co.etape.report() - self.assertEqual(co.etape.isvalid() , 1,msg=msg) - self.assertEqual(co.etape.isValid() , 1,msg=msg) -- co=OP1(MASS=({},{}),MODE=1,XX=1) -- msg=co.etape.report() - self.assertEqual(co.etape.isvalid() , 1,msg=msg) - self.assertEqual(co.etape.isValid() , 1,msg=msg) -- co=OP1(MASS=({'Y':1},{}),MODE=1,XX=1,YY=1) -- msg=co.etape.report() - self.assertEqual(co.etape.isvalid() , 1,msg=msg) - self.assertEqual(co.etape.isValid() , 1,msg=msg) -- co=OP1(MASS=({'Y':1,'Z':{'T':1}},{}),MODE=1,XX=1,YY=1,ZZ=1) -- msg=co.etape.report() - self.assertEqual(co.etape.isvalid() , 1,msg=msg) - self.assertEqual(co.etape.isValid() , 1,msg=msg) -- diff --cc Tests/testelem/testfact1.py index c5d4cb1d,c13fa530..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testfact1.py +++ /dev/null @@@ -1,97 -1,97 +1,0 @@@ --# coding=utf-8 --from Accas import SIMP,FACT -- --import unittest -- --class TestFactCase(unittest.TestCase): -- def setUp(self): -- self.cata=FACT(a=SIMP(typ='I',statut='o'), -- b=SIMP(typ='R'), -- c=SIMP(typ='C',defaut=('RI',1,0)), -- ) -- -- def tearDown(self): -- del self.cata -- -- def testStatut1(self): -- o=self.cata({'a':1},'mcs1',None) -- cr=o.report() -- self.assert_(cr.estvide()) -- -- def testStatut2(self): -- o=self.cata(None,'mcs1',None) -- cr=o.report() -- expected_cr="""Mot cle Facteur :mcs1 -- Mot-clé simple : a -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé : a obligatoire non valorisé ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! None n'est pas une valeur autorisée ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : a --Fin Mot cle Facteur :mcs1 --""" -- self.assertEqual(str(cr) , expected_cr) -- -- def testType1(self): -- """Verification de type""" -- #Ne leve plus d'exception -- #self.assertRaises(AttributeError,self.cata,1,'mcs1',None) -- o=self.cata({'a':1.2},'mcs1',None) -- cr=o.report() -- expected_cr="""Mot cle Facteur :mcs1 -- Mot-clé simple : a -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 1.2 (de type ) n'est pas d'un type autorisé: ('I',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : a --Fin Mot cle Facteur :mcs1 --""" -- msg="le rapport d'erreur est incorrect.\n expected =\n%s\n got =\n%s " % (expected_cr,str(cr)) -- self.assertEqual(str(cr) , expected_cr,msg=msg) -- -- def test031(self): -- cata=FACT(min=2,max=3,a=SIMP(typ='I',statut='o'),) -- -- liste=( -- (({'a':1},{'a':2}),1), -- (({'a':1},{'a':2},{'a':3},{'a':4}),0), -- (({'a':1},{'a':2},{'a':3}),1), -- (({'a':1},),0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcf',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) -- -- def test032(self): -- cata=FACT(max=3,a=SIMP(typ='I',statut='o'),) -- mcfact=cata({'a':1},'mcf',None) - self.assertEqual(mcfact[0].get_mocle('a') , 1) - self.assertEqual(mcfact[0].getMocle('a') , 1) -- self.assertEqual(mcfact['a'] , 1) -- -- mcfact=cata(({'a':1},{'a':2}),'mcf',None) -- self.assertEqual(mcfact[0]['a'] , 1) -- self.assertEqual(mcfact[1]['a'] , 2) -- self.assertRaises(TypeError,mcfact.__getitem__, 'a') -- def f(): -- return mcfact['a'] -- self.assertRaises(TypeError,f) -- -- def test033(self): -- cata=FACT(xx=FACT(statut='o',max=3,a=SIMP(typ='I'),)) -- mcfact=cata({},'mcf',None) -- valid=0 -- liste=( -- ({},1), -- ({'xx':{}},1), -- ({'xx':{'a':1}},1), -- ({'xx':"error"},0), -- ({'xx':("error","err2","err3")},0), -- ({'xx':({'a':1},"err2","err3")},0), -- ({'xx':("err1",{'a':1},"err3")},0), -- ({'xx':("err1",{'a':1},"err3","err4")},0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcf',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) diff --cc Tests/testelem/testfact2.py index 5dce9897,ab5956a6..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testfact2.py +++ /dev/null @@@ -1,158 -1,158 +1,0 @@@ --from Accas import SIMP,FACT,BLOC -- --import unittest -- -- --class TestFactCase(unittest.TestCase): -- -- def test001(self): -- """ -- Cas test avec un bloc conditionnel active par un mot cle simple avec -- valeur par defaut, non present -- Le bloc contient un mot cle simple avec defaut non present -- On s'attend a recuperer les 2 mots cles simples avec leur valeur par -- defaut. -- """ -- cata=FACT(ZORGLUB =SIMP(statut='f',typ='TXM',defaut='OOO'), -- b_unit1 =BLOC(condition = "ZORGLUB=='OOO'", -- TOTO =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- ), -- ) -- mcfact=cata({},'mcf',None) -- valeur_attendue={'ZORGLUB':'OOO','TOTO':'AAA'} - dico=mcfact[0].cree_dict_valeurs(mcfact[0].mc_liste) - #dico=mcfact.cree_dict_valeurs(mcfact.mc_liste) - dico=mcfact[0].creeDictValeurs(mcfact[0].mc_liste) - #dico=mcfact.creeDictValeurs(mcfact.mc_liste) -- self.assertEqual(dico , valeur_attendue) - self.assertEqual(mcfact[0].get_mocle('TOTO') , 'AAA') - self.assertEqual(mcfact[0].get_mocle('ZORGLUB') , 'OOO') - self.assertEqual(mcfact[0].getMocle('TOTO') , 'AAA') - self.assertEqual(mcfact[0].getMocle('ZORGLUB') , 'OOO') -- self.assertEqual(mcfact['TOTO'] , 'AAA') -- self.assertRaises(IndexError, mcfact.__getitem__, 'TITI') -- -- def test002(self): -- cata=FACT(ZORGLUB =SIMP(statut='f',typ='TXM',defaut='OOO'), -- b_unit1 =BLOC(condition = "ZORGLUB=='ZZZ'", -- TOTO =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- ), -- ) -- mcfact=cata({},'mcf',None) -- valeur_attendue={'ZORGLUB':'OOO'} - dico=mcfact[0].cree_dict_valeurs(mcfact[0].mc_liste) - #dico=mcfact.cree_dict_valeurs(mcfact.mc_liste) - dico=mcfact[0].creeDictValeurs(mcfact[0].mc_liste) - #dico=mcfact.creeDictValeurs(mcfact.mc_liste) -- self.assertEqual(dico , valeur_attendue) - self.assertEqual(mcfact[0].get_mocle('ZORGLUB') , 'OOO') - self.assertEqual(mcfact[0].getMocle('ZORGLUB') , 'OOO') -- -- def test003(self): -- cata=FACT(ZORGLUB =SIMP(statut='f',typ='TXM',defaut='OOO'), -- b_unit1 =BLOC(condition = "ZORGLUB=='ZZZ'", -- TOTO =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- ), -- ) -- mcfact=cata({'ZORGLUB':'ZZZ'},'mcf',None) -- valeur_attendue={'ZORGLUB':'ZZZ', 'TOTO':'AAA'} - dico=mcfact[0].cree_dict_valeurs(mcfact[0].mc_liste) - dico=mcfact[0].creeDictValeurs(mcfact[0].mc_liste) -- self.assertEqual(dico , valeur_attendue) - self.assertEqual(mcfact[0].get_mocle('ZORGLUB') , 'ZZZ') - self.assertEqual(mcfact[0].getMocle('ZORGLUB') , 'ZZZ') -- self.assertEqual(mcfact['TOTO'] , 'AAA') -- -- def test004(self): -- cata=FACT(ZORGLUB =SIMP(statut='f',typ='TXM',defaut='OOO'), -- b_unit1 =BLOC(condition = "ZORGLUB=='OOO'", -- TOTO =SIMP(statut='f',typ='TXM',into=('AAA','BBB'),), -- ), -- ) -- mcfact=cata({},'mcf',None) -- valeur_attendue={'ZORGLUB':'OOO','TOTO':None} - dico=mcfact[0].cree_dict_valeurs(mcfact[0].mc_liste) - dico=mcfact[0].creeDictValeurs(mcfact[0].mc_liste) -- self.assertEqual(dico , valeur_attendue) - self.assertEqual(mcfact[0].get_mocle('TOTO') , None) - self.assertEqual(mcfact[0].get_child('ZORGLUB').get_valeur() , 'OOO') - self.assertEqual(mcfact[0].get_child('b_unit1').get_child('TOTO').get_valeur() , None) - self.assertEqual(mcfact[0].getMocle('TOTO') , None) - self.assertEqual(mcfact[0].getChild('ZORGLUB').getValeur() , 'OOO') - self.assertEqual(mcfact[0].getChild('b_unit1').getChild('TOTO').getValeur() , None) -- self.assertEqual(mcfact['TOTO'] , None) -- -- def test005(self): -- cata=FACT( -- TOTO=FACT(statut='d', -- TITI=SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- b_unit1 =BLOC(condition = "TITI=='AAA'", -- TOTO =SIMP(statut='f',typ='TXM',into=('AAA','BBB'),), -- ), -- ), -- ) -- mcfact=cata({},'mcf',None) - dico=mcfact[0].cree_dict_valeurs(mcfact[0].mc_liste) - dico=mcfact[0].creeDictValeurs(mcfact[0].mc_liste) -- self.assertNotEqual(dico["TOTO"] , None) -- -- def test010(self): -- """ -- """ -- cata=FACT(ZORGLUB =SIMP(statut='f',typ='TXM',defaut='OOO'), -- b_unit1 =BLOC(condition = "ZORGLUB=='OOO'", -- TOTO =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- b_unit2 =BLOC(condition = "TOTO == 'BBB'", -- UNITE =SIMP(statut='f',typ='I',defaut=25), -- ), -- ), -- ) -- mcfact=cata({'TOTO' : 'BBB'},'mcf',None) -- valeur_attendue={'UNITE':25, 'ZORGLUB':'OOO','TOTO':'BBB'} - dico=mcfact[0].cree_dict_valeurs(mcfact[0].mc_liste) - dico=mcfact[0].creeDictValeurs(mcfact[0].mc_liste) -- self.assertEqual(dico , valeur_attendue) -- -- def test011(self): -- """ -- """ -- cata=FACT( -- TITI =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- TUTU =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- TATA =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- TOTO =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- b_unit1 =BLOC(condition = "TITI =='AAA'", -- TOTO1 =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- c_unit1 =BLOC(condition = "TOTO1 == 'AAA'", UNITE1 =SIMP(statut='f',typ='I',defaut=25),), -- ), -- b_unit2 =BLOC(condition = "TUTU =='AAA'", -- TOTO2 =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- c_unit2 =BLOC(condition = "TOTO2 == 'BBB'", UNITE2 =SIMP(statut='f',typ='I',defaut=25),), -- ), -- b_unit3 =BLOC(condition = "TATA =='BBB'", -- TOTO3 =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- c_unit3 =BLOC(condition = "TOTO3 == 'BBB'", UNITE3 =SIMP(statut='f',typ='I',defaut=25),), -- ), -- b_unit4 =BLOC(condition = "TOTO =='BBB'", -- TOTO4 =SIMP(statut='f',typ='TXM',defaut='AAA',into=('AAA','BBB'),), -- c_unit4 =BLOC(condition = "TOTO4 == 'AAA'", UNITE4 =SIMP(statut='f',typ='I',defaut=25),), -- ), -- ) -- mcfact=cata({'TOTO' : 'BBB'},'mcf',None) -- valeur_attendue={ -- 'TITI': 'AAA', 'TOTO': 'BBB', 'TUTU': 'AAA', 'TATA': 'AAA', -- 'TOTO1': 'AAA', 'UNITE1': 25, -- 'TOTO2': 'AAA', -- 'TOTO4': 'AAA', 'UNITE4': 25, -- } - dico=mcfact[0].cree_dict_valeurs(mcfact[0].mc_liste) - dico=mcfact[0].creeDictValeurs(mcfact[0].mc_liste) -- self.assertEqual(dico , valeur_attendue) -- - self.assertEqual(mcfact[0].get_child('TATA').get_valeur() , 'AAA') - self.assertEqual(mcfact[0].get_child('TITI').get_valeur() , 'AAA') - self.assertEqual(mcfact[0].get_child('TUTU').get_valeur() , 'AAA') - self.assertEqual(mcfact[0].get_child('TOTO').get_valeur() , 'BBB') - self.assertEqual(mcfact[0].getChild('TATA').getValeur() , 'AAA') - self.assertEqual(mcfact[0].getChild('TITI').getValeur() , 'AAA') - self.assertEqual(mcfact[0].getChild('TUTU').getValeur() , 'AAA') - self.assertEqual(mcfact[0].getChild('TOTO').getValeur() , 'BBB') -- self.assertEqual(mcfact['TITI'] , 'AAA') -- self.assertEqual(mcfact['TUTU'] , 'AAA') -- self.assertEqual(mcfact['TATA'] , 'AAA') -- self.assertEqual(mcfact['TOTO'] , 'BBB') -- -- self.assertEqual(mcfact['TOTO1'] , 'AAA') -- self.assertEqual(mcfact['TOTO2'] , 'AAA') -- self.assertEqual(mcfact['TOTO4'] , 'AAA') - self.assertRaises(IndexError, mcfact[0].get_mocle, 'TOTO3') - self.assertRaises(IndexError, mcfact[0].getMocle, 'TOTO3') -- -- self.assertEqual(mcfact['UNITE1'] , 25) -- self.assertEqual(mcfact['UNITE4'] , 25) -- self.assertRaises(IndexError, mcfact.__getitem__, 'UNITE2') -- self.assertRaises(IndexError, mcfact.__getitem__, 'UNITE3') - self.assertRaises(IndexError, mcfact[0].get_mocle, 'UNITE2') - self.assertRaises(IndexError, mcfact[0].get_mocle, 'UNITE3') - self.assertRaises(IndexError, mcfact[0].getMocle, 'UNITE2') - self.assertRaises(IndexError, mcfact[0].getMocle, 'UNITE3') -- - self.assertEqual(mcfact[0].get_child('b_unit4').get_child('TOTO4').get_valeur(),'AAA') - self.assertEqual(mcfact[0].get_child('b_unit4').get_valeur(),{'TOTO4': 'AAA', 'UNITE4': 25}) - self.assertEqual(mcfact[0].getChild('b_unit4').getChild('TOTO4').getValeur(),'AAA') - self.assertEqual(mcfact[0].getChild('b_unit4').getValeur(),{'TOTO4': 'AAA', 'UNITE4': 25}) diff --cc Tests/testelem/testitem1.py index c3f902a0,04a0458e..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testitem1.py +++ /dev/null @@@ -1,73 -1,73 +1,0 @@@ --import os --import unittest --import difflib -- --import prefs --from InterfaceTK import appli --#from Editeur import appli --from Editeur import comploader --from Editeur import Objecttreeitem -- -- --def add_param(j,pos,nom,valeur): - co=j.addentite("PARAMETRE",pos) - co.set_nom(nom) - co=j.addEntite("PARAMETRE",pos) - co.setNom(nom) -- co.set_valeur(valeur) -- return co -- --def add_mcsimp(obj,nom,valeur): - mcs=obj.get_child(nom,restreint='oui') - mcs=obj.getChild(nom,restreint='oui') -- if mcs is None: - pos=obj.get_index_child(nom) - mcs=obj.addentite(nom,pos) - mcs.set_valeur(mcs.eval_val(valeur)) - pos=obj.getIndexChild(nom) - mcs=obj.addEntite(nom,pos) - mcs.set_valeur(mcs.evalVal(valeur)) -- return mcs -- --def cdiff(text1,text2): -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- --version= 'v9' -- --class TestCase(unittest.TestCase): -- """ Tests sur des items """ -- def setUp(self): -- pass -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- -- def test001(self): -- """Test comploader""" - composants=comploader.charger_composants() - composants=comploader.chargerComposants() -- itemtype=comploader.gettreeitem({'a':1}) -- assert itemtype is Objecttreeitem.ObjectTreeItem -- -- def test002(self): -- """ Test de commentarisation/decommentarisation a partir d'un item jdc """ -- app=appli.STANDALONE(version=version) -- file=os.path.join(prefs.INSTALLDIR,"Tests/testelem/az.comm") -- j=app.openJDC(file=file) -- item=app.create_item(j) - assert item.isvalid(),item.report() - assert item.isValid(),item.report() -- # on commente la commande LIRE_MAILLAGE - commands=item.GetSubList() - commands=item.getSubList() -- for it in commands: -- if it.nom == "LIRE_MAILLAGE" and it.sd.nom == "MAIL":break -- pos=commands.index(it) - cco=it.get_objet_commentarise() - commands=item.GetSubList() - commands[pos].uncomment() - commands=item.GetSubList() - cco=it.getObjetCommentarise() - commands=item.getSubList() - commands[pos].unComment() - commands=item.getSubList() -- # on reaffecte l'objet MAIL -- for it in commands: -- if it.nom in ("AFFE_MODELE","AFFE_MATERIAU") : - for mc in it.GetSubList(): - for mc in it.getSubList(): -- if mc.nom == "MAILLAGE": - valeur,validite=mc.eval_valeur("MAIL") - valeur,validite=mc.evalValeur("MAIL") -- test = mc.set_valeur(valeur) - text1=app.get_text_JDC(j,'python') - text1=app.getTextJDC(j,'python') -- f=open(file) -- text2=f.read() -- f.close() -- assert text1 == text2 , cdiff(text1,text2) -- diff --cc Tests/testelem/testjdc1.py index 1efad3b3,9702958d..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testjdc1.py +++ /dev/null @@@ -1,455 -1,455 +1,0 @@@ --# coding=utf-8 -- --import os --import unittest --import difflib --import compare -- --import prefs --from InterfaceTK import appli --#from Editeur import appli -- --def add_param(j,pos,nom,valeur): - co=j.addentite("PARAMETRE",pos) - co.set_nom(nom) - co=j.addEntite("PARAMETRE",pos) - co.setNom(nom) -- co.set_valeur(valeur) -- return co -- --def add_mcsimp(obj,nom,valeur): - mcs=obj.get_child(nom,restreint='oui') - mcs=obj.getChild(nom,restreint='oui') -- if mcs is None: - pos=obj.get_index_child(nom) - mcs=obj.addentite(nom,pos) - mcs.set_valeur(mcs.eval_val(valeur)) - pos=obj.getIndexChild(nom) - mcs=obj.addEntite(nom,pos) - mcs.set_valeur(mcs.evalVal(valeur)) -- return mcs -- --def cdiff(text1,text2): -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- --version='v9' -- --class TestCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- -- def test000(self): -- app=appli.STANDALONE(version=version) -- j=app.newJDC() -- --# commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) -- co=add_param(j,1,"P1",None) -- x=co.valeur or "coucou" -- assert x == "coucou" -- assert len(co) == 0 -- co.set_valeur(1) -- assert len(co) == 1 -- co.set_valeur([1,2]) -- assert len(co) == 2 -- -- def test001(self): -- """ Test d'insertion de commandes dans fichier toto.comm""" -- app=appli.STANDALONE(version=version) -- file=os.path.join(prefs.INSTALLDIR,"Tests/testelem/toto.comm") -- j=app.openJDC(file=file) -- expected="""DEBUT CR validation : toto.comm --FIN CR validation :toto.comm --""" -- cr=str(j.report()) -- assert cr == expected, cr + "!=" + expected -- co=j.etapes[1] - mcs=co.addentite("INFO") - mcs=co.addEntite("INFO") -- - cr=app.get_text_JDC(j,'python') - cr=app.getTextJDC(j,'python') -- expected=""" --DEBUT(); -- --MA=LIRE_MAILLAGE(INFO=1,); -- --FIN(); --""" -- assert cr == expected, cr + "!=" + expected - co=j.addentite("LIRE_MAILLAGE",2) - test,mess=co.nomme_sd("MA2") - co=j.addEntite("LIRE_MAILLAGE",2) - test,mess=co.nommeSd("MA2") -- assert test == 1 -- - cr=app.get_text_JDC(j,'python') - cr=app.getTextJDC(j,'python') -- expected=""" --DEBUT(); -- --MA=LIRE_MAILLAGE(INFO=1,); -- --MA2=LIRE_MAILLAGE(); -- --FIN(); --""" -- assert cr == expected, cr + "!=" + expected -- -- def test002(self): -- """ Test de construction du fichier de commandes az.comm de zero""" -- -- app=appli.STANDALONE(version=version) -- j=app.newJDC() --# commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) --# commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) --# parametres -- pos=0 -- pos=pos+1 -- co=add_param(j,pos,"P1","9.8") -- pos=pos+1 -- co=add_param(j,pos,"P2","8.8") -- pos=pos+1 -- co=add_param(j,pos,"P3","7") -- pos=pos+1 -- co=add_param(j,pos,"P5","P3*P1") -- pos=pos+1 -- co=add_param(j,pos,"P6","P1-3") -- pos=pos+1 -- co=add_param(j,pos,"P4","[2,3,4]") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur("Pas trouve shellpanel") --# commande LIRE_MAILLAGE -- pos=pos+1 - co=j.addentite("LIRE_MAILLAGE",pos) - test,mess=co.nomme_sd("MAILLA2") - mcs=co.addentite("UNITE") - valeur=mcs.eval_val("P4[1]") - co=j.addEntite("LIRE_MAILLAGE",pos) - test,mess=co.nommeSd("MAILLA2") - mcs=co.addEntite("UNITE") - valeur=mcs.evalVal("P4[1]") -- test=mcs.set_valeur(valeur) --# formule -- pos=pos+1 - co=j.addentite("FORMULE",pos) - co.update_formule_python(("aaa","REEL","a+z","(a,z)")) - co=j.addEntite("FORMULE",pos) - co.updateFormulePython(("aaa","REEL","a+z","(a,z)")) --# commande LIRE_MAILLAGE -- pos=pos+1 - ma=co=j.addentite("LIRE_MAILLAGE",pos) - test,mess=co.nomme_sd("MAIL") - mcs=co.addentite("UNITE") - valeur,validite=mcs.eval_valeur("P3") - ma=co=j.addEntite("LIRE_MAILLAGE",pos) - test,mess=co.nommeSd("MAIL") - mcs=co.addEntite("UNITE") - valeur,validite=mcs.evalValeur("P3") -- test=mcs.set_valeur(valeur) --# -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'LIRE_MAILLAGE', 'UNITE' --> uniquebasepanel") --# formule -- pos=pos+1 - co=j.addentite("FORMULE",pos) - co.update_formule_python(("az","REEL","aaaaa","(ae,inst)")) - co=j.addEntite("FORMULE",pos) - co.updateFormulePython(("az","REEL","aaaaa","(ae,inst)")) --# commande AFFE_MODELE -- pos=pos+1 - co=j.addentite("AFFE_MODELE",pos) - mcs=co.get_child("MAILLAGE") - valeur,validite=mcs.eval_valeur("MAIL") - co=j.addEntite("AFFE_MODELE",pos) - mcs=co.getChild("MAILLAGE") - valeur,validite=mcs.evalValeur("MAIL") -- assert valeur == ma.sd -- test=mcs.set_valeur(valeur) -- assert valeur == co["MAILLAGE"] - mcf=co.addentite("AFFE") - mcs=mcf[0].get_child("PHENOMENE") - valeur=mcs.eval_val_item('MECANIQUE') - mcf=co.addEntite("AFFE") - mcs=mcf[0].getChild("PHENOMENE") - valeur=mcs.evalValItem('MECANIQUE') -- assert valeur=='MECANIQUE',str(valeur) -- test=mcs.set_valeur(valeur) -- assert mcf["PHENOMENE"] == 'MECANIQUE' - mcs=mcf[0].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcs=mcf[0].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- assert mcf["MODELISATION"] == 'DIS_T' -- mcs=add_mcsimp(mcf[0],"GROUP_MA",('RESSORT','eee',)) -- - mcf=co.addentite("AFFE") - mcs=mcf[1].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('MECANIQUE')) - mcs=mcf[1].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcf=co.addEntite("AFFE") - mcs=mcf[1].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('MECANIQUE')) - mcs=mcf[1].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- mcs=add_mcsimp(mcf[1],"GROUP_MA",'MASSES') -- - mcf=co.addentite("AFFE") - mcs=mcf[2].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('ACOUSTIQUE')) - mcs=mcf[2].get_child("b_acoustique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('PLAN')) - mcf=co.addEntite("AFFE") - mcs=mcf[2].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('ACOUSTIQUE')) - mcs=mcf[2].getChild("b_acoustique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('PLAN')) -- #mcs=add_mcsimp(mcf[2],"GROUP_NO",'GNP3,GNP5,GNP6,GNP7,GNP8,GNP9,GNP10,GNP11,GNP12') -- mcs=add_mcsimp(mcf[2],"GROUP_NO","'GNP3','GNP5','GNP6','GNP7','GNP8','GNP9','GNP10','GNP11','GNP12'") -- - co.nomme_sd("AFFE1") - co.nommeSd("AFFE1") --# commande AFFE_MODELE -- pos=pos+1 - co=j.addentite("AFFE_MODELE",pos) - mcs=co.get_child("MAILLAGE") - mcs.set_valeur(mcs.eval_val("MAIL")) - co=j.addEntite("AFFE_MODELE",pos) - mcs=co.getChild("MAILLAGE") - mcs.set_valeur(mcs.evalVal("MAIL")) -- - mcf=co.addentite("AFFE") - mcs=mcf[0].get_child("PHENOMENE") - valeur=mcs.eval_val_item('MECANIQUE') - mcf=co.addEntite("AFFE") - mcs=mcf[0].getChild("PHENOMENE") - valeur=mcs.evalValItem('MECANIQUE') -- test=mcs.set_valeur(valeur) - mcs=mcf[0].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcs=mcf[0].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- mcs=add_mcsimp(mcf[0],"GROUP_MA",'RESSORT') -- - mcf=co.addentite("AFFE") - mcs=mcf[1].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('MECANIQUE')) - mcs=mcf[1].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcf=co.addEntite("AFFE") - mcs=mcf[1].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('MECANIQUE')) - mcs=mcf[1].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- mcs=add_mcsimp(mcf[1],"GROUP_MA",'MASSES') -- - mcf=co.addentite("AFFE") - mcs=mcf[2].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('THERMIQUE')) - mcs=mcf[2].get_child("b_thermique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('COQUE')) - mcf=co.addEntite("AFFE") - mcs=mcf[2].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('THERMIQUE')) - mcs=mcf[2].getChild("b_thermique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('COQUE')) -- mcs=add_mcsimp(mcf[2],"TOUT",'OUI') -- - co.nomme_sd("MOD") - co.nommeSd("MOD") --#CARA=AFFE_CARA_ELEM(MODELE=MOD, --# POUTRE=_F(GROUP_MA='MA', --# SECTION='CERCLE', --# CARA='R', --# VALE=(3.0,P6,),),); -- pos=pos+1 - co=j.addentite("AFFE_CARA_ELEM",pos) - mcs=co.get_child("MODELE") - mcs.set_valeur(mcs.eval_val("MOD")) - mcf=co.addentite("POUTRE") - mcs=mcf[0].get_child("SECTION") - mcs.set_valeur(mcs.eval_val('CERCLE')) - co=j.addEntite("AFFE_CARA_ELEM",pos) - mcs=co.getChild("MODELE") - mcs.set_valeur(mcs.evalVal("MOD")) - mcf=co.addEntite("POUTRE") - mcs=mcf[0].getChild("SECTION") - mcs.set_valeur(mcs.evalVal('CERCLE')) -- assert mcf[0]["SECTION"] == 'CERCLE' -- mcs=add_mcsimp(mcf[0],"GROUP_MA",'MA') - mcs=mcf[0].get_child("b_cercle").get_child("b_constant").get_child("CARA") - mcs.set_valeur(mcs.eval_val('R')) - mcs=mcf[0].get_child("b_cercle").get_child("b_constant").get_child("VALE") - mcs.set_valeur(mcs.eval_val('3.0,P6')) - co.nomme_sd("CARA") - mcs=mcf[0].getChild("b_cercle").getChild("b_constant").getChild("CARA") - mcs.set_valeur(mcs.evalVal('R')) - mcs=mcf[0].getChild("b_cercle").getChild("b_constant").getChild("VALE") - mcs.set_valeur(mcs.evalVal('3.0,P6')) - co.nommeSd("CARA") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- text=""" 'AFFE_MODELE', 'MAILLAGE' --> uniqueassdpanel -- AFFE_MODELE', 'AFFE', 'GROUP_MA' --> plusieursbasepanel -- 'AFFE_MODELE', 'AFFE', 'PHENOMENE' --> uniqueintopanel -- 'AFFE_MODELE', 'AFFE', 'b_mecanique'--> plusieursintopanel""" -- co.set_valeur(text) --#F1=DEFI_FONCTION(NOM_PARA='DX', --# VALE=(5.0,3.0,P4[1],P3,),); -- pos=pos+1 - co=j.addentite("DEFI_FONCTION",pos) - mcs=co.get_child("NOM_PARA") - mcs.set_valeur(mcs.eval_val("DX")) - mcs=co.addentite("VALE") - mcs.set_valeur(mcs.eval_val("5.0,3.0,P4[1],P3")) - co.nomme_sd("F1") - co=j.addEntite("DEFI_FONCTION",pos) - mcs=co.getChild("NOM_PARA") - mcs.set_valeur(mcs.evalVal("DX")) - mcs=co.addEntite("VALE") - mcs.set_valeur(mcs.evalVal("5.0,3.0,P4[1],P3")) - co.nommeSd("F1") --#F3=DEFI_FONCTION(NOM_PARA='DRX', --# VALE_C=(5.0,7.0,9.0,9.0,8.0,7.0,),); -- pos=pos+1 - co=j.addentite("DEFI_FONCTION",pos) - mcs=co.get_child("NOM_PARA") - mcs.set_valeur(mcs.eval_val("DRX")) - mcs=co.addentite("VALE_C") - mcs.set_valeur(mcs.eval_val("5.0,7.0,9.0,9.0,8.0,7.0")) - co.nomme_sd("F3") - co=j.addEntite("DEFI_FONCTION",pos) - mcs=co.getChild("NOM_PARA") - mcs.set_valeur(mcs.evalVal("DRX")) - mcs=co.addEntite("VALE_C") - mcs.set_valeur(mcs.evalVal("5.0,7.0,9.0,9.0,8.0,7.0")) - co.nommeSd("F3") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'DEFI_FONCTION', 'VALE' --> fonctionpanel ") --#MATER2=DEFI_MATERIAU(ELAS=_F(E=100000000000.0, --# NU=0.0,), --# ECRO_ASYM_LINE=_F(DC_SIGM_EPSI=0.0, --# SY_C=200000000.0, --# DT_SIGM_EPSI=0.0, --# SY_T=50000000.0,),); -- pos=pos+1 - co=j.addentite("DEFI_MATERIAU",pos) - mcf=co.addentite("ELAS") - mcs=mcf[0].get_child("E") - mcs.set_valeur(mcs.eval_val("100000000000.0")) - mcs=mcf[0].get_child("NU") - mcs.set_valeur(mcs.eval_val("0.0")) - mcf=co.addentite("ECRO_ASYM_LINE") - mcs=mcf[0].get_child("DC_SIGM_EPSI") - mcs.set_valeur(mcs.eval_val("0.0")) - mcs=mcf[0].get_child("DT_SIGM_EPSI") - mcs.set_valeur(mcs.eval_val("0.0")) - mcs=mcf[0].get_child("SY_C") - mcs.set_valeur(mcs.eval_val("200000000.0")) - mcs=mcf[0].get_child("SY_T") - mcs.set_valeur(mcs.eval_val("50000000.0")) - co.nomme_sd("MATER2") - co=j.addEntite("DEFI_MATERIAU",pos) - mcf=co.addEntite("ELAS") - mcs=mcf[0].getChild("E") - mcs.set_valeur(mcs.evalVal("100000000000.0")) - mcs=mcf[0].getChild("NU") - mcs.set_valeur(mcs.evalVal("0.0")) - mcf=co.addEntite("ECRO_ASYM_LINE") - mcs=mcf[0].getChild("DC_SIGM_EPSI") - mcs.set_valeur(mcs.evalVal("0.0")) - mcs=mcf[0].getChild("DT_SIGM_EPSI") - mcs.set_valeur(mcs.evalVal("0.0")) - mcs=mcf[0].getChild("SY_C") - mcs.set_valeur(mcs.evalVal("200000000.0")) - mcs=mcf[0].getChild("SY_T") - mcs.set_valeur(mcs.evalVal("50000000.0")) - co.nommeSd("MATER2") --#PS1=DEFI_PARA_SENSI(VALE=1.0,); --#PS2=DEFI_PARA_SENSI(VALE=1.0,); --#PS3=DEFI_PARA_SENSI(VALE=1.0,); -- pos=pos+1 - co=j.addentite("DEFI_PARA_SENSI",pos) - mcs=co.get_child("VALE") - mcs.set_valeur(mcs.eval_val("1.0")) - co.nomme_sd("PS1") - co=j.addEntite("DEFI_PARA_SENSI",pos) - mcs=co.getChild("VALE") - mcs.set_valeur(mcs.evalVal("1.0")) - co.nommeSd("PS1") -- pos=pos+1 - co=j.addentite("DEFI_PARA_SENSI",pos) - mcs=co.get_child("VALE") - mcs.set_valeur(mcs.eval_val("1.0")) - co.nomme_sd("PS2") - co=j.addEntite("DEFI_PARA_SENSI",pos) - mcs=co.getChild("VALE") - mcs.set_valeur(mcs.evalVal("1.0")) - co.nommeSd("PS2") -- pos=pos+1 - co=j.addentite("DEFI_PARA_SENSI",pos) - mcs=co.get_child("VALE") - mcs.set_valeur(mcs.eval_val("1.0")) - co.nomme_sd("PS3") - co=j.addEntite("DEFI_PARA_SENSI",pos) - mcs=co.getChild("VALE") - mcs.set_valeur(mcs.evalVal("1.0")) - co.nommeSd("PS3") --#CHMAT2=AFFE_MATERIAU(MAILLAGE=MAIL, --# AFFE=_F(TOUT='OUI', --# MATER=MATER2,),); -- pos=pos+1 - co=j.addentite("AFFE_MATERIAU",pos) - co=j.addEntite("AFFE_MATERIAU",pos) -- add_mcsimp(co,"MAILLAGE","MAIL") - mcf=co.get_child("AFFE") - mcf=co.getChild("AFFE") -- add_mcsimp(mcf[0],"TOUT","OUI") -- add_mcsimp(mcf[0],"MATER","MATER2") - co.nomme_sd("CHMAT2") - co.nommeSd("CHMAT2") --#AAAZ=AFFE_CHAR_THER(MODELE=AFFE1, --# TEMP_IMPO=_F(TOUT='OUI', --# TEMP=0.0,),); -- pos=pos+1 - co=j.addentite("AFFE_CHAR_THER",pos) - co=j.addEntite("AFFE_CHAR_THER",pos) -- add_mcsimp(co,"MODELE","AFFE1") - mcf=co.addentite("TEMP_IMPO") - mcf=co.addEntite("TEMP_IMPO") -- add_mcsimp(mcf[0],"TOUT","OUI") -- add_mcsimp(mcf[0],"TEMP","0.0") - co.nomme_sd("AAAZ") - co.nommeSd("AAAZ") --#TH1=THER_LINEAIRE(MODELE=AFFE1, --# CHAM_MATER=CHMAT2, --# EXCIT=_F(CHARGE=AAAZ,), --# SENSIBILITE=(PS1,PS2,),); -- pos=pos+1 - co=j.addentite("THER_LINEAIRE",pos) - co=j.addEntite("THER_LINEAIRE",pos) -- add_mcsimp(co,"MODELE","AFFE1") -- add_mcsimp(co,"CHAM_MATER","CHMAT2") - mcf=co.get_child("EXCIT") - mcf=co.getChild("EXCIT") -- add_mcsimp(mcf[0],"CHARGE","AAAZ") -- add_mcsimp(co,"SENSIBILITE","PS1,PS2") - co.nomme_sd("TH1") - co.nommeSd("TH1") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'THER_LINEAIRE', 'SENSIBILITE' --> plusieursassdpanel") --#ACA1=AFFE_CHAR_ACOU(MODELE=AFFE1, --# PRES_IMPO=_F(TOUT='OUI', --# PRES=('RI',3.0,3.0,),),); -- pos=pos+1 - co=j.addentite("AFFE_CHAR_ACOU",pos) - co=j.addEntite("AFFE_CHAR_ACOU",pos) -- add_mcsimp(co,"MODELE","AFFE1") - mcf=co.addentite("PRES_IMPO") - mcf=co.addEntite("PRES_IMPO") -- add_mcsimp(mcf[0],"TOUT","OUI") -- add_mcsimp(mcf[0],"PRES","'RI',3.0,3.0") - co.nomme_sd("ACA1") - co.nommeSd("ACA1") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'AFFE_CHAR_ACOU', 'PRES_IMPO', 'PRES' --> uniquecomppanel") -- --# 'AFFE_CHAR_ACOU', 'PRES_IMPO', 'PRES' --> uniquecomppanel -- --#MACRO_MATR_ASSE(MODELE=AFFE1, --# NUME_DDL=CO('DDL1'), --# MATR_ASSE=_F(MATRICE=CO('MAT1'), --# OPTION='RIGI_THER',),); -- pos=pos+1 - co=j.addentite("MACRO_MATR_ASSE",pos) - co=j.addEntite("MACRO_MATR_ASSE",pos) -- add_mcsimp(co,"MODELE","AFFE1") - mcs=co.get_child("NUME_DDL") - mcs=co.getChild("NUME_DDL") -- mcs.set_valeur_co('DDL1') - mcf=co.get_child("MATR_ASSE") - mcf=co.getChild("MATR_ASSE") -- add_mcsimp(mcf[0],"OPTION","RIGI_THER") - mcs=mcf[0].get_child("MATRICE") - mcs=mcf[0].getChild("MATRICE") -- mcs.set_valeur_co('MAT1') --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'MACRO_MATR_ASSE', 'MATR_ASSE', 'MATRICE' --> uniquesdcopanel") -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- - text1=app.get_text_JDC(j,'python') - text1=app.getTextJDC(j,'python') -- file=os.path.join(prefs.INSTALLDIR,"Tests/testelem/az.comm") -- f=open(file) -- text2=f.read() -- f.close() -- assert text1 == text2 , cdiff(text1,text2) -- -- def test003(self): -- """ Test de construction du fichier de commandes az.comm de zero""" -- -- app=appli.STANDALONE(version=version) -- j=app.newJDC() --# commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) --# commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) --#parametre -- pos=0 -- pos=pos+1 -- co=add_param(j,pos,"P1","9.8") -- pos=pos+1 -- co=add_param(j,pos,"P2","sin(P1)") --# formule -- pos=pos+1 - co=j.addentite("FORMULE",pos) - co.update_formule_python(("aaa","REEL","a+z","(a,z)")) - co=j.addEntite("FORMULE",pos) - co.updateFormulePython(("aaa","REEL","a+z","(a,z)")) --#parametre de formule -- pos=pos+1 -- co=add_param(j,pos,"P3","aaa(P1,2.)") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","1.,2.,3.") - co.nomme_sd("LI1") - co.nommeSd("LI1") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","sin(1.)") - co.nomme_sd("LI2") - co.nommeSd("LI2") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","aaa(1.,2.)") - co.nomme_sd("LI3") - co.nommeSd("LI3") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","sin(1.,2)") - co.nomme_sd("LI4") - co.nommeSd("LI4") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","aaa(1.)") - co.nomme_sd("LI5") - co.nommeSd("LI5") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","1,sin(1.),2") - co.nomme_sd("LI6") - co.nommeSd("LI6") -- -- expected="""DEBUT CR validation : SansNom -- Etape : DEFI_LIST_REEL ligne : ... -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Concept retourné non défini ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Mot-clé simple : VALE -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 'sin(1.,2)' (de type ) n'est pas d'un type autorisé: ('R',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : VALE -- Fin Etape : DEFI_LIST_REEL -- Etape : DEFI_LIST_REEL ligne : ... -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Concept retourné non défini ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Mot-clé simple : VALE -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 'aaa(1.)' (de type ) n'est pas d'un type autorisé: ('R',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : VALE -- Fin Etape : DEFI_LIST_REEL --FIN CR validation :SansNom --""" -- msg=str( j.report()) -- assert compare.check(expected,msg),cdiff(expected,msg) diff --cc Tests/testelem/testjdc2.py index 78ddd294,c700b89a..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testjdc2.py +++ /dev/null @@@ -1,166 -1,166 +1,0 @@@ --# -*- coding: iso-8859-1 -*- --import cata5 -- --import unittest,re,os --import compare -- --class TestJDCCase(unittest.TestCase): -- -- def test1(self): -- text=""" --# OP2 : CO converti en concept2 ou concept2. Retourne concept --# OP6 : uniquement CO converti en concept2. Retourne concept --# OP3 : CO converti en concept ou concept. Retourne concept --co0=OP2(MATR=CO("x1")) --co2=OP6(MATR=CO("xx")) --co3=OP3(MATR={"CHAM":"R","MM":co2}) --""" -- self.execute(cata5,text) -- -- def test2(self): -- text=""" --# OP2 : CO converti en concept2 ou concept2. Retourne concept --# OP5 : uniquement CO converti en concept2. Retourne concept --co0=OP2(MATR=CO("x1")) --co1=OP5(MATR=co0) --""" -- expected="""DEBUT CR validation : bidon -- Etape : OP5 ligne : 5 fichier : 'bidon' -- Mot-clé simple : MATR -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! concept co0 de type concept (de type ) n'est pas d'un ! -- ! type autorisé: (,) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : MATR -- Fin Etape : OP5 --FIN CR validation :bidon --""" -- self.execute(cata5,text,err3=expected) -- -- def test3(self): -- text=""" --# OP2 : CO converti en concept2 ou concept2. Retourne concept --co0=OP2(MATR=CO("x1")) --co1=OP2(MATR=x1) --co2=OP2(MATR=co0) --""" -- expected="""DEBUT CR validation : bidon -- Etape : OP2 ligne : 5 fichier : 'bidon' -- Mot-clé simple : MATR -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! concept co0 de type concept (de type ) n'est pas d'un ! -- ! type autorisé: (, ) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : MATR -- Fin Etape : OP2 --FIN CR validation :bidon --""" -- self.execute(cata5,text,err3=expected) -- -- def test8(self): -- text=""" --co2=OP14(MATR=CO("xx")) --""" -- expected="" -- self.execute(cata5,text,err4=expected) -- -- def test12(self): -- text=""" --co2=OP18(MATR=CO("xx")) --co3=OP2(MATR=xx) --co4=OP11(MATR=xx) --""" -- expected="" -- self.execute(cata5,text,err4=expected) -- -- def test13(self): -- text=""" --co2=OP10(MATR=CO("xx")) --""" -- expected="""DEBUT CR validation : bidon -- Etape : OP10 ligne : 2 fichier : 'bidon' -- Mot-clé simple : MATR -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! concept xx de type CO (de type ) n'est pas d'un type ! -- ! autorisé: (,) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : MATR -- Fin Etape : OP10 --FIN CR validation :bidon --""" -- self.execute(cata5,text,err3=expected) -- -- def test16(self): -- text=""" --co=OP22(MATR=CO("xx")) --""" -- self.execute(cata5,text) -- -- def test17(self): -- text=""" --co=OP22(MATR=CO("xx")) --co2=OP22(MATR=xx) --""" -- expected="""DEBUT CR validation : bidon -- Etape : OP22 ligne : 3 fichier : 'bidon' -- Mot-clé simple : MATR -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! concept xx de type concept4 (de type ) n'est pas d'un ! -- ! type autorisé: (,) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : MATR -- Fin Etape : OP22 --FIN CR validation :bidon --""" -- self.execute(cata5,text,err3=expected) -- -- def setUp(self): -- pass -- -- def tearDown(self): -- pass -- -- def execute(self,cata,text_jdc,err1="",err2="",err3="",err4=""): -- j=cata.JdC(procedure=text_jdc,cata=cata,nom="bidon") -- j.actif_status=1 -- j.fico=None - j.set_par_lot("OUI") - j.set_parLot("OUI") -- # On compile le texte Python -- j.compile() -- # On initialise les tops de mesure globale de temps d'execution du jdc -- j.cpu_user=os.times()[0] -- j.cpu_syst=os.times()[1] -- j.impr_macro='NON' -- -- #print j.cr -- if err1 == "": -- self.assert_(j.cr.estvide(),msg='Erreur non attendue dans compile (err1):\n%s' % str(j.cr)) -- else: -- self.assert_(self.check(err1,str(j.cr)),msg='Erreur non attendue dans compile (err1):\n%s\n!=\n%s' % (str(j.cr),err1)) -- j.supprime() -- return -- - j.exec_compile() - j.execCompile() -- #print j.cr -- if err2 == "": - self.assert_(j.cr.estvide(),msg='Erreur non attendue dans exec_compile (err2):\n%s' % str(j.cr)) - self.assert_(j.cr.estvide(),msg='Erreur non attendue dans execCompile (err2):\n%s' % str(j.cr)) -- else: - self.assert_(self.check(err2,str(j.cr)),msg='Erreur non attendue dans exec_compile(err2):\n%s\n!=\n%s' % (str(j.cr),err2)) - self.assert_(self.check(err2,str(j.cr)),msg='Erreur non attendue dans execCompile(err2):\n%s\n!=\n%s' % (str(j.cr),err2)) -- j.supprime() -- return -- -- cr=j.report() -- #print cr -- if err3 == "": - self.assert_(cr.estvide(),msg='Erreur non attendue dans exec_compile (err3):\n%s' % str(cr)) - self.assert_(cr.estvide(),msg='Erreur non attendue dans execCompile (err3):\n%s' % str(cr)) -- else: - self.assert_(self.check(err3,str(cr)),msg='Erreur non attendue dans exec_compile(err3):\n%s\n!=\n%s' % (str(cr),err3)) - self.assert_(self.check(err3,str(cr)),msg='Erreur non attendue dans execCompile(err3):\n%s\n!=\n%s' % (str(cr),err3)) -- j.supprime() -- return -- - j.set_par_lot("NON") - j.set_parLot("NON") -- -- j.supprime() -- -- def check(self,want,got): -- return compare.check(want,got) diff --cc Tests/testelem/testjdc3.py index 5a7ad9e1,d0edff75..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testjdc3.py +++ /dev/null @@@ -1,141 -1,141 +1,0 @@@ --# coding=utf-8 --import os --import unittest --import difflib --import compare -- --import prefs --from InterfaceTK import appli --#from Editeur import appli --from Accas import AsException -- --def add_param(j,pos,nom,valeur): - co=j.addentite("PARAMETRE",pos) - co.set_nom(nom) - co=j.addEntite("PARAMETRE",pos) - co.setNom(nom) -- co.set_valeur(valeur) -- return co -- --def add_mcsimp(obj,nom,valeur): - mcs=obj.get_child(nom,restreint='oui') - mcs=obj.getChild(nom,restreint='oui') -- if mcs is None: - pos=obj.get_index_child(nom) - mcs=obj.addentite(nom,pos) - mcs.set_valeur(mcs.eval_val(valeur)) - pos=obj.getIndexChild(nom) - mcs=obj.addEntite(nom,pos) - mcs.set_valeur(mcs.evalVal(valeur)) -- return mcs -- --def cdiff(text1,text2): -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- --version='v9' -- --class TestCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- -- def test001(self): -- """ Test de commentarisation/decommentarisation de commandes dans fichier az.comm""" -- app=appli.STANDALONE(version=version) -- file=os.path.join(prefs.INSTALLDIR,"Tests/testelem/az.comm") -- j=app.openJDC(file=file) - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- # on commente la commande LIRE_MAILLAGE -- for co in j.etapes: -- if co.nom == "LIRE_MAILLAGE" and co.sd.nom == "MAIL":break - cco=co.get_objet_commentarise(format=app.format_fichier.get()) - cco=co.getObjetCommentarise(format=app.format_fichier.get()) -- # on decommente la commande LIRE_MAILLAGE - commande,nom = cco.uncomment() - commande,nom = cco.unComment() -- # on reaffecte l'objet MAIL -- for co in j.etapes: -- if co.nom in ("AFFE_MODELE","AFFE_MATERIAU") : -- add_mcsimp(co,"MAILLAGE",'MAIL') -- - text1=app.get_text_JDC(j,'python') - text1=app.getTextJDC(j,'python') -- f=open(file) -- text2=f.read() -- f.close() -- assert text1 == text2 , cdiff(text1,text2) -- -- def test002(self): -- """ Test de commentarisation/decommentarisation de macro commande dans fichier az.comm""" -- app=appli.STANDALONE(version=version) -- file=os.path.join(prefs.INSTALLDIR,"Tests/testelem/az.comm") -- j=app.openJDC(file=file) - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- # on commente la commande MACRO_MATR_ASSE -- for co in j.etapes: -- if co.nom == "MACRO_MATR_ASSE" :break - cco=co.get_objet_commentarise(format=app.format_fichier.get()) - cco=co.getObjetCommentarise(format=app.format_fichier.get()) -- # on decommente la commande MACRO_MATR_ASSE - commande,nom = cco.uncomment() - assert j.isvalid(),j.report() - commande,nom = cco.unComment() - assert j.isValid(),j.report() -- -- def test003(self): -- """ Test de commentarisation/decommentarisation de commandes dans fichier az.comm""" -- app=appli.STANDALONE(version=version) -- text=""" --DEBUT() --MA=LIRE_MAILLAGE() --FIN() --""" -- j=app.openTXT(text) - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- # on commente la commande LIRE_MAILLAGE -- co=j.etapes[1] - cco=co.get_objet_commentarise(format=app.format_fichier.get()) - co=j.addentite("LIRE_MAILLAGE",2) - test,mess=co.nomme_sd("MA") - cco=co.getObjetCommentarise(format=app.format_fichier.get()) - co=j.addEntite("LIRE_MAILLAGE",2) - test,mess=co.nommeSd("MA") -- # on decommente la commande LIRE_MAILLAGE - commande,nom = cco.uncomment() - commande,nom = cco.unComment() -- expected="""DEBUT CR validation : TEXT -- Etape : LIRE_MAILLAGE ligne : ... -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Concept retourné non défini ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Etape : LIRE_MAILLAGE --FIN CR validation :TEXT --""" -- msg=str( j.report()) -- assert compare.check(expected,msg),cdiff(expected,msg) -- -- def test004(self): -- """ Test de commentarisation/decommentarisation de commandes dans fichier az.comm""" -- app=appli.STANDALONE(version=version) -- text=""" --DEBUT() --MA=LIRE_MAILLAGE() --AFFE_MODELE(MAILLAGE=MA) --FIN() --""" -- j=app.openTXT(text) -- # on commente la commande LIRE_MAILLAGE -- co=j.etapes[1] - cco=co.get_objet_commentarise(format=app.format_fichier.get()) - cco=co.getObjetCommentarise(format=app.format_fichier.get()) -- # on commente la commande AFFE_MODELE -- co=j.etapes[2] - cco2=co.get_objet_commentarise(format=app.format_fichier.get()) - cco2=co.getObjetCommentarise(format=app.format_fichier.get()) -- # on decommente la commande AFFE_MODELE - commande,nom = cco2.uncomment() - commande,nom = cco2.unComment() -- assert commande["MAILLAGE"] == None -- -- def test005(self): -- """ Test de commentarisation/decommentarisation de commandes dans fichier az.comm""" -- app=appli.STANDALONE(version=version) -- text=""" --DEBUT() --MA=LIRE_MAILLAGE() --AFFE_MODELE(MAILLAGE=MA) --FIN() --""" -- j=app.openTXT(text) -- # on commente la commande AFFE_MODELE -- co=j.etapes[2] - cco2=co.get_objet_commentarise(format=app.format_fichier.get()) - cco2=co.getObjetCommentarise(format=app.format_fichier.get()) -- # on commente la commande LIRE_MAILLAGE -- co=j.etapes[1] - cco=co.get_objet_commentarise(format=app.format_fichier.get()) - cco=co.getObjetCommentarise(format=app.format_fichier.get()) -- # on decommente la commande AFFE_MODELE - self.assertRaises(AsException, cco2.uncomment, ) - self.assertRaises(AsException, cco2.unComment, ) -- diff --cc Tests/testelem/testjdc4.py index 7a07d18a,164083ee..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testjdc4.py +++ /dev/null @@@ -1,60 -1,60 +1,0 @@@ --# coding=utf-8 --import os --import unittest --import difflib --import compare -- --import prefs --from InterfaceTK import appli --#from Editeur import appli --from Accas import AsException -- --def add_param(j,pos,nom,valeur): - co=j.addentite("PARAMETRE",pos) - co.set_nom(nom) - co=j.addEntite("PARAMETRE",pos) - co.setNom(nom) -- co.set_valeur(valeur) -- return co -- --def add_mcsimp(obj,nom,valeur): - mcs=obj.get_child(nom,restreint='oui') - mcs=obj.getChild(nom,restreint='oui') -- if mcs is None: - pos=obj.get_index_child(nom) - mcs=obj.addentite(nom,pos) - mcs.set_valeur(mcs.eval_val(valeur)) - pos=obj.getIndexChild(nom) - mcs=obj.addEntite(nom,pos) - mcs.set_valeur(mcs.evalVal(valeur)) -- return mcs -- --def cdiff(text1,text2): -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- --version='v9' -- --class TestCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- -- i=0 -- for f in ("params.comm",): -- file=os.path.join(prefs.INSTALLDIR,"Tests/testelem",f) -- i=i+1 -- exec """def test%s(self,file="%s"): -- "fichier : %s" -- self.commtest(file) --""" % (i,file,f) -- del i -- -- def commtest(self,file): -- """ Test de lecture/ecriture de fichier .comm""" -- #print file -- app=appli.STANDALONE(version=version) -- j=app.openJDC(file=file) - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- - text1=app.get_text_JDC(j,'python') - text1=app.getTextJDC(j,'python') -- f=open(file) -- text2=f.read() -- f.close() -- assert text1 == text2 , cdiff(text2,text1) -- diff --cc Tests/testelem/testmacro1.py index dcb09761,dcb09761..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testmacro1.py +++ /dev/null @@@ -1,67 -1,67 +1,0 @@@ --import cata2 --from cata2 import OP1,OP2,OP3,OP4,OP5,OP6 -- --from Accas import AsException,CO -- --import unittest -- --class TestMacroCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): -- pass -- -- def test1(self): -- co2=OP4() -- cr=co2.etape.report() -- self.assert_(cr.estvide(),msg='Erreur non attendue:\n%s' % str(cr)) -- co2.etape.supprime() -- -- def test4(self): -- co1=OP1(a=1) -- co2=OP2(MATR=CO("xx")) -- cr=co2.etape.report() -- self.assert_(cr.estvide(),msg='Erreur non attendue:\n%s' % str(cr)) -- co1.etape.supprime() -- co2.etape.supprime() -- -- def test3(self): -- co1=OP1(a=1) -- co2=OP3(MATR={"CHAM":"R","MM":CO("xx")}) -- cr=co2.etape.report() -- self.assert_(cr.estvide(),msg='Erreur non attendue:\n%s' % str(cr)) -- co1.etape.supprime() -- co2.etape.supprime() -- -- def test2(self): -- co1=OP1(a=1) -- co2=OP3(MATR=({"CHAM":"R","MM":CO("xx")}, -- {"CHAM":"R","MM":CO("xx")}, -- ), -- ) -- cr=co2.etape.report() -- self.assert_(cr.estvide(),msg='Erreur non attendue:\n%s' % str(cr)) -- co1.etape.supprime() -- co2.etape.supprime() -- -- def test5(self): -- co2=OP5(MATR=CO("xx")) -- co3=OP3(MATR={"CHAM":"R","MM":co2}) -- #print co3.etape.report() -- cr=co2.etape.report() -- #print cr -- self.assert_(cr.estvide(),msg='Erreur non attendue:\n%s' % str(cr)) -- co2.etape.supprime() -- co3.etape.supprime() -- -- def test6(self): -- co2=OP6(MATR=CO("xx")) -- co3=OP3(MATR={"CHAM":"R","MM":co2}) -- #print co3.etape.report() -- cr=co2.etape.report() -- #print cr -- self.assert_(cr.estvide(),msg='Erreur non attendue:\n%s' % str(cr)) -- co2.etape.supprime() -- co3.etape.supprime() -- diff --cc Tests/testelem/testoper1.py index 0956ff66,b3866331..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testoper1.py +++ /dev/null @@@ -1,185 -1,185 +1,0 @@@ --# coding=utf-8 --import cata1 --from cata1 import OP1,OP2,OP3,OP4,OP5,OP6,OP7 --from Accas import AsException,ASSD,OPER,SIMP,FACT,BLOC,_F -- --import Noyau -- --class concept(ASSD,Noyau.AsBase):pass -- --import unittest -- --class TestOperCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): -- pass -- -- def test01(self): -- co1=OP1(a=1) -- cr=co1.etape.report() -- self.assert_(cr.estvide()) -- co1.etape.supprime() -- -- def test02(self): -- """ Test fonction sd_prod -- """ -- co1=OP2(TYPE_RESU="TRANS") -- cr=co1.etape.report() -- self.assert_(cr.estvide()) -- co1.etape.supprime() -- -- def test04(self): -- """ Test fonction sd_prod -- Test du type d'un argument avec AsType -- """ -- co1=OP1(a=1) -- co2=OP3(MATR=co1) -- cr=co2.etape.report() -- self.assert_(cr.estvide()) -- co1.etape.supprime() -- co2.etape.supprime() -- -- def test05(self): -- """ Test fonction sd_prod -- Test sur un mot-clé simple d'un mot-clé facteur : mcf[mcs] -- """ -- co1=OP4(MESURE={'NOM_PARA':'INST'}) -- cr=co1.etape.report() -- self.assert_(cr.estvide()) -- co1.etape.supprime() -- -- def test06(self): -- """ Test fonction sd_prod - Test sur un mot-clé simple d'un mot-clé facteur : mcf.get_child(mcs).get_valeur() - Test sur un mot-clé simple d'un mot-clé facteur : mcf.getChild(mcs).getValeur() -- """ -- co2=OP1(a=1) -- co1=OP5(FFT={'FONCTION':co2}) -- cr=co1.etape.report() -- self.assert_(cr.estvide()) -- co1.etape.supprime() -- co2.etape.supprime() -- -- def test07(self): -- """ Test fonction sd_prod -- Test sur un mot-clé simple d'un mot-clé facteur : mcf[0][mcs] -- """ -- co2=OP1(a=1) -- co1=OP6(FILTRE={'MODE':co2}) -- cr=co1.etape.report() -- self.assert_(cr.estvide()) -- co1.etape.supprime() -- co2.etape.supprime() -- -- def test08(self): -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(typ='I'), -- c=SIMP(statut='o',typ='TXM',position='global', -- into=("TABLEAU","AGRAF"), -- ), -- b=FACT(statut='o',max='**', -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ), -- ) -- -- co1=OP10(a=1,c="TABLEAU",b=_F(d='rr')) -- cr=co1.etape.report() -- self.assertEqual(co1.etape['a'],1) -- self.assertEqual(co1.etape['c'],'TABLEAU') -- self.assertEqual(co1.etape['b']['d'],'rr') -- self.assert_(cr.estvide()) -- co1.etape.supprime() -- -- def test09(self): -- co2=OP1(a=1) -- co1=OP5(FFT={'FONCTION':co2}) - l= co1.etape.get_sd_utilisees() - l= co1.etape.getSd_utilisees() -- self.assert_(len(l)==1) -- self.assert_(co2 in l ) - d=co1.etape.get_sd_mcs_utilisees() - d=co1.etape.getSd_mcs_utilisees() -- self.assert_(len(d.keys())==1) -- self.assert_(len(d['FONCTION'])==1) -- self.assert_(co2 in d['FONCTION']) -- co1.etape.supprime() -- co2.etape.supprime() -- -- def test10(self): -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(statut='o',typ='R',max=5), -- ) -- class mylist(list):pass -- valeur=(0,1) -- co1=OP10(a=mylist(valeur)) -- #n,v=co1.etape.getvr8("","a",0,1,3) -- v=tuple(co1.etape["a"]) -- msg="erreur sur le test " +'\n'+str(co1.etape.report()) -- self.assertEqual(v,valeur,msg=msg) -- co1.etape.supprime() -- -- def futuretest11(self): -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(statut='o',typ='R',into=(0,1,2),max=5), -- ) -- class mylist(list):pass -- valeur=(2,0,1) -- co1=OP10(a=mylist(valeur)) -- v=tuple(co1.etape["a"]) -- #n,v=co1.etape.getvr8("","a",0,1,3) -- msg="erreur sur le test " +'\n'+str(co1.etape.report()) -- self.assertEqual(v,valeur,msg=msg) -- co1.etape.supprime() -- -- def futuretest12(self): -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(statut='o',typ='R',into=(2,4,3,5),max=5), -- ) -- class mylist(list):pass -- valeur=(2,0,1) -- co1=OP10(a=mylist(valeur)) -- msg="erreur sur le test " +'\n'+str(co1.etape.report()) - self.assertEqual(co1.etape.isvalid(),0,msg=msg) - self.assertEqual(co1.etape.isValid(),0,msg=msg) -- co1.etape.supprime() -- -- def futuretest13(self): -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(statut='o',typ='R',val_min=0,val_max=3,max=5), -- ) -- class mylist(list):pass -- valeur=(2,0,1) -- co1=OP10(a=mylist(valeur)) -- msg="erreur sur le test " +'\n'+str(co1.etape.report()) - self.assertEqual(co1.etape.isvalid(),1,msg=msg) - self.assertEqual(co1.etape.isValid(),1,msg=msg) -- co1.etape.supprime() -- -- def futuretest14(self): -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(statut='o',typ='R',val_min=0,val_max=1,max=5), -- ) -- class mylist(list):pass -- valeur=(2,0,1) -- co1=OP10(a=mylist(valeur)) -- msg="erreur sur le test " +'\n'+str(co1.etape.report()) - self.assertEqual(co1.etape.isvalid(),0,msg=msg) - self.assertEqual(co1.etape.isValid(),0,msg=msg) -- co1.etape.supprime() -- -- def test15(self): -- """ Test mot cle facteur incorrect -- """ -- co1=OP7(FILTRE="coucou") -- cr=co1.etape.report() -- msg="erreur sur le test " +'\n'+str(cr) - self.assertEqual(co1.etape.isvalid(),0,msg=msg) - self.assertEqual(co1.etape.isValid(),0,msg=msg) -- co1.etape.supprime() -- -- def test16(self): -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(statut='o',typ='R',val_min=0,val_max=1,max=5), -- ) -- valeur=(2,0,1) -- co1=OP10(a=valeur) -- msg="erreur sur le test " +'\n'+str(co1.etape.report()) - self.assertEqual(co1.etape.isvalid(),0,msg=msg) - self.assertEqual(co1.etape.isValid(),0,msg=msg) -- co1.etape.supprime() diff --cc Tests/testelem/testparseur.py index be0f9d18,bee96de7..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testparseur.py +++ /dev/null @@@ -1,108 -1,108 +1,0 @@@ --import unittest --import difflib -- --from convert import parseur_python -- --def cdiff(text1,text2): -- #return " ".join(difflib.unified_diff(text1.splitlines(1),text2.splitlines(1))) -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- #return " ".join(difflib.ndiff(text1.splitlines(1),text2.splitlines(1))) -- --class appli: -- dict_reels={} -- liste_simp_reel=[] -- --class TestCase(unittest.TestCase): -- def test01(self): -- text=""" --MA=LIRE_MAILLAGE() --""" -- expected="""MA=LIRE_MAILLAGE() -- --""" - txt = parseur_python.PARSEUR_PYTHON(text).get_texte(appli()) - txt = parseur_python.PARSEUR_PYTHON(text).getTexte(appli()) -- assert txt == expected, cdiff(expected,txt) -- -- def test02(self): -- text=""" --MA=LIRE_MAILLAGE() --MB=LIRE_MAILLAGE() --""" -- expected="""MA=LIRE_MAILLAGE() -- --MB=LIRE_MAILLAGE() -- --""" - txt = parseur_python.PARSEUR_PYTHON(text).get_texte(appli()) - txt = parseur_python.PARSEUR_PYTHON(text).getTexte(appli()) -- assert txt == expected, cdiff(expected,txt) -- -- def test03(self): -- text=""" --a=1.2 --b=4 --c="aa" --d=5 # parametre d --MA=LIRE_MAILLAGE() --MB=LIRE_MAILLAGE() --""" -- expected=r'''a = PARAMETRE(nom='a',valeur=1.2) --b = PARAMETRE(nom='b',valeur=4) --c = PARAMETRE(nom='c',valeur="aa") --COMMENTAIRE(' parametre d\n') --d = PARAMETRE(nom='d',valeur=5 ) --MA=LIRE_MAILLAGE() -- --MB=LIRE_MAILLAGE() -- --''' - txt = parseur_python.PARSEUR_PYTHON(text).get_texte(appli()) - txt = parseur_python.PARSEUR_PYTHON(text).getTexte(appli()) -- assert txt == expected, cdiff(expected,txt) -- -- def test04(self): -- text=''' --DEBUT(); --a = 1.0; --b = 3; --c = 15; --d = 5; --x = (1, 2); --y = [3, 4]; --y2 = (y * 2); --z = 'a'; --zz = 'v'; --t = a; --v = """aaaa --bbbb"""; --xx = ceil(sqrt(d)); --yy = cos(3.1); --ax = sin(2); --bx = cos(xx); --cx = sin(xx); --zy = y[1]; --FIN(); --''' -- expected='''DEBUT(); -- --a = PARAMETRE(nom='a',valeur= 1.0) --b = PARAMETRE(nom='b',valeur= 3) --c = PARAMETRE(nom='c',valeur= 15) --d = PARAMETRE(nom='d',valeur= 5) --x = PARAMETRE(nom='x',valeur= (1, 2)) --y = PARAMETRE(nom='y',valeur= [3, 4]) --y2 = PARAMETRE(nom='y2',valeur= (y * 2)) --z = PARAMETRE(nom='z',valeur= 'a') --zz = PARAMETRE(nom='zz',valeur= 'v') --t = PARAMETRE(nom='t',valeur= a) --v = PARAMETRE(nom='v',valeur= """aaaa --bbbb""") --xx = PARAMETRE(nom='xx',valeur= ceil(sqrt(d))) --yy = PARAMETRE(nom='yy',valeur= cos(3.1)) --ax = PARAMETRE(nom='ax',valeur= sin(2)) --bx = PARAMETRE(nom='bx',valeur= cos(xx)) --cx = PARAMETRE(nom='cx',valeur= sin(xx)) --zy = PARAMETRE(nom='zy',valeur= y[1]) --FIN(); -- --''' - txt = parseur_python.PARSEUR_PYTHON(text).get_texte(appli()) - txt = parseur_python.PARSEUR_PYTHON(text).getTexte(appli()) -- assert txt == expected, cdiff(expected,txt) diff --cc Tests/testelem/testposition1.py index 84e36f81,da224d56..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testposition1.py +++ /dev/null @@@ -1,256 -1,256 +1,0 @@@ --# coding=utf-8 --import os --import cata3 --from Accas import AsException,ASSD,OPER,SIMP,FACT,BLOC,_F -- --import Noyau -- --class concept(ASSD,Noyau.AsBase):pass -- --import unittest -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.j=cata3.JdC(procedure="",nom="bidon") -- self.j.actif_status=1 - CONTEXT.set_current_step(self.j) - CONTEXT.setCurrentStep(self.j) -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- self.j.supprime() -- -- def test001(self): -- """ Test position = global -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(typ='I'), -- c=SIMP(statut='o',typ='TXM',position='global', -- into=("TABLEAU","AGRAF"), -- ), -- b=FACT(statut='o',max='**', -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ), -- ) -- co1=OP10(a=1,c="TABLEAU",b=_F(d='rr')) -- msg=co1.etape.report() - self.assertEqual(co1.etape.isvalid(),1,msg=msg) - self.assertEqual(co1.etape.isValid(),1,msg=msg) -- -- def test002(self): -- """ Test position=global_jdc -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(typ='I'), -- c=SIMP(statut='o',typ='TXM',position='global_jdc', -- into=("TABLEAU","AGRAF"), -- ), -- ) -- OP11 = OPER(nom='OP11',op=10,sd_prod=concept, -- b=FACT(statut='o',max='**', -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ), -- ) -- co1=OP10(a=1,c="TABLEAU",) -- co2=OP11(b=_F(d='rr')) -- msg=co1.etape.report() - self.assertEqual(co1.etape.isvalid(),1,msg=msg) - self.assertEqual(co1.etape.isValid(),1,msg=msg) -- msg=co2.etape.report() - self.assertEqual(co2.etape.isvalid(),1,msg=msg) - self.assertEqual(co2.etape.isValid(),1,msg=msg) -- -- def test003(self): -- """ Test position=global_jdc -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(typ='I'), -- b=FACT( c=SIMP(statut='o',typ='TXM',position='global_jdc', -- into=("TABLEAU","AGRAF"), -- ), -- ), -- ) -- OP11 = OPER(nom='OP11',op=10,sd_prod=concept, -- b=FACT(statut='o',max='**', -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ), -- ) -- OP12 = OPER(nom='OP12',op=10,sd_prod=concept, -- b=FACT(statut='o',max='**', -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='o',typ='TXM'), -- ), -- ), -- ) -- co1=OP10(a=1,b=_F(c="TABLEAU")) -- co2=OP11(b=_F(d='rr')) -- co3=OP11() -- co4=OP12(b=_F(d='rr')) -- msg=co1.etape.report() - self.assertEqual(co1.etape.isvalid(),1,msg=msg) - self.assertEqual(co1.etape.isValid(),1,msg=msg) -- msg=co2.etape.report() - self.assertEqual(co2.etape.isvalid(),1,msg=msg) - self.assertEqual(co2.etape.isValid(),1,msg=msg) -- msg=co3.etape.report() - self.assertEqual(co3.etape.isvalid(),1,msg=msg) - self.assertEqual(co3.etape.isValid(),1,msg=msg) -- msg=co4.etape.report() - self.assertEqual(co4.etape.isvalid(),1,msg=msg) - self.assertEqual(co4.etape.isValid(),1,msg=msg) -- -- def futuretest004(self): -- """ Test position = global -- """ -- msg0= """ -- PROBLEME : les mots cles globaux ne sont pas forcément vus -- dans les mots cles facteurs (dépendant de l'ordre de création) -- Dans ce test xx est avant b qui est avant g : g voit c mais pas xx. -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(typ='I'), -- b=FACT( c=SIMP(statut='o',typ='TXM',position='global', -- into=("TABLEAU","AGRAF"), -- ), -- ), -- g=FACT(statut='o',max='**', -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ), -- xx=FACT(statut='o',max='**', -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ), -- ) -- co1=OP10(a=1,b=_F(c="TABLEAU"),g=_F(d='rr')) -- msg=msg0+str(co1.etape.report()) - self.assertEqual(co1.etape.isvalid(),1,msg=msg) - self.assertEqual(co1.etape.isValid(),1,msg=msg) -- co2=OP10(a=1,b=_F(c="TABLEAU"),xx=_F(d='rr')) -- msg=msg0+str(co2.etape.report()) - self.assertEqual(co2.etape.isvalid(),1,msg=msg) - self.assertEqual(co2.etape.isValid(),1,msg=msg) -- -- def test005(self): -- """ Test position = global -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(typ='I'), -- g=FACT( c=SIMP(statut='o',typ='TXM',position='global', -- into=("TABLEAU","AGRAF"), -- ), -- ), -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ) -- co1=OP10(a=1,g=_F(c="TABLEAU"),d='rr') -- msg=co1.etape.report() - self.assertEqual(co1.etape.isvalid(),1,msg=msg) - self.assertEqual(co1.etape.isValid(),1,msg=msg) -- -- def test006(self): -- """ Test position = global -- ATTENTION : Un mot cle global, facultatif avec defaut (c) défini dans un mot clé facteur -- n'est pas vu globalement -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- a=SIMP(typ='I'), -- g=FACT(a=SIMP(typ='I'), -- c=SIMP(typ='TXM',position='global',into=("TABLEAU","AGRAF"),defaut="TABLEAU"), -- ), -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ) -- co1=OP10(a=1,g=_F(a=1),d='rr') -- msg=co1.etape.report() - self.assertEqual(co1.etape.isvalid(),0,msg=msg) - self.assertEqual(co1.etape.isValid(),0,msg=msg) -- -- def test007(self): -- """ Test position = global -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- c=SIMP(typ='TXM',position='global',into=("TABLEAU","AGRAF"),defaut="TABLEAU"), -- b=FACT(statut='o',max='**', -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ), -- ) -- co1=OP10(b=_F(d='rr')) -- msg=co1.etape.report() - self.assertEqual(co1.etape.isvalid(),1,msg=msg) - self.assertEqual(co1.etape.isValid(),1,msg=msg) -- -- def test008(self): -- """ Test position = global -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- c=SIMP(typ='TXM',position='global',into=("TABLEAU","AGRAF"),defaut="TABLEAU"), -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ) -- co1=OP10(d='rr') -- msg=co1.etape.report() - self.assertEqual(co1.etape.isvalid(),1,msg=msg) - self.assertEqual(co1.etape.isValid(),1,msg=msg) -- -- def test009(self): -- """ Test position = global -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- c=SIMP(statut='o',typ='TXM',position='global',into=("TABLEAU","AGRAF"),defaut="TABLEAU"), -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ) -- co1=OP10(d='rr') -- msg=co1.etape.report() - self.assertEqual(co1.etape.isvalid(),1,msg=msg) - self.assertEqual(co1.etape.isValid(),1,msg=msg) -- -- def test010(self): -- """ Test position = global -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- g=FACT(a=SIMP(typ='I'), -- c=SIMP(statut='o',typ='TXM',position='global',into=("TABLEAU","AGRAF"),defaut="TABLEAU"), -- ), -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ) -- co1=OP10(g=_F(a=1),d='rr') -- msg=co1.etape.report() - self.assertEqual(co1.etape.isvalid(),1,msg=msg) - self.assertEqual(co1.etape.isValid(),1,msg=msg) -- -- def test011(self): -- """ Test position = global -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- g=FACT(statut='o', -- c=SIMP(statut='o',typ='TXM',position='global',into=("TABLEAU","AGRAF"),defaut="TABLEAU"), -- ), -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ) -- co1=OP10(d='rr') -- msg=co1.etape.report() - self.assertEqual(co1.etape.isvalid(),1,msg=msg) - self.assertEqual(co1.etape.isValid(),1,msg=msg) -- -- def test012(self): -- """ Test position = global -- ATTENTION : Un mot cle global, facultatif avec defaut (c) défini dans un mot clé facteur -- n'est pas vu globalement -- """ -- OP10 = OPER(nom='OP10',op=10,sd_prod=concept, -- g=FACT(statut='o', -- c=SIMP(typ='TXM',position='global',into=("TABLEAU","AGRAF"),defaut="TABLEAU"), -- ), -- b_forme=BLOC(condition="c == 'TABLEAU'", -- d=SIMP(statut='f',typ='TXM'), -- ), -- ) -- co1=OP10(d='rr') -- msg=co1.etape.report() - self.assertEqual(co1.etape.isvalid(),0,msg=msg) - self.assertEqual(co1.etape.isValid(),0,msg=msg) -- co2=OP10(g=_F(c="TABLEAU"),d='rr') -- msg=co2.etape.report() - self.assertEqual(co2.etape.isvalid(),1,msg=msg) - self.assertEqual(co2.etape.isValid(),1,msg=msg) diff --cc Tests/testelem/testsimp0.py index 68b3d43b,68b3d43b..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testsimp0.py +++ /dev/null @@@ -1,47 -1,47 +1,0 @@@ --from Noyau import SIMP -- --import unittest -- --class TestSimpCase(unittest.TestCase): -- def testStatut1(self): -- a=SIMP(typ='I',statut='o') -- cr=a.report() -- self.assert_(cr.estvide()) -- -- def testStatut2(self): -- a=SIMP(typ='I') -- cr=a.report() -- self.assert_(cr.estvide()) -- -- def testStatut3(self): -- a=SIMP(typ='I',statut='s') -- cr=a.report() -- expected_cr=""" -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! L'attribut 'statut' doit valoir 'o','f','c' ou 'd' : 's' ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- --""" -- self.assertEqual(str(cr) , expected_cr) -- -- def testPosition1(self): -- a=SIMP(typ='I',position='total') -- cr=a.report() -- expected_cr=""" -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! L'attribut 'position' doit valoir 'local','global' ou 'global_jdc' : 'total' ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- --""" -- self.assertEqual(str(cr) , expected_cr) -- -- def testMinMax1(self): -- a=SIMP(typ='I',min='**',max=12) -- cr=a.report() -- expected_cr=""" -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Nombres d'occurrence min et max invalides : '**' 12 ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- --""" -- self.assertEqual(str(cr) , expected_cr) diff --cc Tests/testelem/testsimp1.py index 67858ff6,836dc7f3..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testsimp1.py +++ /dev/null @@@ -1,289 -1,289 +1,0 @@@ --# coding=utf-8 --import types --from Accas import SIMP,ASSD,geom,assd --class maillage(ASSD):pass --class maillage_sdaster(ASSD):pass -- --import unittest -- --class TestMCSimpCase(unittest.TestCase): -- def setUp(self): -- self.cata=SIMP(typ='I',statut='o') -- -- def tearDown(self): -- del self.cata -- -- def testStatut1(self): -- o=self.cata(1,'mcs1',None) -- cr=o.report() -- self.assert_(cr.estvide()) -- -- def testStatut2(self): -- o=self.cata(None,'mcs1',None) -- cr=o.report() -- expected_cr="""Mot-clé simple : mcs1 -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé : mcs1 obligatoire non valorisé ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! None n'est pas une valeur autorisée ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs1 --""" -- self.assertEqual(str(cr) , expected_cr) -- -- def testType1(self): -- o=self.cata(1,'mcs1',None) -- cr=o.report() -- expected_cr="""Mot-clé simple : mcs1 --Fin Mot-clé simple : mcs1 --""" -- self.assertEqual(str(cr) , expected_cr) -- -- def test004(self): -- cata=SIMP(typ='shell',statut='o') -- liste=((1,0),("a",1), (1.,0),(('RI',1.,0.),0), (('RI',1,0),0), -- (1+0j,0), ("('RI',1,0)",1), ("toto",1), (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- # Chaines -- def test040(self): -- cata=SIMP(typ='TXM',statut='o') -- liste=((1,0),("a",1), (1.,0),(('RI',1.,0.),0), -- (('RI',1,0),0), (1+0j,0), -- ("('RI',1,0)",1), ("toto",1), (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test041(self): -- cata=SIMP(typ='TXM',statut='o',max=3) -- liste=((1,0),("a",1), (1.,0),(('RI',1.,0.),0), -- (('RI',1,0),0), (1+0j,0), -- (("toot","titi"),1), -- (("toot","titi","tutu"),1), -- (("toot","titi",1),0), -- (("toot","titi","tutu","tata"),0), -- ("('RI',1,0)",1), ("toto",1), (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test042(self): -- cata=SIMP(typ='TXM',statut='o',into=("toto","titi"),max=3) -- liste=((1,0),("a",0), (1.,0),(('RI',1.,0.),0), -- (('RI',1,0),0), (1+0j,0), -- (("toto","titi"),1), -- (("toot","titi","tutu"),0), -- (("toot","titi",1),0), -- (("toot","titi","tutu","tata"),0), -- ("('RI',1,0)",0), ("toto",1), (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test043(self): -- cata=SIMP(typ='TXM',statut='o',into=("toto","titi"),min=2,max=3) -- liste=((1,0),("a",0), (1.,0),(('RI',1.,0.),0), -- (('RI',1,0),0), (1+0j,0), -- (("toto","titi"),1), -- (("toot","titi","tutu"),0), -- (("toot","titi",1),0), -- (("toot","titi","tutu","tata"),0), -- ("('RI',1,0)",0), ("toto",0), (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- # Reels -- def test020(self): -- cata=SIMP(typ='R',statut='o',max=4) -- liste=((1,1),("a",0), (1.,1),(('RI',1.,0.),0), ((1.,2.,3.),1), -- ((1.,2.,3.,4.),1), ((1.,2.,3.,4.,5.),0), ("toto",0), (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test021(self): -- cata=SIMP(typ='R',statut='o',min=2,max=4) -- liste=((1,0),("a",0), (1.,0),(('RI',1.,0.),0), -- ((1.,2.),1), ((1.,2.,3.),1), ((1.,2.,3.,4.),1), -- ((1.,2.,3.,4.,5.),0), ("toto",0), (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- -- def test022(self): -- cata=SIMP(typ='R',statut='o',val_min=2,val_max=4) -- liste=((1,0),("a",0), (1.,0),(('RI',1.,0.),0), (3,1), -- (6,0), ((1.,2.),0), ((1.,2.,3.),0), ((1.,2.,3.,4.),0), -- ((1.,2.,3.,4.,5.),0), ("toto",0), (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test023(self): -- cata=SIMP(typ='R',statut='o',val_min=2,val_max=4,max=4) -- liste=((1,0),("a",0), (1.,0),(('RI',1.,0.),0), (3,1), -- (6,0), ((1.,6.),0), ((3.,2.),1), ((1.,2.,3.),0), -- ((1.,2.,3.,4.),0), ((1.,2.,3.,4.,5.),0), ("toto",0), -- (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test024(self): -- cata=SIMP(typ='R',statut='o') -- liste=((1,1),("a",0), (1.,1),(('RI',1.,0.),0), (('RI',1,0),0), -- (1+0j,0), ("('RI',1,0)",0), ((1.,2.,3.),0), ("toto",0), -- (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- -- # Entiers -- def test030(self): -- cata=SIMP(typ='I',statut='o') -- liste=((1,1),("a",0), (1.1,0),(('RI',1.,0.),0), -- (('RI',1,0),0), (1+0j,0), ("1",0), ("toto",0), (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test031(self): -- cata=SIMP(typ='I',statut='o',into=(1,5,8),max=4) -- liste=((1,1),("a",0), ("toto",0), (None,0), -- (1.1,0),(('RI',1.,0.),0), -- (3,0), (6,0), ((1,5),1), ((1,5,8),1), ((1,5,8,5),1), -- ((1,5,8,5,1),0), ((1.,6.),0), ((3.,2.),0), ((1.,2.,3.),0), -- ((1.,2.,3.,4.),0), ((1.,2.,3.,4.,5.),0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- # Complexes -- def test010(self): -- cata=SIMP(typ='C',statut='o',into=(('RI',1,0),('RI',2,0),('RI',3,0)),max=4) -- liste=((1,0),("a",0), (1.,0),(('RI',1.,0.),1), ("toto",0), (None,0), -- ((('RI',1.,0.),('RI',2,0)),1), -- ((('RI',1.,0.),('RI',2,0),('RI',3,0)),1), -- ((('RI',1.,0.),('RI',2,0),('RI',3,0),('RI',3,0)),1), -- ((('RI',1.,0.),('RI',2,0),('RI',3,0),('RI',3,0),('RI',1,0)),0), -- ((1,5),0), ((1,5,8,5,1),0), -- ((1.,6.),0), ((3.,2.),0), ((1.,2.,3.),0), ((1.,2.,3.,4.,5.),0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test011(self): -- cata=SIMP(typ='C',statut='o',max=3) -- liste=((1,1),("a",0), (1.,1),(('RI',1.,0.),1), ("toto",0), (None,0), -- ((('RI',1.,0.),('RI',2,0)),1), -- ((('RI',1.,0.),('RI',2,0),('RI',3,0)),1), -- ((('RI',1.,0.),('RI',2,0),('RI',3,0),('RI',3,0)),0), -- ((('RI',1.,0.),('RI',2,0),('RI',3,0),('RI',3,0),('RI',1,0)),0), -- ((1,5),1), ((1,5,8,5,1),0), -- ((1.,6.),1), ((3.,2.),1), ((1.,2.,3.),1), ((1.,2.,3.,4.,5.),0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test012(self): -- cata=SIMP(typ='C',statut='o') -- liste=((1,1),("a",0), (1.,1),(('RI',1.,0.),1), (('RI',1,0),1), (1+0j,1), -- ("('RI',1,0)",0), ("toto",0), (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test013(self): -- cata=SIMP(typ=('R',maillage),statut='o') -- liste=((1,1), -- (maillage(),1), -- (maillage_sdaster(),0), -- ("aa",0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid, - self.assertEqual(o.isValid(),valid, -- "erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test014(self): -- cata=SIMP(typ=geom,statut='o') -- liste=((1,0), -- ("aaaa",1), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid, - self.assertEqual(o.isValid(),valid, -- "erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test015(self): -- cata=SIMP(typ=assd,statut='o') -- liste=((1,1), -- ("aaaa",1), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid, - self.assertEqual(o.isValid(),valid, -- "erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test016(self): -- class LongStr: -- def __init__(self,min,max): -- self.min=min -- self.max=max -- def __convert__(self,valeur): -- if type(valeur) == types.StringType: -- if self.min < len(valeur) < self.max:return valeur -- return None -- -- cata=SIMP(typ=LongStr(5,8),statut='o') -- liste=(("aaaaaa",1), -- ("aaaaaaa",1), -- ("aaaaaaaaaaaaaaa",0), -- ("aa",0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid, - self.assertEqual(o.isValid(),valid, -- "erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - if valid: self.assertEqual(o.getValeur(),valeur) -- diff --cc Tests/testelem/testsimp2.py index e472dd26,40f0059b..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testsimp2.py +++ /dev/null @@@ -1,64 -1,64 +1,0 @@@ --# coding=utf-8 --from Accas import SIMP,ASSD -- --import unittest -- --class TestSimpCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): -- pass -- -- def test001(self): -- cata=SIMP(statut='o',typ='TXM',defaut="d") -- liste=((1,0),("a",1), (1.,0),(('RI',1.,0.),0), (('RI',1,0),0), -- (1+0j,0), ("('RI',1,0)",1), ("toto",1), (None,1), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) -- msg="erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report()) - self.assertEqual(o.isvalid(),valid,msg=msg) - self.assertEqual(o.isValid(),valid,msg=msg) -- -- def test002(self): -- cata=SIMP(statut='f',typ='TXM',defaut="d") -- liste=((1,0),("a",1), (1.,0),(('RI',1.,0.),0), (('RI',1,0),0), -- (1+0j,0), ("('RI',1,0)",1), ("toto",1), (None,1), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) -- msg="erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report()) - self.assertEqual(o.isvalid(),valid,msg=msg) - self.assertEqual(o.isValid(),valid,msg=msg) -- -- def test003(self): -- cata=SIMP(statut='o',typ='R',max=3) -- class mylist(list):pass -- liste=((1,1),(mylist((0.,1.)),1), (1.,1),(mylist((0.,1.)),1), (('RI',1,0),0), -- (1+0j,0), ("('RI',1,0)",0), ("toto",0), (None,0), -- (mylist(("aaaa",1.)),0), (mylist((0.,1.,2.,3.)),0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) -- msg="erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report()) - self.assertEqual(o.isvalid(),valid,msg=msg) - self.assertEqual(o.isValid(),valid,msg=msg) -- -- def test004(self): -- cata=SIMP(statut='f',typ=('R','I'),max=5) -- liste=((1,1),(1.5,1), ((1,2),1), -- ((2.3,3.4),1),((1,2.0),1), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) -- msg="erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report()) - self.assertEqual(o.isvalid(),valid,msg=msg) - self.assertEqual(o.isValid(),valid,msg=msg) -- -- def _test005(self): -- cata=SIMP(statut='f',typ='I',max=5) -- liste=((1,1),(1.0,1), ((1,2),1), -- ((2.3,3.4),0),((1,2.0),1), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) -- msg="erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report()) - self.assertEqual(o.isvalid(),valid,msg=msg) - self.assertEqual(o.isValid(),valid,msg=msg) -- diff --cc Tests/testelem/testsimp3.py index 51891e9a,51891e9a..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testsimp3.py +++ /dev/null @@@ -1,138 -1,138 +1,0 @@@ --# coding=utf-8 --from Accas import * -- --import unittest --import compare --OK="""Mot-clé simple : mcs --Fin Mot-clé simple : mcs --""" --class myparam: -- def __init__(self,valeur): -- self.valeur=valeur -- def __adapt__(self,protocol): -- return protocol.adapt(self.valeur) -- --from Noyau.N_VALIDATOR import listProto,TypeProtocol,IntoProtocol --class param: -- def __init__(self,valeur): -- self.valeur=valeur -- --def hasvaleur(obj,protocol,**args): -- return protocol.adapt(obj.valeur) -- --listProto.register(param,hasvaleur) --TypeProtocol.register(param,hasvaleur) --IntoProtocol.register(param,hasvaleur) -- -- --class TestValidCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): -- pass -- -- def _test(self,cata,liste): -- for valeur,report in liste: -- o=cata(valeur,'mcs',None) -- msg="" -- rep=str(o.report()) -- valid=compare.check(rep,report) -- if not valid: -- msg="le rapport d'erreur est incorrect.\n valeur = %s\n expected =\n%s\n got =\n%s " % (valeur,report,rep) -- print msg -- self.assert_(valid,msg=msg) -- -- def test010(self): -- """Test de listes de string""" -- cata=SIMP(statut='o',typ='TXM',min=1,max=6) -- liste=( -- ("aa",OK),("aaa",OK), -- (("aaaa","aaaaa","axyzaa","bbbbaaa","zzz"),OK), -- (("aaaa","aaaa","axyz","bbbb","zzz"),OK), -- (("aaaa","axyz","bbbb","zzz"),OK), -- ("aaaa",OK),("aaaaa",OK), -- ("axyzaa",OK),("bbbbaaa",OK), -- ) -- self._test(cata,liste) -- -- def test011(self): -- """Test de listes de string avec into""" -- cata=SIMP(statut='o',typ='TXM',min=1,max=6,into =( "TUTU","TATA","CCCC")) -- liste=( -- ("TUTU",OK),("TATA",OK), -- (("TUTU","TATA","CCCC"),OK), -- (("TUTU","TATA","CCCC","TUTU","TATA","CCCC"),OK), -- (("TUTU","TATA","CCCC","TUTU","TATA","CCCC","TUTU","TATA","CCCC"), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Nombre d'arguments de ('TUTU', 'TATA', 'CCCC', 'TUTU', 'TATA', 'CCCC', 'TUTU', ! -- ! 'TATA', 'CCCC') incorrect (min = 1, max = 6) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- (("TUTU","TATA","CCCC","TUTU","TATA",1,"TUTU","TATA","CCCC"), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 1 (de type ) n'est pas d'un type autorisé: ('TXM',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! La valeur : 1 ne fait pas partie des choix possibles ('TUTU', 'TATA', 'CCCC') ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Nombre d'arguments de ('TUTU', 'TATA', 'CCCC', 'TUTU', 'TATA', 1, 'TUTU', 'TATA', ! -- ! 'CCCC') incorrect (min = 1, max = 6) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- ) -- self._test(cata,liste) -- -- def test016(self): -- """Test de listes d'entiers """ -- cata=SIMP(statut='o',typ='I',min=1,max=6) -- liste=( ((2,),OK),(None, --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé : mcs obligatoire non valorisé ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! None n'est pas une valeur autorisée ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- ((1,3,5),OK), -- ((2,4,6),OK), -- ((2,4,4),OK), -- (myparam((2,4,4)),OK), -- (myparam((2,4.5,4)), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 4.5 (de type ) n'est pas d'un type autorisé: ('I',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- (myparam((2,myparam(4.5),4)), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 4.5 (de type ) n'est pas d'un type autorisé: ('I',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- (param((2,4,4)),OK), -- (param((2,4.5,4)), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 4.5 (de type ) n'est pas d'un type autorisé: ('I',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- (param((2,param(4.5),4)), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 4.5 (de type ) n'est pas d'un type autorisé: ('I',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- ) -- self._test(cata,liste) diff --cc Tests/testelem/testsimp4.py index 40f3c41f,40f3c41f..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testsimp4.py +++ /dev/null @@@ -1,124 -1,124 +1,0 @@@ --# coding=utf-8 --from Accas import SIMP,ASSD --class maillage(ASSD):pass --class maillage_sdaster(ASSD):pass -- --import unittest -- --class TestMCSimpCase(unittest.TestCase): -- def setUp(self): -- self.cata=SIMP(typ='I',statut='o') -- -- def tearDown(self): -- del self.cata -- -- def test001(self): -- cata=SIMP(typ='I',max=5) -- o=cata((1,2,'aa','bb',7,'cc'),'mcs1',None) -- cr=o.report() -- expected_cr="""Mot-clé simple : mcs1 -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 'aa' (de type ) n'est pas d'un type autorisé: ('I',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Nombre d'arguments de (1, 2, 'aa', 'bb', 7, 'cc') incorrect (min = 1, max = 5) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs1 --""" -- self.assertEqual(str(cr) , expected_cr,msg='Erreur :\n%s\n!=\n%s' % (str(cr),expected_cr)) -- -- def test002(self): -- cata=SIMP(typ='I',max=7,into=(1,2,'aa','bb',7,'cc')) -- o=cata((1,2,'aa','bb',7,'cc'),'mcs1',None) -- cr=o.report() -- expected_cr="""Mot-clé simple : mcs1 -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 'aa' (de type ) n'est pas d'un type autorisé: ('I',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs1 --""" -- self.assertEqual(str(cr) , expected_cr,msg='Erreur :\n%s\n!=\n%s' % (str(cr),expected_cr)) -- -- def test003(self): -- cata=SIMP(typ='R',max=7,into=(1,2,7)) -- o=cata((1,2,7,3,4,5,6),'mcs1',None) -- cr=o.report() -- expected_cr="""Mot-clé simple : mcs1 -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! La valeur : 3.0 ne fait pas partie des choix possibles (1, 2, 7) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs1 --""" -- self.assertEqual(str(cr) , expected_cr,msg='Erreur :\n%s\n!=\n%s' % (str(cr),expected_cr)) -- -- def test004(self): -- cata=SIMP(typ='R',max=7,val_max=6) -- o=cata((1,2,7,3,4,5,6),'mcs1',None) -- cr=o.report() -- expected_cr="""Mot-clé simple : mcs1 -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! La valeur : 7.0 est en dehors du domaine de validité [ ** , 6 ] ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs1 --""" -- self.assertEqual(str(cr) , expected_cr,msg='Erreur :\n%s\n!=\n%s' % (str(cr),expected_cr)) -- -- def test005(self): -- cata=SIMP(typ='R',max=6,val_max=6) -- o=cata((1,2,7,3,4,5,6),'mcs1',None) -- cr=o.report() -- expected_cr="""Mot-clé simple : mcs1 -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! La valeur : 7.0 est en dehors du domaine de validité [ ** , 6 ] ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Nombre d'arguments de (1.0, 2.0, 7.0, 3.0, 4.0, 5.0, 6.0) incorrect (min = 1, ! -- ! max = 6) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs1 --""" -- self.assertEqual(str(cr) , expected_cr,msg='Erreur :\n%s\n!=\n%s' % (str(cr),expected_cr)) -- -- def test006(self): -- cata=SIMP(typ='R',max=6,val_max=6) -- o=cata((1,2,7,"aa",4,"bb",6),'mcs1',None) -- cr=o.report() -- expected_cr="""Mot-clé simple : mcs1 -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 'aa' (de type ) n'est pas d'un type autorisé: ('R',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! La valeur : 7.0 est en dehors du domaine de validité [ ** , 6 ] ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Nombre d'arguments de (1.0, 2.0, 7.0, 'aa', 4.0, 'bb', 6.0) incorrect (min = 1, ! -- ! max = 6) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs1 --""" -- self.assertEqual(str(cr) , expected_cr,msg='Erreur :\n%s\n!=\n%s' % (str(cr),expected_cr)) -- -- def futuretest007(self): -- """ -- Ce test échoue alors qu'il ne devrait pas. Le parametre de definiton homo -- qui vaut 1 par defaut indique que la liste devrait etre homogene en type -- ce qui n'est pas le cas. -- """ -- cata=SIMP(typ=('R','TXM'),max=6,val_max=6) -- o=cata((1,2,7,"aa",4,"bb",6),'mcs1',None) -- cr=o.report() -- expected_cr="""Mot-clé simple : mcs1 -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 'aa' n'est pas d'un type autorisé ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! La valeur : 7 du mot-clé mcs1 est en dehors du domaine de validité [ 6 , 6 ] ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Nombre d'arguments de (1, 2, 7, 'aa', 4, 'bb', 6) incorrect pour mcs1 (min = 1, ! -- ! max = 6) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs1 --""" -- self.assertEqual(str(cr) , expected_cr,msg='Erreur :\n%s\n!=\n%s' % (str(cr),expected_cr)) -- diff --cc Tests/testelem/testsimp5.py index 3be579f9,5414c011..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testsimp5.py +++ /dev/null @@@ -1,98 -1,98 +1,0 @@@ --# coding=utf-8 --from Accas import SIMP,ASSD --from Extensions.param2 import Variable,cos -- --import unittest -- --class TestSimpCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): -- pass -- -- def test001(self): -- a=Variable("n",25.6) -- self.assertEqual(repr(a),"Variable('n',25.6)") -- self.assertEqual(str(a),"n") -- self.assertEqual(a.eval(),25.6) -- b=-a -- self.assertEqual(str(b),"-(n)") -- self.assertEqual(b.eval(),-25.6) -- b=-a*100+3/2 -- self.assertEqual(str(b),'((-(n) * 100) + 1)') -- self.assertEqual(b.eval(),-2559) -- b=a/10 -- self.assertEqual(str(b),'(n / 10)') -- self.assertEqual(b.eval(),2.56) -- c=Variable('q',[1,a,3]) -- d=c[1]/3 -- self.assertEqual(str(d),'(q[1] / 3)') -- self.assertEqual(d.eval(),25.6/3) -- f=cos(d) -- self.assertEqual(str(f),'cos((q[1] / 3))') -- self.assertEqual(f.eval(),-0.628288791022798) -- g=a**2 -- self.assertEqual(str(g),'(n ** 2)') -- self.assertEqual(g.eval(),655.36000000000013) -- h=2*Variable("x",2) -- g=a**h -- self.assertEqual(str(g),'(n ** (2 * x))') -- self.assertEqual(g.eval(),429496.72960000008) -- -- def test003(self): -- """ Validation d'un parametre (instance de la classe Variable) -- """ -- cata=SIMP(statut='o',typ='R',max=3) -- liste=((1,1),(Variable('x',(0.,1.)),1), (1.,1),(Variable('x',(0.,1.)),1), (('RI',1,0),0), -- (1+0j,0), ("('RI',1,0)",0), ("toto",0), (None,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) -- #print o.val,o.valeur -- msg="erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report()) - self.assertEqual(o.isvalid(),valid,msg=msg) - self.assertEqual(o.isValid(),valid,msg=msg) -- -- def test004(self): -- cata=SIMP(typ='C',statut='o',max=10) -- liste=((1,1),("a",0), (1.,1),(('RI',1.,0.),1), (('RI',1,0),1), (1+0j,1), -- (('RI',Variable('x',1.),0.),1), -- (Variable('x',1.),1), -- (Variable('x',1.)+0j,1), -- ((Variable('x',1.)+0j,1.,0.,Variable('x',1.+2j),Variable('x',Variable('y',1.)+2j)),1), -- ("('RI',1,0)",0), ("toto",0), (None,0), -- (Variable('x',(1,2,2+5j)),1), -- (Variable('x',(1,2,2+5j,5,6,7,8,9,10,11,12)),0), -- (Variable('x',(1,2,2+5j,5,6,Variable('y',1+4j),8,9,10,11,12)),0), -- (Variable('x',(1,"aaaa",2+5j,5,6,Variable('y',1+4j),8,9,10,11,12)),0), -- (1+Variable('x',1.)*1j,1), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) -- -- def test005(self): -- t=Variable('t',None) -- assert len(t) == 0 -- -- def test006(self): -- cata=SIMP(statut='o',typ='R',val_min=0,val_max=3,max=5) -- liste=((1,1),("a",0), (1.,1),(('RI',1.,0.),0), (('RI',1,0),0), (1+0j,0), -- (('RI',Variable('x',1.),0.),0), -- (Variable('x',1.),1), -- (Variable('x',1.)+0j,0), -- ((Variable('x',1.)+0j,1.,0.,Variable('x',1.+2j),Variable('x',Variable('y',1.)+2j)),0), -- ("('RI',1,0)",0), ("toto",0), (None,0), -- (Variable('x',(1,2,2+5j)),0), -- (Variable('x',(1,2,2+5j,5,6,7,8,9,10,11,12)),0), -- (Variable('x',(1,2,2+5j,5,6,Variable('y',1+4j),8,9,10,11,12)),0), -- (Variable('x',(1,"aaaa",2+5j,5,6,Variable('y',1+4j),8,9,10,11,12)),0), -- (1+Variable('x',1.)*1j,0), -- (Variable('x',4.),0), -- (4.,0), -- ) -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) - self.assertEqual(o.isvalid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.isValid(),valid,"erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())) - if valid: self.assertEqual(o.getValeur(),valeur) diff --cc Tests/testelem/testvalidator1.py index da260a84,9de2c004..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testvalidator1.py +++ /dev/null @@@ -1,215 -1,215 +1,0 @@@ --# coding=utf-8 --from Accas import * -- --import unittest -- --class myparam: -- def __init__(self,valeur): -- self.valeur=valeur -- def __adapt__(self,protocol): -- return protocol.adapt(self.valeur) -- --from Noyau.N_VALIDATOR import listProto,TypeProtocol,IntoProtocol --class param: -- def __init__(self,valeur): -- self.valeur=valeur -- --def hasvaleur(obj,protocol,**args): -- return protocol.adapt(obj.valeur) -- --listProto.register(param,hasvaleur) --TypeProtocol.register(param,hasvaleur) --IntoProtocol.register(param,hasvaleur) --OrdList.register(param,hasvaleur) -- --class TestValidCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): -- pass -- -- def _test(self,cata,liste): -- for valeur,valid in liste: -- o=cata(valeur,'mcs',None) -- msg=None - if valid != o.isvalid() : - if valid != o.isValid() : -- if not valid: -- msg="erreur : le mot cle devrait etre invalide. valeur = %s, valid = %s " % (valeur,valid) -- else: -- msg="erreur : le mot cle devrait etre valide. valeur = %s, valid = %s " % (valeur,valid) + '\n' + str(o.report()) - self.assertEqual(o.isvalid(),valid,msg) - self.assertEqual(o.isValid(),valid,msg) -- if valid: - self.assertEqual(o.get_valeur(),valeur) - self.assertEqual(o.getValeur(),valeur) -- -- def test001(self): -- cata=SIMP(typ='TXM',validators=LongStr(3,5)) -- liste=(("aa",0),("aaa",1), -- ("aaaa",1),("aaaaa",1), -- ("axyzaa",0),("bbbbaaa",0), -- ) -- self._test(cata,liste) -- -- def test002(self): -- cata=SIMP(statut='o',typ='TXM',min=1,max=4,validators=LongStr(3,5)) -- liste=( -- ("aa",0),("aaa",1), -- (("aaaa","aaaaa","axyzaa","bbbbaaa","zzz"),0), -- (("aaaa","aaaaa","axyz","bbbb","zzz"),0), -- (("aaaa","axyz","bbbb","zzz"),1), -- ("aaaa",1),("aaaaa",1), -- ("axyzaa",0),("bbbbaaa",0), -- (("aaaa",param("axyz"),"bbbb","zzz"),1), -- ) -- self._test(cata,liste) -- -- def test003(self): -- cata=SIMP(statut='o',typ='I',validators=TypeVal(1)) -- liste=( -- (1,1),(1.1,0),(1.25,0), -- (('RI',0.,1.),0), -- ) -- self._test(cata,liste) -- -- def test004(self): -- cata=SIMP(statut='o',typ='I',into=(1,2,3,4,5,6),max='**',validators=OrdList("croissant")) -- liste=( -- (1,1),((1,3),1), -- ((3,1),0), -- ((1,3,2),0), -- ((1.1,2.),0), -- (myparam((1.,2.)),0), -- (myparam((1,2)),1), -- (myparam((1,2,3,4,5)),1), -- (myparam((1,2,myparam(3),4,5)),1), -- (myparam((1,2,myparam(6),4,5)),0), -- (param((1.,2.)),0), -- (param((1,2)),1), -- (param((1,2,3,4,5)),1), -- (param((1,2,myparam(3),4,5)),1), -- (param((1,2,param(3),4,5)),1), -- (param((1,2,param(6),4,5)),0), -- ) -- self._test(cata,liste) -- -- def test005(self): -- cata=SIMP(statut='o',typ='I',validators=EnumVal((3,2,4,8,9,15))) -- liste=( -- (1,0),(9,1),(15,1), -- (50,0),(1.25,0), -- ) -- self._test(cata,liste) -- -- def test006(self): -- cata=SIMP(statut='o',typ='I',max='**',validators=OrdList("croissant")) -- liste=( -- (1,1),((1,3),1), -- ((50,60,701),1), -- ((100,50,60,701),0), -- ((3,1),0), -- ((1,3,2),0), -- ((1.1,2.),0), -- ) -- self._test(cata,liste) -- -- def test007(self): -- cata=SIMP(statut='o',typ='I',min=1,max=4,validators=PairVal()) -- liste=( -- (2,1),((2,4),1), -- (3,0),((3,4),0), -- ((2,3),0),((3,5),0), -- ((2,4,6,8),1), -- ((2,4,6,8,10),0), -- ) -- self._test(cata,liste) -- -- def test008(self): -- cata=SIMP(statut='o',typ='I',validators=RangeVal(3,15)) -- liste=( -- (2,0),(4,1), -- (16,0),(14,1), -- ) -- self._test(cata,liste) -- -- def test009(self): -- cata=SIMP(statut='o',typ='I',max='**',validators=CardVal(3,15)) -- liste=( -- (2,0),((2,4),0), -- (3,0),((3,4),0), -- ((2,3),0),((3,5),0), -- ((2,4,6,8),1), -- ((2,4,6,8,10),1), -- ) -- self._test(cata,liste) -- -- def test010(self): -- cata=SIMP(statut='o',typ='TXM',min=1,max=6,validators=NoRepeat()) -- liste=( -- ("aa",1),("aaa",1), -- (("aaaa","aaaaa","axyzaa","bbbbaaa","zzz"),1), -- (("aaaa","aaaa","axyz","bbbb","zzz"),0), -- (("aaaa","axyz","bbbb","zzz"),1), -- ("aaaa",1),("aaaaa",1), -- ("axyzaa",1),("bbbbaaa",1), -- (("aaaa",param("aaaaa"),"axyzaa","bbbbaaa","zzz"),1), -- (("aaaa",param("aaaa"),"axyzaa","bbbbaaa","zzz"),0), -- (("aaaa",myparam("aaaaa"),"axyzaa","bbbbaaa","zzz"),1), -- (("aaaa",myparam("aaaa"),"axyzaa","bbbbaaa","zzz"),0), -- ) -- self._test(cata,liste) -- -- def test011(self): -- cata=SIMP(statut='o',typ='TXM',min=1,max=6,into =( "TUTU","TATA","CCCC"),validators=NoRepeat()) -- liste=( -- ("TUTU",1),("TATA",1), -- (("TUTU","TATA","CCCC"),1), -- (("TUTU","TATA","CCCC","TUTU","TATA","CCCC"),0), -- (("TUTU","TATA","CCCC","TUTU","TATA","CCCC","TUTU","TATA","CCCC"),0), -- ) -- self._test(cata,liste) -- -- def test012(self): -- cata=SIMP(statut='o',typ='I',min=1,max=1,into =( 1,2,3),validators=PairVal()) -- liste=( -- (2,1),(1,0),(3,0),(4,0), -- (param(2),1),(param(3),0), -- (myparam(2),1),(myparam(3),0), -- ) -- self._test(cata,liste) -- -- def test013(self): -- cata=SIMP(statut='o',typ='I',min=1,max=1,validators=PairVal()) -- liste=( -- (2,1),(1,0),(3,0),(4,1), -- ) -- self._test(cata,liste) -- -- def test014(self): -- cata=SIMP(statut='o',typ='I',min=1,max=6,validators=PairVal()) -- liste=( -- (2,1),(1,0),(3,0),(4,1), -- ((2,4,6,8),1),((2,4,6,8,10,12,14),0), -- ((2,4,6,8,7),0),((2,4,6,8,10,12,14,23),0), -- ) -- self._test(cata,liste) -- -- def test015(self): -- """Test du validateur OU : pas de doublon OU valeur paire """ -- cata=SIMP(statut='o',typ='I',min=1,max=6,validators=(NoRepeat(),PairVal())) -- liste=( -- (2,1),(1,1),(3,1),(4,1), -- ((2,4,6,8),1),((2,4,6,8,10,12,14),0), -- ((1,2,3,4),1), -- ((2,4,6,8,7),1),((2,4,6,8,10,12,14,23),0), -- ) -- self._test(cata,liste) -- -- def test016(self): -- """Test du validateur ET : pas de doublon ET valeur paire """ -- cata=SIMP(statut='o',typ='I',min=1,max=6,validators=[NoRepeat(),PairVal()]) -- liste=( (2,1),(None,0),((1,3,5),0), -- ((2,4,6),1), -- ((1,3,5),0), -- ((2,4,4),0), -- ) -- self._test(cata,liste) diff --cc Tests/testelem/testvalidator2.py index f78f8433,f78f8433..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/testvalidator2.py +++ /dev/null @@@ -1,323 -1,323 +1,0 @@@ --# coding=utf-8 --from Accas import * --from Extensions.param2 import Variable -- --import unittest --import compare --OK="""Mot-clé simple : mcs --Fin Mot-clé simple : mcs --""" --from cata5 import entier -- --class TestValidCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): -- pass -- -- def _test(self,cata,liste): -- for valeur,report in liste: -- o=cata(valeur,'mcs',None) -- msg="" -- rep=str(o.report()) -- valid=compare.check(rep,report) -- if not valid: -- msg="le rapport d'erreur est incorrect.\n valeur = %s\n expected =\n%s\n got =\n%s " % (valeur,report,rep) -- self.assert_(valid,msg=msg) -- -- def test001(self): -- """ Validateur LongStr(3,5) """ -- cata=SIMP(typ='TXM',validators=LongStr(3,5)) -- liste=(("aa", --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : 'aa' n'est pas de la bonne longueur ! -- ! Critere de validite: longueur de la chaine entre 3 et 5 ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""),("aaa",OK), -- ("aaaa",OK),("aaaaa",OK), -- ("axyzaa", --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : 'axyzaa' n'est pas de la bonne longueur ! -- ! Critere de validite: longueur de la chaine entre 3 et 5 ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""),("bbbbaaa", --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : 'bbbbaaa' n'est pas de la bonne longueur ! -- ! Critere de validite: longueur de la chaine entre 3 et 5 ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- (Variable('x',"aaa"),OK), -- (Variable('x',"aaaaaaaaaaaa"), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : 'aaaaaaaaaaaa' n'est pas de la bonne longueur ! -- ! Critere de validite: longueur de la chaine entre 3 et 5 ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- ) -- self._test(cata,liste) -- -- def test010(self): -- cata=SIMP(statut='o',typ='TXM',min=1,max=6,validators=NoRepeat()) -- liste=( -- ("aa",OK),("aaa",OK), -- (("aaaa","aaaaa","axyzaa","bbbbaaa","zzz"),OK), -- (("aaaa","aaaa","axyz","bbbb","zzz"), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : aaaa est un doublon ! -- ! Critere de validite: : pas de présence de doublon dans la liste ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- (("aaaa","axyz","bbbb","zzz"),OK), -- ("aaaa",OK),("aaaaa",OK), -- ("axyzaa",OK),("bbbbaaa",OK), -- (("aaa",Variable('x',"bbb")),OK), -- (("aaa",Variable('x',"aaa")), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : aaa est un doublon ! -- ! Critere de validite: : pas de présence de doublon dans la liste ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- (Variable('x',("aaa","bbb")),OK), -- (Variable('x',("aaa","bbb","bbb")), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : bbb est un doublon ! -- ! Critere de validite: : pas de présence de doublon dans la liste ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- ) -- self._test(cata,liste) -- -- def test011(self): -- cata=SIMP(statut='o',typ='TXM',min=1,max=6,into =( "TUTU","TATA","CCCC"),validators=NoRepeat()) -- liste=( -- ("TUTU",OK),("TATA",OK), -- (("TUTU","TATA","CCCC"),OK), -- (("TUTU","TATA","CCCC","TUTU","TATA","CCCC"), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : TUTU est un doublon ! -- ! Critere de validite: : pas de présence de doublon dans la liste ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- (("TUTU","TATA","CCCC","TUTU","TATA","CCCC","TUTU","TATA","CCCC"), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Nombre d'arguments de ('TUTU', 'TATA', 'CCCC', 'TUTU', 'TATA', 'CCCC', 'TUTU', ! -- ! 'TATA', 'CCCC') incorrect (min = 1, max = 6) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- ) -- self._test(cata,liste) -- -- def test016(self): -- """Test du validateur ET : pas de doublon ET valeur paire """ -- cata=SIMP(statut='o',typ='I',min=1,max=6,validators=[NoRepeat(),PairVal()]) -- liste=( ((2,),OK),(None, --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé : mcs obligatoire non valorisé ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! None n'est pas une valeur autorisée ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""),((1,3,5), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : (1, 3, 5) contient des valeurs non paires ! -- ! Critere de validite: : pas de présence de doublon dans la liste ! -- ! et valeur paire ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- ((2,4,6),OK), -- ((2,4,4), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : 4 est un doublon ! -- ! Critere de validite: : pas de présence de doublon dans la liste ! -- ! et valeur paire ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- ) -- self._test(cata,liste) -- -- def test017(self): -- """Test du validateur NoRepeat avec objet entier """ -- cata=SIMP(statut='o',typ='I',min=1,max=6,validators=NoRepeat()) -- i=entier() -- liste=( (i,OK), -- ((i,i),OK), -- ((1,i,i),OK), -- ((i,1,i,i),OK), -- ((1,1,i,i), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : 1 est un doublon ! -- ! Critere de validite: : pas de présence de doublon dans la liste ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --""" ), -- ) -- self._test(cata,liste) -- -- def test018(self): -- """Test du validateur OrdList('croissant') avec objet entier """ -- cata=SIMP(statut='o',typ='I',min=1,max=6,validators=OrdList('croissant')) -- i=entier() -- liste=( (i,OK), -- ((i,i),OK), -- ((1,i,i),OK), -- ((i,1,i,i),OK), -- ((2,1,i,i), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : (2, 1, , ) n'est pas par ! -- ! valeurs croissantes ! -- ! Critere de validite: liste croissant ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --"""), -- ) -- self._test(cata,liste) -- -- def test019(self): -- """Test du validateur Compulsory avec objet entier """ -- cata=SIMP(statut='o',typ='I',min=1,max=6,validators=Compulsory((5,6,7))) -- i=entier() -- liste=( ((5,6,7),OK), -- ((5,6,7,i),OK), -- ((i,5,6,7,i),OK), -- ((i,5,7,i), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : (, 5, 7, ) ne contient ! -- ! pas les elements obligatoires : [6] ! -- ! Critere de validite: valeur (5, 6, 7) obligatoire ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --""" ), -- ) -- self._test(cata,liste) -- -- def test020(self): -- """Test du validateur NoRepeat OU Compulsory avec objet entier """ -- cata=SIMP(statut='o',typ='I',min=1,max=6,validators=(NoRepeat(),Compulsory((5,6,7)))) -- i=entier() -- liste=( ((5,6,7),OK), -- ((5,6,7,i),OK), -- ((i,5,6,7,i),OK), -- ((i,5,7,i), OK ), -- ) -- self._test(cata,liste) -- -- def test021(self): -- """Test du validateur NoRepeat ET Compulsory avec objet entier """ -- cata=SIMP(statut='o',typ='I',min=1,max=6,validators=[NoRepeat(),Compulsory((5,6,7))]) -- i=entier() -- liste=( ((5,6,7),OK), -- ((5,6,7,i),OK), -- ((i,5,6,7,i),OK), -- ((i,5,7,i), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : (, 5, 7, ) ne contient ! -- ! pas les elements obligatoires : [6] ! -- ! Critere de validite: : pas de présence de doublon dans la liste ! -- ! et valeur (5, 6, 7) obligatoire ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --""" ), -- ) -- self._test(cata,liste) -- -- def test022(self): -- """Test du validateur Compulsory(5,6,7) ET OrdList('croissant') avec objet entier """ -- cata=SIMP(statut='o',typ='I',min=1,max=6,validators=[Compulsory((5,6,7)),OrdList('croissant')]) -- i=entier() -- liste=( ((5,6,7),OK), -- ((5,6,7,i),OK), -- ((i,5,6,7,i),OK), -- ((i,5,7,i), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : (, 5, 7, ) ne contient ! -- ! pas les elements obligatoires : [6] ! -- ! Critere de validite: valeur (5, 6, 7) obligatoire ! -- ! et liste croissant ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --""" ), -- ((i,5,7,i,6), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : (, 5, 7, , 6) n'est pas ! -- ! par valeurs croissantes ! -- ! Critere de validite: valeur (5, 6, 7) obligatoire ! -- ! et liste croissant ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --""" ), -- ) -- self._test(cata,liste) -- -- def test023(self): -- """Test du validateur Compulsory(5,6,7) ET OrdList('croissant') ET NoRepeat() avec objet entier """ -- cata=SIMP(statut='o',typ='I',min=1,max=6,validators=[Compulsory((5,6,7)),OrdList('croissant'),NoRepeat()]) -- i=entier() -- liste=( ((5,6,7),OK), -- ((5,6,7,i),OK), -- ((i,5,6,7,i),OK), -- ((i,5,7,i), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : (, 5, 7, ) ne contient ! -- ! pas les elements obligatoires : [6] ! -- ! Critere de validite: valeur (5, 6, 7) obligatoire ! -- ! et liste croissant ! -- ! et : pas de présence de doublon dans la liste ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --""" ), -- ((i,5,7,i,6), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : (, 5, 7, , 6) n'est pas ! -- ! par valeurs croissantes ! -- ! Critere de validite: valeur (5, 6, 7) obligatoire ! -- ! et liste croissant ! -- ! et : pas de présence de doublon dans la liste ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --""" ), -- ((i,5,i,6,7,7), --"""Mot-clé simple : mcs -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Mot-clé mcs invalide : 7 est un doublon ! -- ! Critere de validite: valeur (5, 6, 7) obligatoire ! -- ! et liste croissant ! -- ! et : pas de présence de doublon dans la liste ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --Fin Mot-clé simple : mcs --""" ), -- ((i,5,6,7,i,8),OK), -- ) -- self._test(cata,liste) diff --cc Tests/testelem/toto.comm index 99c02a4b,99c02a4b..00000000 deleted file mode 100644,100644 --- a/Tests/testelem/toto.comm +++ /dev/null @@@ -1,3 -1,3 +1,0 @@@ --DEBUT() --MA=LIRE_MAILLAGE() --FIN() diff --cc Tests/testelem7/testaz76.py index f463af35,1a9aecf4..00000000 deleted file mode 100644,100644 --- a/Tests/testelem7/testaz76.py +++ /dev/null @@@ -1,399 -1,399 +1,0 @@@ --# coding=utf-8 -- --import os --import unittest --import difflib --import compare -- --import prefs --from InterfaceTK import appli -- --def add_param(j,pos,nom,valeur): - co=j.addentite("PARAMETRE",pos) - co.set_nom(nom) - co=j.addEntite("PARAMETRE",pos) - co.setNom(nom) -- co.set_valeur(valeur) -- return co -- --def add_mcsimp(obj,nom,valeur): - mcs=obj.get_child(nom,restreint='oui') - mcs=obj.getChild(nom,restreint='oui') -- if mcs is None: - pos=obj.get_index_child(nom) - mcs=obj.addentite(nom,pos) - mcs.set_valeur(mcs.eval_val(valeur)) - pos=obj.getIndexChild(nom) - mcs=obj.addEntite(nom,pos) - mcs.set_valeur(mcs.evalVal(valeur)) -- return mcs -- --def cdiff(text1,text2): -- return " ".join(difflib.context_diff(text1.splitlines(1),text2.splitlines(1))) -- --class TestCase(unittest.TestCase): -- def setUp(self): -- pass -- -- def tearDown(self): - CONTEXT.unset_current_step() - CONTEXT.unsetCurrentStep() -- -- def test000(self): -- """ Test de construction du fichier de commandes az.comm de zero""" -- -- app=appli.STANDALONE(version='v7') -- j=app.newJDC() --# commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) --# commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) --# parametres -- pos=0 -- pos=pos+1 -- co=add_param(j,pos,"P1","9.8") -- pos=pos+1 -- co=add_param(j,pos,"P2","8.8") -- pos=pos+1 -- co=add_param(j,pos,"P3","7") -- pos=pos+1 -- co=add_param(j,pos,"P5","P3*P1") -- pos=pos+1 -- co=add_param(j,pos,"P6","P1-3") -- pos=pos+1 -- co=add_param(j,pos,"P4","[2,3,4]") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur("Pas trouve shellpanel") --# commande LIRE_MAILLAGE -- pos=pos+1 - co=j.addentite("LIRE_MAILLAGE",pos) - test,mess=co.nomme_sd("MAILLA2") - mcs=co.addentite("UNITE") - valeur=mcs.eval_val("P4[1]") - co=j.addEntite("LIRE_MAILLAGE",pos) - test,mess=co.nommeSd("MAILLA2") - mcs=co.addEntite("UNITE") - valeur=mcs.evalVal("P4[1]") -- test=mcs.set_valeur(valeur) --# formule -- pos=pos+1 - co=j.addentite("FORMULE",pos) - co.update_formule_python(("aaa","REEL","a+z","(a,z)")) - co=j.addEntite("FORMULE",pos) - co.updateFormulePython(("aaa","REEL","a+z","(a,z)")) --# commande LIRE_MAILLAGE -- pos=pos+1 - ma=co=j.addentite("LIRE_MAILLAGE",pos) - test,mess=co.nomme_sd("MAIL") - mcs=co.addentite("UNITE") - valeur,validite=mcs.eval_valeur("P3") - ma=co=j.addEntite("LIRE_MAILLAGE",pos) - test,mess=co.nommeSd("MAIL") - mcs=co.addEntite("UNITE") - valeur,validite=mcs.evalValeur("P3") -- test=mcs.set_valeur(valeur) --# -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'LIRE_MAILLAGE', 'UNITE' --> uniquebasepanel") --# formule -- pos=pos+1 - co=j.addentite("FORMULE",pos) - co.update_formule_python(("az","REEL","aaaaa","(ae,inst)")) - co=j.addEntite("FORMULE",pos) - co.updateFormulePython(("az","REEL","aaaaa","(ae,inst)")) --# commande AFFE_MODELE -- pos=pos+1 - co=j.addentite("AFFE_MODELE",pos) - mcs=co.get_child("MAILLAGE") - valeur,validite=mcs.eval_valeur("MAIL") - co=j.addEntite("AFFE_MODELE",pos) - mcs=co.getChild("MAILLAGE") - valeur,validite=mcs.evalValeur("MAIL") -- assert valeur == ma.sd -- test=mcs.set_valeur(valeur) -- assert valeur == co["MAILLAGE"] - mcf=co.addentite("AFFE") - mcs=mcf[0].get_child("PHENOMENE") - valeur=mcs.eval_val_item('MECANIQUE') - mcf=co.addEntite("AFFE") - mcs=mcf[0].getChild("PHENOMENE") - valeur=mcs.evalValItem('MECANIQUE') -- assert valeur=='MECANIQUE',str(valeur) -- test=mcs.set_valeur(valeur) -- assert mcf["PHENOMENE"] == 'MECANIQUE' - mcs=mcf[0].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcs=mcf[0].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- assert mcf["MODELISATION"] == 'DIS_T' -- mcs=add_mcsimp(mcf[0],"GROUP_MA",('RESSORT','eee',)) -- - mcf=co.addentite("AFFE") - mcs=mcf[1].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('MECANIQUE')) - mcs=mcf[1].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcf=co.addEntite("AFFE") - mcs=mcf[1].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('MECANIQUE')) - mcs=mcf[1].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- mcs=add_mcsimp(mcf[1],"GROUP_MA",'MASSES') -- - mcf=co.addentite("AFFE") - mcs=mcf[2].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('ACOUSTIQUE')) - mcs=mcf[2].get_child("b_acoustique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('PLAN')) - mcf=co.addEntite("AFFE") - mcs=mcf[2].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('ACOUSTIQUE')) - mcs=mcf[2].getChild("b_acoustique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('PLAN')) -- #mcs=add_mcsimp(mcf[2],"GROUP_NO",'GNP3,GNP5,GNP6,GNP7,GNP8,GNP9,GNP10,GNP11,GNP12') -- mcs=add_mcsimp(mcf[2],"GROUP_NO","'GNP3','GNP5','GNP6','GNP7','GNP8','GNP9','GNP10','GNP11','GNP12'") -- - co.nomme_sd("AFFE1") - co.nommeSd("AFFE1") --# commande AFFE_MODELE -- pos=pos+1 - co=j.addentite("AFFE_MODELE",pos) - mcs=co.get_child("MAILLAGE") - mcs.set_valeur(mcs.eval_val("MAIL")) - co=j.addEntite("AFFE_MODELE",pos) - mcs=co.getChild("MAILLAGE") - mcs.set_valeur(mcs.evalVal("MAIL")) -- - mcf=co.addentite("AFFE") - mcs=mcf[0].get_child("PHENOMENE") - valeur=mcs.eval_val_item('MECANIQUE') - mcf=co.addEntite("AFFE") - mcs=mcf[0].getChild("PHENOMENE") - valeur=mcs.evalValItem('MECANIQUE') -- test=mcs.set_valeur(valeur) - mcs=mcf[0].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcs=mcf[0].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- mcs=add_mcsimp(mcf[0],"GROUP_MA",'RESSORT') -- - mcf=co.addentite("AFFE") - mcs=mcf[1].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('MECANIQUE')) - mcs=mcf[1].get_child("b_mecanique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('DIS_T')) - mcf=co.addEntite("AFFE") - mcs=mcf[1].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('MECANIQUE')) - mcs=mcf[1].getChild("b_mecanique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('DIS_T')) -- mcs=add_mcsimp(mcf[1],"GROUP_MA",'MASSES') -- - mcf=co.addentite("AFFE") - mcs=mcf[2].get_child("PHENOMENE") - mcs.set_valeur(mcs.eval_val_item('THERMIQUE')) - mcs=mcf[2].get_child("b_thermique").get_child("MODELISATION") - mcs.set_valeur(mcs.eval_val_item('COQUE')) - mcf=co.addEntite("AFFE") - mcs=mcf[2].getChild("PHENOMENE") - mcs.set_valeur(mcs.evalValItem('THERMIQUE')) - mcs=mcf[2].getChild("b_thermique").getChild("MODELISATION") - mcs.set_valeur(mcs.evalValItem('COQUE')) -- mcs=add_mcsimp(mcf[2],"TOUT",'OUI') -- - co.nomme_sd("MOD") - co.nommeSd("MOD") --#CARA=AFFE_CARA_ELEM(MODELE=MOD, --# POUTRE=_F(GROUP_MA='MA', --# SECTION='CERCLE', --# CARA='R', --# VALE=(3.0,P6,),),); -- pos=pos+1 - co=j.addentite("AFFE_CARA_ELEM",pos) - mcs=co.get_child("MODELE") - mcs.set_valeur(mcs.eval_val("MOD")) - mcf=co.addentite("POUTRE") - mcs=mcf[0].get_child("SECTION") - mcs.set_valeur(mcs.eval_val('CERCLE')) - co=j.addEntite("AFFE_CARA_ELEM",pos) - mcs=co.getChild("MODELE") - mcs.set_valeur(mcs.evalVal("MOD")) - mcf=co.addEntite("POUTRE") - mcs=mcf[0].getChild("SECTION") - mcs.set_valeur(mcs.evalVal('CERCLE')) -- assert mcf[0]["SECTION"] == 'CERCLE' -- mcs=add_mcsimp(mcf[0],"GROUP_MA",'MA') - mcs=mcf[0].get_child("b_cercle").get_child("b_constant").get_child("CARA") - mcs.set_valeur(mcs.eval_val('R')) - mcs=mcf[0].get_child("b_cercle").get_child("b_constant").get_child("VALE") - mcs.set_valeur(mcs.eval_val('3.0,P6')) - co.nomme_sd("CARA") - mcs=mcf[0].getChild("b_cercle").getChild("b_constant").getChild("CARA") - mcs.set_valeur(mcs.evalVal('R')) - mcs=mcf[0].getChild("b_cercle").getChild("b_constant").getChild("VALE") - mcs.set_valeur(mcs.evalVal('3.0,P6')) - co.nommeSd("CARA") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- text=""" 'AFFE_MODELE', 'MAILLAGE' --> uniqueassdpanel -- AFFE_MODELE', 'AFFE', 'GROUP_MA' --> plusieursbasepanel -- 'AFFE_MODELE', 'AFFE', 'PHENOMENE' --> uniqueintopanel -- 'AFFE_MODELE', 'AFFE', 'b_mecanique'--> plusieursintopanel""" -- co.set_valeur(text) --#F1=DEFI_FONCTION(NOM_PARA='DX', --# VALE=(5.0,3.0,P4[1],P3,),); -- pos=pos+1 - co=j.addentite("DEFI_FONCTION",pos) - mcs=co.get_child("NOM_PARA") - mcs.set_valeur(mcs.eval_val("DX")) - mcs=co.addentite("VALE") - mcs.set_valeur(mcs.eval_val("5.0,3.0,P4[1],P3")) - co.nomme_sd("F1") - co=j.addEntite("DEFI_FONCTION",pos) - mcs=co.getChild("NOM_PARA") - mcs.set_valeur(mcs.evalVal("DX")) - mcs=co.addEntite("VALE") - mcs.set_valeur(mcs.evalVal("5.0,3.0,P4[1],P3")) - co.nommeSd("F1") --#F3=DEFI_FONCTION(NOM_PARA='DRX', --# VALE_C=(5.0,7.0,9.0,9.0,8.0,7.0,),); -- pos=pos+1 - co=j.addentite("DEFI_FONCTION",pos) - mcs=co.get_child("NOM_PARA") - mcs.set_valeur(mcs.eval_val("DRX")) - mcs=co.addentite("VALE_C") - mcs.set_valeur(mcs.eval_val("5.0,7.0,9.0,9.0,8.0,7.0")) - co.nomme_sd("F3") - co=j.addEntite("DEFI_FONCTION",pos) - mcs=co.getChild("NOM_PARA") - mcs.set_valeur(mcs.evalVal("DRX")) - mcs=co.addEntite("VALE_C") - mcs.set_valeur(mcs.evalVal("5.0,7.0,9.0,9.0,8.0,7.0")) - co.nommeSd("F3") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'DEFI_FONCTION', 'VALE' --> fonctionpanel ") --#MATER2=DEFI_MATERIAU(ELAS=_F(E=100000000000.0, --# NU=0.0,), --# ECRO_ASYM_LINE=_F(DC_SIGM_EPSI=0.0, --# SY_C=200000000.0, --# DT_SIGM_EPSI=0.0, --# SY_T=50000000.0,),); -- pos=pos+1 - co=j.addentite("DEFI_MATERIAU",pos) - mcf=co.addentite("ELAS") - mcs=mcf[0].get_child("E") - mcs.set_valeur(mcs.eval_val("100000000000.0")) - mcs=mcf[0].get_child("NU") - mcs.set_valeur(mcs.eval_val("0.0")) - mcf=co.addentite("ECRO_ASYM_LINE") - mcs=mcf[0].get_child("DC_SIGM_EPSI") - mcs.set_valeur(mcs.eval_val("0.0")) - mcs=mcf[0].get_child("DT_SIGM_EPSI") - mcs.set_valeur(mcs.eval_val("0.0")) - mcs=mcf[0].get_child("SY_C") - mcs.set_valeur(mcs.eval_val("200000000.0")) - mcs=mcf[0].get_child("SY_T") - mcs.set_valeur(mcs.eval_val("50000000.0")) - co.nomme_sd("MATER2") - co=j.addEntite("DEFI_MATERIAU",pos) - mcf=co.addEntite("ELAS") - mcs=mcf[0].getChild("E") - mcs.set_valeur(mcs.evalVal("100000000000.0")) - mcs=mcf[0].getChild("NU") - mcs.set_valeur(mcs.evalVal("0.0")) - mcf=co.addEntite("ECRO_ASYM_LINE") - mcs=mcf[0].getChild("DC_SIGM_EPSI") - mcs.set_valeur(mcs.evalVal("0.0")) - mcs=mcf[0].getChild("DT_SIGM_EPSI") - mcs.set_valeur(mcs.evalVal("0.0")) - mcs=mcf[0].getChild("SY_C") - mcs.set_valeur(mcs.evalVal("200000000.0")) - mcs=mcf[0].getChild("SY_T") - mcs.set_valeur(mcs.evalVal("50000000.0")) - co.nommeSd("MATER2") --#PS1=DEFI_PARA_SENSI(VALE=1.0,); --#PS2=DEFI_PARA_SENSI(VALE=1.0,); --#PS3=DEFI_PARA_SENSI(VALE=1.0,); -- pos=pos+1 - co=j.addentite("DEFI_PARA_SENSI",pos) - mcs=co.get_child("VALE") - mcs.set_valeur(mcs.eval_val("1.0")) - co.nomme_sd("PS1") - co=j.addEntite("DEFI_PARA_SENSI",pos) - mcs=co.getChild("VALE") - mcs.set_valeur(mcs.evalVal("1.0")) - co.nommeSd("PS1") -- pos=pos+1 - co=j.addentite("DEFI_PARA_SENSI",pos) - mcs=co.get_child("VALE") - mcs.set_valeur(mcs.eval_val("1.0")) - co.nomme_sd("PS2") - co=j.addEntite("DEFI_PARA_SENSI",pos) - mcs=co.getChild("VALE") - mcs.set_valeur(mcs.evalVal("1.0")) - co.nommeSd("PS2") -- pos=pos+1 - co=j.addentite("DEFI_PARA_SENSI",pos) - mcs=co.get_child("VALE") - mcs.set_valeur(mcs.eval_val("1.0")) - co.nomme_sd("PS3") - co=j.addEntite("DEFI_PARA_SENSI",pos) - mcs=co.getChild("VALE") - mcs.set_valeur(mcs.evalVal("1.0")) - co.nommeSd("PS3") --#CHMAT2=AFFE_MATERIAU(MAILLAGE=MAIL, --# AFFE=_F(TOUT='OUI', --# MATER=MATER2,),); -- pos=pos+1 - co=j.addentite("AFFE_MATERIAU",pos) - co=j.addEntite("AFFE_MATERIAU",pos) -- add_mcsimp(co,"MAILLAGE","MAIL") - mcf=co.get_child("AFFE") - mcf=co.getChild("AFFE") -- add_mcsimp(mcf[0],"TOUT","OUI") -- add_mcsimp(mcf[0],"MATER","MATER2") - co.nomme_sd("CHMAT2") - co.nommeSd("CHMAT2") --#AAAZ=AFFE_CHAR_THER(MODELE=AFFE1, --# TEMP_IMPO=_F(TOUT='OUI', --# TEMP=0.0,),); -- pos=pos+1 - co=j.addentite("AFFE_CHAR_THER",pos) - co=j.addEntite("AFFE_CHAR_THER",pos) -- add_mcsimp(co,"MODELE","AFFE1") - mcf=co.addentite("TEMP_IMPO") - mcf=co.addEntite("TEMP_IMPO") -- add_mcsimp(mcf[0],"TOUT","OUI") -- add_mcsimp(mcf[0],"TEMP","0.0") - co.nomme_sd("AAAZ") - co.nommeSd("AAAZ") --#TH1=THER_LINEAIRE(MODELE=AFFE1, --# CHAM_MATER=CHMAT2, --# EXCIT=_F(CHARGE=AAAZ,), --# SENSIBILITE=(PS1,PS2,),); -- pos=pos+1 - co=j.addentite("THER_LINEAIRE",pos) - co=j.addEntite("THER_LINEAIRE",pos) -- add_mcsimp(co,"MODELE","AFFE1") -- add_mcsimp(co,"CHAM_MATER","CHMAT2") - mcf=co.get_child("EXCIT") - mcf=co.getChild("EXCIT") -- add_mcsimp(mcf[0],"CHARGE","AAAZ") -- add_mcsimp(co,"SENSIBILITE","PS1,PS2") - co.nomme_sd("TH1") - co.nommeSd("TH1") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'THER_LINEAIRE', 'SENSIBILITE' --> plusieursassdpanel") --#ACA1=AFFE_CHAR_ACOU(MODELE=AFFE1, --# PRES_IMPO=_F(TOUT='OUI', --# PRES=('RI',3.0,3.0,),),); -- pos=pos+1 - co=j.addentite("AFFE_CHAR_ACOU",pos) - co=j.addEntite("AFFE_CHAR_ACOU",pos) -- add_mcsimp(co,"MODELE","AFFE1") - mcf=co.addentite("PRES_IMPO") - mcf=co.addEntite("PRES_IMPO") -- add_mcsimp(mcf[0],"TOUT","OUI") -- add_mcsimp(mcf[0],"PRES","'RI',3.0,3.0") - co.nomme_sd("ACA1") - co.nommeSd("ACA1") --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'AFFE_CHAR_ACOU', 'PRES_IMPO', 'PRES' --> uniquecomppanel") -- --# 'AFFE_CHAR_ACOU', 'PRES_IMPO', 'PRES' --> uniquecomppanel -- --#MACRO_MATR_ASSE(MODELE=AFFE1, --# NUME_DDL=CO('DDL1'), --# MATR_ASSE=_F(MATRICE=CO('MAT1'), --# OPTION='RIGI_THER',),); -- pos=pos+1 - co=j.addentite("MACRO_MATR_ASSE",pos) - co=j.addEntite("MACRO_MATR_ASSE",pos) -- add_mcsimp(co,"MODELE","AFFE1") - mcs=co.get_child("NUME_DDL") - mcs=co.getChild("NUME_DDL") -- mcs.set_valeur_co('DDL1') - mcf=co.get_child("MATR_ASSE") - mcf=co.getChild("MATR_ASSE") -- add_mcsimp(mcf[0],"OPTION","RIGI_THER") - mcs=mcf[0].get_child("MATRICE") - mcs=mcf[0].getChild("MATRICE") -- mcs.set_valeur_co('MAT1') --# commentaire -- pos=pos+1 - co=j.addentite("COMMENTAIRE",pos) - co=j.addEntite("COMMENTAIRE",pos) -- co.set_valeur(" 'MACRO_MATR_ASSE', 'MATR_ASSE', 'MATRICE' --> uniquesdcopanel") -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() -- -- text1=app.get_text_JDC(j,'python') -- file=os.path.join(prefs.INSTALLDIR,"Tests/testelem/az.comm") -- f=open(file) -- text2=f.read() -- f.close() -- assert text1 == text2 , cdiff(text1,text2) -- -- def test001(self): -- """ Test de construction d'un fichier de commandes avec DEFI_LIST_REEL, fonction et parametre de zero""" -- -- app=appli.STANDALONE(version='v7') -- j=app.newJDC() --# commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) --# commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) --#parametre -- pos=0 -- pos=pos+1 -- co=add_param(j,pos,"P1","9.8") -- pos=pos+1 -- co=add_param(j,pos,"P2","sin(P1)") --# formule -- pos=pos+1 - co=j.addentite("FORMULE",pos) - co.update_formule_python(("aaa","REEL","a+z","(a,z)")) - co=j.addEntite("FORMULE",pos) - co.updateFormulePython(("aaa","REEL","a+z","(a,z)")) --#parametre de formule -- pos=pos+1 -- co=add_param(j,pos,"P3","aaa(P1,2.)") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","1.,2.,3.") - co.nomme_sd("LI1") - co.nommeSd("LI1") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","sin(1.)") - co.nomme_sd("LI2") - co.nommeSd("LI2") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","aaa(1.,2.)") - co.nomme_sd("LI3") - co.nommeSd("LI3") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","sin(1.,2)") - co.nomme_sd("LI4") - co.nommeSd("LI4") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","aaa(1.)") - co.nomme_sd("LI5") - co.nommeSd("LI5") --#commande defi_list_reel -- pos=pos+1 - co=j.addentite("DEFI_LIST_REEL",pos) - co=j.addEntite("DEFI_LIST_REEL",pos) -- add_mcsimp(co,"VALE","1,sin(1.),2") - co.nomme_sd("LI6") - co.nommeSd("LI6") -- -- expected="""DEBUT CR validation : SansNom -- Etape : DEFI_LIST_REEL ligne : ... -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Concept retourné non défini ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Mot-clé simple : VALE -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 'sin(1.,2)' (de type ) n'est pas d'un type autorisé: ('R',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : VALE -- Fin Etape : DEFI_LIST_REEL -- Etape : DEFI_LIST_REEL ligne : ... -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! Concept retourné non défini ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Mot-clé simple : VALE -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- ! 'aaa(1.)' (de type ) n'est pas d'un type autorisé: ('R',) ! -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- Fin Mot-clé simple : VALE -- Fin Etape : DEFI_LIST_REEL --FIN CR validation :SansNom --""" -- msg=str( j.report()) -- assert compare.check(expected,msg),cdiff(expected,msg) diff --cc Tests/testihm/common.py index ebad6afc,87f8467e..00000000 deleted file mode 100644,100644 --- a/Tests/testihm/common.py +++ /dev/null @@@ -1,204 -1,204 +1,0 @@@ --# -*- coding: utf-8 -*- -- --from tkMessageBox import showinfo --root=None --jdcdisplay=None -- --class UnKnownNode(Exception):pass -- --def init_common(r,j): -- global root,jdcdisplay -- root=r -- jdcdisplay=j -- --def KP_return(): -- root.event_generate("") -- root.update() -- --def delete_node(panel): -- panel.node.delete() -- - def uncomment_command(panel): -def unComment_command(panel): -- panel.bouton_unc.invoke() -- root.update() -- panel=jdcdisplay.panel_courant -- return panel -- --def comment_command(panel): -- panel.nb.selectpage('Commentaire') -- panel.comment_commande() -- root.update() -- panel=jdcdisplay.panel_courant -- return panel -- --def create_mocle(nom,panel): -- panel.nb.selectpage('Mocles') -- panel.Liste.afficheMot(nom) -- root.update() -- label=panel.Liste.dico_labels[nom] -- label.event_generate("") -- root.event_generate("") -- root.update() -- return jdcdisplay.panel_courant -- --def change_commandcomm(text,panel): -- panel.widget_text.setvalue(text) -- root.update() -- panel.bouton_val.invoke() -- return panel -- --def create_command(nom,panel): -- panel.nb.selectpage('Commande') -- root.update() -- panel.command_entry.setentry(nom) -- panel.command_entry.component('entry').focus_set() -- root.event_generate("") -- root.update() -- label=panel.liste_command.dico_labels[nom] -- label.event_generate("") -- label.event_generate("") -- #root.event_generate("") -- root.update() -- panel=jdcdisplay.panel_courant -- return panel -- --def create_comment(text,panel): -- panel.nb.selectpage('Commentaire') -- panel.ajout_commentaire() -- root.update() -- panel=jdcdisplay.panel_courant -- panel.widget_text.setvalue(text) -- root.update() -- panel.bouton_val.invoke() -- #panel.change_valeur() -- return panel -- --def create_param(nom,valeur,panel): -- panel.nb.selectpage('Commentaire') -- panel.ajout_parametre() -- root.update() -- panel=jdcdisplay.panel_courant -- if nom: -- panel.entry_nom.delete(0,"end") -- panel.entry_nom.insert(0,nom) -- panel.entry_nom.event_generate("") -- panel.entry_val.delete(0,"end") -- panel.entry_val.insert(0,valeur) -- panel.entry_val.event_generate("") -- panel.bouton_val.invoke() -- root.update() -- return panel -- --def create_formule(nom,args,expr,panel): -- panel=create_command("FORMULE",panel) -- panel.entry_nom.delete(0,"end") -- panel.entry_nom.insert(0,nom) -- panel.entry_nom.event_generate("") -- panel.entry_arg.delete(0,"end") -- panel.entry_arg.insert(0,args) -- panel.entry_arg.event_generate("") -- panel.entry_exp.delete(0,"end") -- panel.entry_exp.insert(0,expr) -- panel.entry_exp.event_generate("") -- panel.bouton_val.invoke() -- root.update() -- return panel -- --def nomme_concept(nom,panel): -- panel.nb.selectpage('Concept') -- root.update() -- panel._any.delete(0,"end") -- panel._any.insert(0,nom) -- panel.but_ok.invoke() -- root.update() -- return jdcdisplay.panel_courant -- --def select_mcf(nom,ind,node): -- panel=select_child(nom,node) -- parent=panel.node -- parent.expand() -- parent.select_next(ind) -- panel=jdcdisplay.panel_courant -- panel.node.expand() -- return panel -- --def select_child(nom,node): -- """node est le parent dont on veut le fils nom""" -- for n in node.children: -- if n.item.nom == nom: -- n.select() -- root.update() -- panel= jdcdisplay.panel_courant -- panel.node.expand() -- return panel -- raise UnKnownNode(nom) -- --def select_node(node): -- node.select() -- node.expand() -- root.update() -- return jdcdisplay.panel_courant -- --def choose_valeur(valeur,panel): -- panel.Liste_choix.afficheMot(valeur) -- root.update() -- label=panel.Liste_choix.dico_labels[valeur] -- label.event_generate("") -- label.event_generate("") -- root.update() -- --def choose_sdco(valeur,panel): -- i = list(panel.listbox.get(0, 'end')).index(valeur) -- panel.listbox.component("listbox").selection_set(i) -- panel.listbox.component("listbox").focus_set() -- panel.listbox.component("listbox").event_generate("") -- root.update() -- --def choose_assd(valeur,panel): -- i = list(panel.listbox.get(0, 'end')).index(valeur) -- panel.listbox.component("listbox").selection_set(i) -- panel.but_val.invoke() -- root.update() -- --def set_valeur(valeur,panel): -- panel.entry.delete(0,"end") -- panel.entry.insert(0,valeur) -- panel.entry.event_generate("") -- root.update() -- --def set_sdco(valeur,panel): -- panel.entry_co.delete(0,"end") -- panel.entry_co.insert(0,valeur) -- panel.entry_co.event_generate("") -- root.update() -- --def set_complexe(valeur,panel): -- panel.entry3.setentry(valeur) -- panel.entry3.component('entry').focus_set() -- panel.entry3.event_generate("") -- root.update() -- --def add_valeur_into(valeur,panel): -- label=panel.Liste_choix.dico_labels[valeur] -- panel.Liste_choix.afficheMot(valeur) -- root.update() -- label.event_generate("<1>") -- panel.bouton_add.invoke() -- root.update() -- --def add_valeur(valeur,panel): -- panel.entry.delete(0,"end") -- panel.entry.insert(0,valeur) -- panel.entry.event_generate("") -- root.update() -- --def valider_valeur(panel): -- panel.bouton_accepter.invoke() -- root.update() -- --def copier_coller(): -- root.event_generate("") -- root.event_generate("") -- root.update() -- return jdcdisplay.panel_courant -- diff --cc Tests/testihm/testihm1.py index dcf246d0,9a9c4eb1..00000000 deleted file mode 100644,100644 --- a/Tests/testihm/testihm1.py +++ /dev/null @@@ -1,337 -1,337 +1,0 @@@ --# -*- coding: utf-8 -*- --# Modules Python --import os --import unittest --import difflib --import compare --import sys --import Tkinter -- --# Modules Eficas --import prefs --from Editeur import session --from InterfaceTK import eficas_go --from InterfaceTK import splash --from InterfaceTK import eficas --from InterfaceTK import images --from common import * -- --version='v8' -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.root = Tkinter.Tk() -- images.update_cache() -- # Analyse des arguments de la ligne de commande -- options=session.parse([]) -- options.cata=version -- pass -- -- def tearDown(self): -- self.root.destroy() -- init_common(None,None) -- pass -- -- def test000(self): -- root=self.root -- code="ASTER" -- splash.init_splash(root,code=code,titre="Lancement d'EFICAS pour %s" %code) -- splash._splash.configure(text="Chargement d'EFICAS en cours.\n Veuillez patienter ...") -- app=eficas.EFICAS(root,code=code) -- j=app.bureau.newJDC() -- jdcdisplay=app.bureau.JDCDisplay_courant -- init_common(root,jdcdisplay) -- -- # commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) -- # commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) -- -- jdctree=jdcdisplay.tree.tree.children[0] -- panel=select_child("DEBUT",jdctree) -- -- panel=create_param("P1",9.8,panel) -- panel=create_param("P2",8.8,panel) -- panel=create_param("P3",7,panel) -- panel=create_param("P4","[2,3,4]",panel) -- panel=create_param("P5","P3*P1",panel) -- panel=create_param(None,"P1-3",panel) -- panel=create_comment("Pas trouve shellpanel",panel) -- -- #commnde LIRE_MAILLAGE -- panel=create_command("LIRE_MAILLAGE",panel) -- command=panel.node -- panel=nomme_concept("MAILLA2",panel) -- panel=select_node(command) -- panel=create_mocle("UNITE",panel) -- panel=set_valeur("P4[1]",panel) -- command.collapse() -- panel=select_node(command) -- #FORMULE -- panel=create_formule("az","a,z","a+z",panel) -- #commande AFFE_MODELE -- panel=create_command("AFFE_MODELE",panel) -- command=panel.node -- select_child("MAILLAGE",command) -- panel=select_node(command) -- panel=create_mocle("AFFE",panel) -- parent=panel.node -- panel=select_child("PHENOMENE",parent) -- choose_valeur("MECANIQUE",panel) -- panel=select_child("b_mecanique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("3D",panel) -- add_valeur_into("3D_FLUIDE",panel) -- valider_valeur(panel) -- panel=select_node(parent) -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_node(command) -- panel=nomme_concept("MO",panel) -- command.collapse() -- #fin commande AFFE_MODELE -- panel=copier_coller() -- command=panel.node -- panel=create_mocle("AFFE",panel) -- panel=select_node(command) -- panel=create_mocle("AFFE",panel) -- panel=select_mcf("AFFE",1,command) -- parent=panel.node -- panel=create_mocle("GROUP_NO",panel) -- add_valeur("'GNP3','GNP5','GNP6','GNP7','GNP8','GNP9','GNP10','GNP11','GNP12'",panel) -- valider_valeur(panel) -- panel=select_child("PHENOMENE",parent) -- choose_valeur("ACOUSTIQUE",panel) -- panel=select_child("b_acoustique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("PLAN",panel) -- valider_valeur(panel) -- -- panel=select_mcf("AFFE",2,command) -- parent=panel.node -- panel=create_mocle("GROUP_MA",panel) -- add_valeur("MASSES",panel) -- valider_valeur(panel) -- panel=select_child("PHENOMENE",parent) -- choose_valeur("THERMIQUE",panel) -- panel=select_child("b_thermique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("COQUE",panel) -- valider_valeur(panel) -- -- panel=select_node(command) -- panel=nomme_concept("AFFE1",panel) -- command.collapse() -- #fin commande AFFE_MODELE -- #commande AFFE_CARA_ELEM -- panel=create_command("AFFE_CARA_ELEM",panel) -- command=panel.node -- panel=select_node(command) -- panel=create_mocle("POUTRE",panel) -- parent=panel.node -- panel=select_child("SECTION",parent) -- choose_valeur("CERCLE",panel) -- panel=select_child("b_cercle",parent) -- panel=select_child("b_constant",panel.node) -- p=panel.node -- panel=select_child("CARA",p) -- add_valeur_into("R",panel) -- add_valeur_into("EP",panel) -- valider_valeur(panel) -- panel=select_child("VALE",p) -- add_valeur("1,2",panel) -- valider_valeur(panel) -- panel=select_node(parent) -- panel=create_mocle("GROUP_MA",panel) -- add_valeur("GR1,GR2",panel) -- valider_valeur(panel) -- panel=select_child("MODELE",command) -- choose_assd("MO",panel) -- panel=select_node(command) -- panel=nomme_concept("CARA",panel) -- command.collapse() -- #fin commande AFFE_CARA_ELEM -- panel=create_command("DEFI_FONCTION",panel) -- command=panel.node -- panel=create_mocle("VALE",panel) -- add_valeur("5.0,3.0",panel) -- add_valeur("P4[1],P3",panel) -- valider_valeur(panel) -- panel=select_child("NOM_PARA",command) -- choose_valeur("DX",panel) -- panel=select_node(command) -- panel=nomme_concept("F1",panel) -- command.collapse() -- #fin DEFI_FONCTION -- panel=create_command("DEFI_FONCTION",panel) -- command=panel.node -- panel=create_mocle("VALE_C",panel) -- add_valeur("5.0,7.0,9.0",panel) -- add_valeur("9.0,8.0,7.0",panel) -- valider_valeur(panel) -- panel=select_child("NOM_PARA",command) -- choose_valeur("DRX",panel) -- panel=select_node(command) -- panel=nomme_concept("F3",panel) -- command.collapse() -- #fin DEFI_FONCTION --#MATER2=DEFI_MATERIAU(ELAS=_F(E=100000000000.0, --# NU=0.0,), --# ECRO_ASYM_LINE=_F(DC_SIGM_EPSI=0.0, --# SY_C=200000000.0, --# DT_SIGM_EPSI=0.0, --# SY_T=50000000.0,),); -- -- panel=create_command("DEFI_MATERIAU",panel) -- command=panel.node -- panel=create_mocle("ELAS",panel) -- p=panel.node -- panel=select_child("E",p) -- set_valeur("100000000000.0",panel) -- panel=select_child("NU",p) -- set_valeur("0.0",panel) -- panel=select_node(command) -- panel=create_mocle("ECRO_ASYM_LINE",panel) -- p=panel.node -- panel=select_child("DC_SIGM_EPSI",p) -- set_valeur("0.0",panel) -- panel=select_child("SY_C",p) -- set_valeur("200000000.0",panel) -- panel=select_child("DT_SIGM_EPSI",p) -- set_valeur("0.0",panel) -- panel=select_child("SY_T",p) -- set_valeur("50000000.0",panel) -- panel=select_node(command) -- panel=nomme_concept("MATER2",panel) -- command.collapse() -- #fin DEFI_MATERIAU -- #PS1=DEFI_PARA_SENSI(VALE=1.0,); -- #PS2=DEFI_PARA_SENSI(VALE=1.0,); -- #PS3=DEFI_PARA_SENSI(VALE=1.0,); -- panel=create_command("DEFI_PARA_SENSI",panel) -- command=panel.node -- panel=select_child("VALE",command) -- set_valeur("1.0",panel) -- panel=select_node(command) -- panel=nomme_concept("PS1",panel) -- command.collapse() -- panel=create_command("DEFI_PARA_SENSI",panel) -- command=panel.node -- panel=select_child("VALE",command) -- set_valeur("1.0",panel) -- panel=select_node(command) -- panel=nomme_concept("PS2",panel) -- command.collapse() -- panel=create_command("DEFI_PARA_SENSI",panel) -- command=panel.node -- panel=select_child("VALE",command) -- set_valeur("1.0",panel) -- panel=select_node(command) -- panel=nomme_concept("PS3",panel) -- command.collapse() --#CHMAT2=AFFE_MATERIAU(MAILLAGE=MAIL, --# AFFE=_F(TOUT='OUI', --# MATER=MATER2,),); -- panel=create_command("AFFE_MATERIAU",panel) -- command=panel.node -- panel=select_child("MAILLAGE",command) -- panel=select_child("AFFE",command) -- affe=panel.node -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_child("MATER",affe) -- add_valeur_into("MATER2",panel) -- valider_valeur(panel) -- panel=select_node(command) -- panel=nomme_concept("CHMAT2",panel) -- command.collapse() --#AAAZ=AFFE_CHAR_THER(MODELE=AFFE1, --# TEMP_IMPO=_F(TOUT='OUI', --# TEMP=0.0,),); -- panel=create_command("AFFE_CHAR_THER",panel) -- command=panel.node -- panel=create_mocle("TEMP_IMPO",panel) -- temp=panel.node -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_node(temp) -- panel=create_mocle("TEMP",panel) -- panel=set_valeur("0.0",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_node(command) -- panel=nomme_concept("AAAZ",panel) -- command.collapse() --#TH1=THER_LINEAIRE(MODELE=AFFE1, --# CHAM_MATER=CHMAT2, --# EXCIT=_F(CHARGE=AAAZ,), --# SENSIBILITE=(PS1,PS2,),); -- panel=create_command("THER_LINEAIRE",panel) -- command=panel.node -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("CHAM_MATER",command) -- panel=select_child("EXCIT",command) -- panel=select_child("CHARGE",panel.node) -- panel=select_node(command) -- panel=create_mocle("SENSIBILITE",panel) -- add_valeur_into("PS1",panel) -- add_valeur_into("PS2",panel) -- valider_valeur(panel) -- panel=select_node(command) -- panel=nomme_concept("TH1",panel) -- command.collapse() --#ACA1=AFFE_CHAR_ACOU(MODELE=AFFE1, --# PRES_IMPO=_F(TOUT='OUI', --# PRES=('RI',3.0,3.0,),),); -- panel=create_command("AFFE_CHAR_ACOU",panel) -- command=panel.node -- panel=create_mocle("PRES_IMPO",panel) -- pres=panel.node -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("PRES",pres) -- set_complexe("'RI',3.0,3.0",panel) -- panel=select_node(command) -- panel=nomme_concept("ACA1",panel) -- command.collapse() --#MACRO_MATR_ASSE(MODELE=AFFE1, --# NUME_DDL=CO('DDL1'), --# MATR_ASSE=_F(MATRICE=CO('MAT1'), --# OPTION='RIGI_THER',),); -- panel=create_command("MACRO_MATR_ASSE",panel) -- command=panel.node -- panel=select_child("NUME_DDL",command) -- set_sdco("DDL1",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("MATR_ASSE",command) -- matr=panel.node -- panel=select_child("OPTION",matr) -- choose_valeur("RIGI_THER",panel) -- panel=select_child("MATRICE",matr) -- set_sdco("MAT1",panel) -- panel=select_node(command) -- command.collapse() --#MACRO_MATR_ASSE(MODELE=AFFE1, --# NUME_DDL=DDL1, --# MATR_ASSE=_F(MATRICE=MAT1, --# OPTION='RIGI_THER',),); -- panel=create_command("MACRO_MATR_ASSE",panel) -- command=panel.node -- panel=select_child("NUME_DDL",command) -- choose_sdco("DDL1",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("MATR_ASSE",command) -- matr=panel.node -- panel=select_child("OPTION",matr) -- choose_valeur("RIGI_THER",panel) -- panel=select_child("MATRICE",matr) -- set_sdco("MAT2",panel) -- panel=select_node(command) -- command.collapse() -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() diff --cc Tests/testihm/testihm2.py index 0bb15fbb,6cff2ff3..00000000 deleted file mode 100644,100644 --- a/Tests/testihm/testihm2.py +++ /dev/null @@@ -1,70 -1,70 +1,0 @@@ --# -*- coding: utf-8 -*- --# Modules Python --import os --import unittest --import difflib --import compare --import sys --import Tkinter -- --# Modules Eficas --import prefs --from Editeur import session --from InterfaceTK import eficas_go,splash,eficas,images --from common import * -- -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.root = Tkinter.Tk() -- images.update_cache() -- # Analyse des arguments de la ligne de commande -- options=session.parse([]) -- options.cata="v8" -- pass -- -- def tearDown(self): -- self.root.destroy() -- init_common(None,None) -- pass -- -- def test000(self): -- root=self.root -- code="ASTER" -- splash.init_splash(root,code=code,titre="Lancement d'EFICAS pour %s" %code) -- splash._splash.configure(text="Chargement d'EFICAS en cours.\n Veuillez patienter ...") -- app=eficas.EFICAS(root,code=code) -- j=app.bureau.newJDC() -- jdcdisplay=app.bureau.JDCDisplay_courant -- init_common(root,jdcdisplay) -- -- # commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) -- # commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) -- -- jdctree=jdcdisplay.tree.tree.children[0] -- panel=select_child("DEBUT",jdctree) -- panel=create_command("LIRE_MAILLAGE",panel) -- panel=nomme_concept("MA",panel) -- -- panel=create_command("AFFE_MODELE",panel) -- command=panel.node -- select_child("MAILLAGE",command) -- panel=select_node(command) -- panel=create_mocle("AFFE",panel) -- parent=panel.node -- panel=select_child("PHENOMENE",parent) -- choose_valeur("MECANIQUE",panel) -- panel=select_child("b_mecanique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("3D",panel) -- add_valeur_into("3D_FLUIDE",panel) -- valider_valeur(panel) -- panel=select_node(parent) -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_node(command) -- panel=nomme_concept("MO",panel) -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() diff --cc Tests/testihm/testihm3.py index f96a73b8,e95c7def..00000000 deleted file mode 100644,100644 --- a/Tests/testihm/testihm3.py +++ /dev/null @@@ -1,93 -1,93 +1,0 @@@ --# -*- coding: utf-8 -*- --# Modules Python --import os --import unittest --import difflib --import compare --import sys --import Tkinter -- --# Modules Eficas --import prefs --from Editeur import session --from InterfaceTK import eficas_go,splash,eficas,images --from common import * -- -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.root = Tkinter.Tk() -- images.update_cache() -- # Analyse des arguments de la ligne de commande -- options=session.parse([]) -- options.cata="petit" -- pass -- -- def tearDown(self): -- self.root.destroy() -- init_common(None,None) -- pass -- -- def test000(self): -- root=self.root -- code="ASTER" -- splash.init_splash(root,code=code,titre="Lancement d'EFICAS pour %s" %code) -- splash._splash.configure(text="Chargement d'EFICAS en cours.\n Veuillez patienter ...") -- app=eficas.EFICAS(root,code=code) -- j=app.bureau.newJDC() -- jdcdisplay=app.bureau.JDCDisplay_courant -- init_common(root,jdcdisplay) -- -- # commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) -- # commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) -- -- jdctree=jdcdisplay.tree.tree.children[0] -- panel=select_child("DEBUT",jdctree) -- panel=create_command("TESTS_VALID",panel) -- command=panel.node -- panel=select_child("LongStr",command) -- set_valeur("aaa",panel) -- panel=select_child("ListStr",command) -- add_valeur("aaa",panel) -- add_valeur("bbbb,ccc",panel) -- valider_valeur(panel) -- panel=select_child("PairVal",command) -- add_valeur(2,panel) -- add_valeur("4,6",panel) -- valider_valeur(panel) -- panel=select_child("RangeVal",command) -- set_valeur(4,panel) -- panel=select_child("CardVal",command) -- add_valeur("4,6,5,7",panel) -- valider_valeur(panel) -- panel=select_child("EnumVal",command) -- choose_valeur(3,panel) -- panel=select_child("OrdList",command) -- add_valeur("4,6,5,7",panel) -- valider_valeur(panel) -- panel=select_child("OrdList2",command) -- add_valeur_into(2,panel) -- valider_valeur(panel) -- panel=select_child("TypeVal",command) -- set_valeur(5,panel) -- panel=select_child("Compul",command) -- add_valeur("2",panel) -- add_valeur("1",panel) -- valider_valeur(panel) -- panel=select_child("CompulInto",command) -- add_valeur_into(2,panel) -- add_valeur_into(1,panel) -- valider_valeur(panel) -- panel=select_child("Norep",command) -- add_valeur("2",panel) -- valider_valeur(panel) -- panel=select_child("NorepInto",command) -- add_valeur_into(2,panel) -- valider_valeur(panel) -- -- panel=select_node(command) -- panel=nomme_concept("MA",panel) -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() diff --cc Tests/testihm/testihm4.py index 3b3032e4,9bec8e06..00000000 deleted file mode 100644,100644 --- a/Tests/testihm/testihm4.py +++ /dev/null @@@ -1,55 -1,55 +1,0 @@@ --# -*- coding: utf-8 -*- --# Modules Python --import os --import unittest --import difflib --import compare --import sys --import Tkinter -- --# Modules Eficas --import prefs --from Editeur import session --from InterfaceTK import eficas_go,splash,eficas,images --from common import * -- -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.root = Tkinter.Tk() -- images.update_cache() -- # Analyse des arguments de la ligne de commande -- options=session.parse([]) -- options.cata="v8" -- pass -- -- def tearDown(self): -- self.root.destroy() -- init_common(None,None) -- pass -- -- def test000(self): -- root=self.root -- code="ASTER" -- splash.init_splash(root,code=code,titre="Lancement d'EFICAS pour %s" %code) -- splash._splash.configure(text="Chargement d'EFICAS en cours.\n Veuillez patienter ...") -- app=eficas.EFICAS(root,code=code) -- file=os.path.join(prefs.INSTALLDIR,"Tests/testelem/az.comm") -- j=app.bureau.openJDC(file=file) -- jdcdisplay=app.bureau.JDCDisplay_courant -- init_common(root,jdcdisplay) -- jdctree=jdcdisplay.tree.tree.children[0] -- #commentariser commande MACRO_MATR_ASSE -- panel=select_child("MACRO_MATR_ASSE",jdctree) -- panel=comment_command(panel) -- #decommentariser commande MACRO_MATR_ASSE - panel=uncomment_command(panel) - panel=unComment_command(panel) -- #creation commande commentée -- panel=create_command("LIRE_MAILLAGE",panel) -- panel=comment_command(panel) -- panel=change_commandcomm("mm=LIRE_MAILLAGE(INFO=2,UNITE=21)",panel) - panel=uncomment_command(panel) - panel=unComment_command(panel) -- panel=select_child("DEFI_FONCTION",jdctree) -- delete_node(panel) -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() diff --cc Tests/testihm7/common.py index 37c180cd,1d5f0daf..00000000 deleted file mode 100644,100644 --- a/Tests/testihm7/common.py +++ /dev/null @@@ -1,206 -1,206 +1,0 @@@ --# -*- coding: utf-8 -*- -- --from tkMessageBox import showinfo --root=None --jdcdisplay=None -- --class UnKnownNode(Exception):pass -- --def init_common(r,j): -- global root,jdcdisplay -- root=r -- jdcdisplay=j -- --def KP_return(): -- root.event_generate("") -- root.update() -- --def delete_node(panel): -- panel.node.delete() -- - def uncomment_command(panel): -def unComment_command(panel): -- panel.bouton_unc.invoke() -- root.update() -- panel=jdcdisplay.panel_courant -- return panel -- --def comment_command(panel): -- panel.nb.selectpage('Commentaire') -- panel.comment_commande() -- root.update() -- panel=jdcdisplay.panel_courant -- return panel -- --def create_mocle(nom,panel): -- panel.nb.selectpage('Mocles') -- panel.Liste.afficheMot(nom) -- root.update() -- label=panel.Liste.dico_labels[nom] -- label.event_generate("") -- root.event_generate("") -- root.update() -- return jdcdisplay.panel_courant -- --def change_commandcomm(text,panel): -- panel.widget_text.setvalue(text) -- root.update() -- panel.bouton_val.invoke() -- return panel -- --def create_command(nom,panel): -- panel.nb.selectpage('Commande') -- root.update() -- panel.command_entry.setentry(nom) -- panel.command_entry.component('entry').focus_set() -- root.event_generate("") -- root.update() -- label=panel.liste_command.dico_labels[nom] -- label.event_generate("") -- label.event_generate("") -- #root.event_generate("") -- root.update() -- panel=jdcdisplay.panel_courant -- return panel -- --def create_comment(text,panel): -- panel.nb.selectpage('Commentaire') -- panel.ajout_commentaire() -- root.update() -- panel=jdcdisplay.panel_courant -- panel.widget_text.setvalue(text) -- root.update() -- panel.bouton_val.invoke() -- #panel.change_valeur() -- return panel -- --def create_param(nom,valeur,panel): -- panel.nb.selectpage('Commentaire') -- panel.ajout_parametre() -- root.update() -- panel=jdcdisplay.panel_courant -- if nom: -- panel.entry_nom.delete(0,"end") -- panel.entry_nom.insert(0,nom) -- panel.entry_nom.event_generate("") -- panel.entry_val.delete(0,"end") -- panel.entry_val.insert(0,valeur) -- panel.entry_val.event_generate("") -- panel.bouton_val.invoke() -- root.update() -- return panel -- --def create_formule(nom,args,expr,panel): -- panel=create_command("FORMULE",panel) -- panel.entry_nom.delete(0,"end") -- panel.entry_nom.insert(0,nom) -- panel.entry_nom.event_generate("") -- panel.entry_arg.delete(0,"end") -- panel.entry_arg.insert(0,args) -- panel.entry_arg.event_generate("") -- panel.entry_exp.delete(0,"end") -- panel.entry_exp.insert(0,expr) -- panel.entry_exp.event_generate("") -- panel.bouton_val.invoke() -- root.update() -- return panel -- --def nomme_concept(nom,panel): -- panel.nb.selectpage('Concept') -- root.update() -- panel._any.delete(0,"end") -- panel._any.insert(0,nom) -- panel.but_ok.invoke() -- root.update() -- return jdcdisplay.panel_courant -- --def select_mcf(nom,ind,node): -- panel=select_child(nom,node) -- parent=panel.node -- parent.expand() -- parent.select_next(ind) -- panel=jdcdisplay.panel_courant -- panel.node.expand() -- return panel -- --def select_child(nom,node): -- """node est le parent dont on veut le fils nom""" -- for n in node.children: -- if n.item.nom == nom: -- n.select() -- root.update() -- panel= jdcdisplay.panel_courant -- panel.node.expand() -- return panel -- raise UnKnownNode(nom) -- --def select_node(node): -- node.select() -- node.expand() -- root.update() -- return jdcdisplay.panel_courant -- --def choose_valeur(valeur,panel): -- panel.Liste_choix.afficheMot(valeur) -- root.update() -- label=panel.Liste_choix.dico_labels[valeur] -- label.event_generate("") -- label.event_generate("") -- root.update() -- --def choose_sdco(valeur,panel): -- i = list(panel.listbox.get(0, 'end')).index(valeur) -- panel.listbox.component("listbox").selection_set(i) -- panel.listbox.component("listbox").focus_set() -- panel.listbox.component("listbox").event_generate("") -- root.update() -- --def choose_assd(valeur,panel): -- i = list(panel.listbox.get(0, 'end')).index(valeur) -- panel.listbox.component("listbox").selection_set(i) -- panel.but_val.invoke() -- root.update() -- --def set_valeur(valeur,panel): -- panel.entry.delete(0,"end") -- panel.entry.insert(0,valeur) -- panel.entry.event_generate("") -- root.update() -- --def set_sdco(valeur,panel): -- panel.b_co.invoke('OUI') -- root.update() -- panel.entry_co.delete(0,"end") -- panel.entry_co.insert(0,valeur) -- panel.entry_co.event_generate("") -- root.update() -- --def set_complexe(valeur,panel): -- panel.entry3.setentry(valeur) -- panel.entry3.component('entry').focus_set() -- panel.entry3.event_generate("") -- root.update() -- --def add_valeur_into(valeur,panel): -- label=panel.Liste_choix.dico_labels[valeur] -- panel.Liste_choix.afficheMot(valeur) -- root.update() -- label.event_generate("<1>") -- panel.bouton_add.invoke() -- root.update() -- --def add_valeur(valeur,panel): -- panel.entry.delete(0,"end") -- panel.entry.insert(0,valeur) -- panel.entry.event_generate("") -- root.update() -- --def valider_valeur(panel): -- panel.bouton_accepter.invoke() -- root.update() -- --def copier_coller(): -- root.event_generate("") -- root.event_generate("") -- root.update() -- return jdcdisplay.panel_courant -- diff --cc Tests/testihm7/testihm1.py index 78590803,433d8099..00000000 deleted file mode 100644,100644 --- a/Tests/testihm7/testihm1.py +++ /dev/null @@@ -1,334 -1,334 +1,0 @@@ --# -*- coding: utf-8 -*- --# Modules Python --import os --import unittest --import difflib --import compare --import sys --import Tkinter -- --# Modules Eficas --import prefs --from Editeur import session --from InterfaceTK import eficas_go,splash,eficas,images --from common import * -- --version='v7' -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.root = Tkinter.Tk() -- images.update_cache() -- # Analyse des arguments de la ligne de commande -- options=session.parse([]) -- options.cata=version -- pass -- -- def tearDown(self): -- self.root.destroy() -- init_common(None,None) -- pass -- -- def test000(self): -- root=self.root -- code="ASTER" -- splash.init_splash(root,code=code,titre="Lancement d'EFICAS pour %s" %code) -- splash._splash.configure(text="Chargement d'EFICAS en cours.\n Veuillez patienter ...") -- app=eficas.EFICAS(root,code=code) -- j=app.bureau.newJDC() -- jdcdisplay=app.bureau.JDCDisplay_courant -- init_common(root,jdcdisplay) -- -- # commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) -- # commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) -- -- jdctree=jdcdisplay.tree.tree.children[0] -- panel=select_child("DEBUT",jdctree) -- -- panel=create_param("P1",9.8,panel) -- panel=create_param("P2",8.8,panel) -- panel=create_param("P3",7,panel) -- panel=create_param("P4","[2,3,4]",panel) -- panel=create_param("P5","P3*P1",panel) -- panel=create_param(None,"P1-3",panel) -- panel=create_comment("Pas trouve shellpanel",panel) -- -- #commnde LIRE_MAILLAGE -- panel=create_command("LIRE_MAILLAGE",panel) -- command=panel.node -- panel=nomme_concept("MAILLA2",panel) -- panel=select_node(command) -- panel=create_mocle("UNITE",panel) -- panel=set_valeur("P4[1]",panel) -- command.collapse() -- panel=select_node(command) -- #FORMULE -- panel=create_formule("az","a,z","a+z",panel) -- #commande AFFE_MODELE -- panel=create_command("AFFE_MODELE",panel) -- command=panel.node -- select_child("MAILLAGE",command) -- panel=select_node(command) -- panel=create_mocle("AFFE",panel) -- parent=panel.node -- panel=select_child("PHENOMENE",parent) -- choose_valeur("MECANIQUE",panel) -- panel=select_child("b_mecanique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("3D",panel) -- add_valeur_into("3D_FLUIDE",panel) -- valider_valeur(panel) -- panel=select_node(parent) -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_node(command) -- panel=nomme_concept("MO",panel) -- command.collapse() -- #fin commande AFFE_MODELE -- panel=copier_coller() -- command=panel.node -- panel=create_mocle("AFFE",panel) -- panel=select_node(command) -- panel=create_mocle("AFFE",panel) -- panel=select_mcf("AFFE",1,command) -- parent=panel.node -- panel=create_mocle("GROUP_NO",panel) -- add_valeur("'GNP3','GNP5','GNP6','GNP7','GNP8','GNP9','GNP10','GNP11','GNP12'",panel) -- valider_valeur(panel) -- panel=select_child("PHENOMENE",parent) -- choose_valeur("ACOUSTIQUE",panel) -- panel=select_child("b_acoustique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("PLAN",panel) -- valider_valeur(panel) -- -- panel=select_mcf("AFFE",2,command) -- parent=panel.node -- panel=create_mocle("GROUP_MA",panel) -- add_valeur("MASSES",panel) -- valider_valeur(panel) -- panel=select_child("PHENOMENE",parent) -- choose_valeur("THERMIQUE",panel) -- panel=select_child("b_thermique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("COQUE",panel) -- valider_valeur(panel) -- -- panel=select_node(command) -- panel=nomme_concept("AFFE1",panel) -- command.collapse() -- #fin commande AFFE_MODELE -- #commande AFFE_CARA_ELEM -- panel=create_command("AFFE_CARA_ELEM",panel) -- command=panel.node -- panel=select_node(command) -- panel=create_mocle("POUTRE",panel) -- parent=panel.node -- panel=select_child("SECTION",parent) -- choose_valeur("CERCLE",panel) -- panel=select_child("b_cercle",parent) -- panel=select_child("b_constant",panel.node) -- p=panel.node -- panel=select_child("CARA",p) -- add_valeur_into("R",panel) -- add_valeur_into("EP",panel) -- valider_valeur(panel) -- panel=select_child("VALE",p) -- add_valeur("1,2",panel) -- valider_valeur(panel) -- panel=select_node(parent) -- panel=create_mocle("GROUP_MA",panel) -- add_valeur("GR1,GR2",panel) -- valider_valeur(panel) -- panel=select_child("MODELE",command) -- choose_assd("MO",panel) -- panel=select_node(command) -- panel=nomme_concept("CARA",panel) -- command.collapse() -- #fin commande AFFE_CARA_ELEM -- panel=create_command("DEFI_FONCTION",panel) -- command=panel.node -- panel=create_mocle("VALE",panel) -- add_valeur("5.0,3.0",panel) -- add_valeur("P4[1],P3",panel) -- valider_valeur(panel) -- panel=select_child("NOM_PARA",command) -- add_valeur("DX",panel) -- panel=select_node(command) -- panel=nomme_concept("F1",panel) -- command.collapse() -- #fin DEFI_FONCTION -- panel=create_command("DEFI_FONCTION",panel) -- command=panel.node -- panel=create_mocle("VALE_C",panel) -- add_valeur("5.0,7.0,9.0",panel) -- add_valeur("9.0,8.0,7.0",panel) -- valider_valeur(panel) -- panel=select_child("NOM_PARA",command) -- add_valeur("DRX",panel) -- panel=select_node(command) -- panel=nomme_concept("F3",panel) -- command.collapse() -- #fin DEFI_FONCTION --#MATER2=DEFI_MATERIAU(ELAS=_F(E=100000000000.0, --# NU=0.0,), --# ECRO_ASYM_LINE=_F(DC_SIGM_EPSI=0.0, --# SY_C=200000000.0, --# DT_SIGM_EPSI=0.0, --# SY_T=50000000.0,),); -- -- panel=create_command("DEFI_MATERIAU",panel) -- command=panel.node -- panel=create_mocle("ELAS",panel) -- p=panel.node -- panel=select_child("E",p) -- set_valeur("100000000000.0",panel) -- panel=select_child("NU",p) -- set_valeur("0.0",panel) -- panel=select_node(command) -- panel=create_mocle("ECRO_ASYM_LINE",panel) -- p=panel.node -- panel=select_child("DC_SIGM_EPSI",p) -- set_valeur("0.0",panel) -- panel=select_child("SY_C",p) -- set_valeur("200000000.0",panel) -- panel=select_child("DT_SIGM_EPSI",p) -- set_valeur("0.0",panel) -- panel=select_child("SY_T",p) -- set_valeur("50000000.0",panel) -- panel=select_node(command) -- panel=nomme_concept("MATER2",panel) -- command.collapse() -- #fin DEFI_MATERIAU -- #PS1=DEFI_PARA_SENSI(VALE=1.0,); -- #PS2=DEFI_PARA_SENSI(VALE=1.0,); -- #PS3=DEFI_PARA_SENSI(VALE=1.0,); -- panel=create_command("DEFI_PARA_SENSI",panel) -- command=panel.node -- panel=select_child("VALE",command) -- set_valeur("1.0",panel) -- panel=select_node(command) -- panel=nomme_concept("PS1",panel) -- command.collapse() -- panel=create_command("DEFI_PARA_SENSI",panel) -- command=panel.node -- panel=select_child("VALE",command) -- set_valeur("1.0",panel) -- panel=select_node(command) -- panel=nomme_concept("PS2",panel) -- command.collapse() -- panel=create_command("DEFI_PARA_SENSI",panel) -- command=panel.node -- panel=select_child("VALE",command) -- set_valeur("1.0",panel) -- panel=select_node(command) -- panel=nomme_concept("PS3",panel) -- command.collapse() --#CHMAT2=AFFE_MATERIAU(MAILLAGE=MAIL, --# AFFE=_F(TOUT='OUI', --# MATER=MATER2,),); -- panel=create_command("AFFE_MATERIAU",panel) -- command=panel.node -- panel=select_child("MAILLAGE",command) -- panel=select_child("AFFE",command) -- affe=panel.node -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_child("MATER",affe) -- add_valeur_into("MATER2",panel) -- valider_valeur(panel) -- panel=select_node(command) -- panel=nomme_concept("CHMAT2",panel) -- command.collapse() --#AAAZ=AFFE_CHAR_THER(MODELE=AFFE1, --# TEMP_IMPO=_F(TOUT='OUI', --# TEMP=0.0,),); -- panel=create_command("AFFE_CHAR_THER",panel) -- command=panel.node -- panel=create_mocle("TEMP_IMPO",panel) -- temp=panel.node -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_node(temp) -- panel=create_mocle("TEMP",panel) -- panel=set_valeur("0.0",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_node(command) -- panel=nomme_concept("AAAZ",panel) -- command.collapse() --#TH1=THER_LINEAIRE(MODELE=AFFE1, --# CHAM_MATER=CHMAT2, --# EXCIT=_F(CHARGE=AAAZ,), --# SENSIBILITE=(PS1,PS2,),); -- panel=create_command("THER_LINEAIRE",panel) -- command=panel.node -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("CHAM_MATER",command) -- panel=select_child("EXCIT",command) -- panel=select_child("CHARGE",panel.node) -- panel=select_node(command) -- panel=create_mocle("SENSIBILITE",panel) -- add_valeur_into("PS1",panel) -- add_valeur_into("PS2",panel) -- valider_valeur(panel) -- panel=select_node(command) -- panel=nomme_concept("TH1",panel) -- command.collapse() --#ACA1=AFFE_CHAR_ACOU(MODELE=AFFE1, --# PRES_IMPO=_F(TOUT='OUI', --# PRES=('RI',3.0,3.0,),),); -- panel=create_command("AFFE_CHAR_ACOU",panel) -- command=panel.node -- panel=create_mocle("PRES_IMPO",panel) -- pres=panel.node -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("PRES",pres) -- set_complexe("'RI',3.0,3.0",panel) -- panel=select_node(command) -- panel=nomme_concept("ACA1",panel) -- command.collapse() --#MACRO_MATR_ASSE(MODELE=AFFE1, --# NUME_DDL=CO('DDL1'), --# MATR_ASSE=_F(MATRICE=CO('MAT1'), --# OPTION='RIGI_THER',),); -- panel=create_command("MACRO_MATR_ASSE",panel) -- command=panel.node -- panel=select_child("NUME_DDL",command) -- set_sdco("DDL1",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("MATR_ASSE",command) -- matr=panel.node -- panel=select_child("OPTION",matr) -- choose_valeur("RIGI_THER",panel) -- panel=select_child("MATRICE",matr) -- set_sdco("MAT1",panel) -- panel=select_node(command) -- command.collapse() --#MACRO_MATR_ASSE(MODELE=AFFE1, --# NUME_DDL=DDL1, --# MATR_ASSE=_F(MATRICE=MAT1, --# OPTION='RIGI_THER',),); -- panel=create_command("MACRO_MATR_ASSE",panel) -- command=panel.node -- panel=select_child("NUME_DDL",command) -- choose_sdco("DDL1",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("MATR_ASSE",command) -- matr=panel.node -- panel=select_child("OPTION",matr) -- choose_valeur("RIGI_THER",panel) -- panel=select_child("MATRICE",matr) -- set_sdco("MAT2",panel) -- panel=select_node(command) -- command.collapse() -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() diff --cc Tests/testihm7/testihm2.py index 37de0da2,829a2086..00000000 deleted file mode 100644,100644 --- a/Tests/testihm7/testihm2.py +++ /dev/null @@@ -1,70 -1,70 +1,0 @@@ --# -*- coding: utf-8 -*- --# Modules Python --import os --import unittest --import difflib --import compare --import sys --import Tkinter -- --# Modules Eficas --import prefs --from Editeur import session --from InterfaceTK import eficas_go,splash,eficas,images --from common import * -- -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.root = Tkinter.Tk() -- images.update_cache() -- # Analyse des arguments de la ligne de commande -- options=session.parse([]) -- options.cata="v7" -- pass -- -- def tearDown(self): -- self.root.destroy() -- init_common(None,None) -- pass -- -- def test000(self): -- root=self.root -- code="ASTER" -- splash.init_splash(root,code=code,titre="Lancement d'EFICAS pour %s" %code) -- splash._splash.configure(text="Chargement d'EFICAS en cours.\n Veuillez patienter ...") -- app=eficas.EFICAS(root,code=code) -- j=app.bureau.newJDC() -- jdcdisplay=app.bureau.JDCDisplay_courant -- init_common(root,jdcdisplay) -- -- # commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) -- # commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) -- -- jdctree=jdcdisplay.tree.tree.children[0] -- panel=select_child("DEBUT",jdctree) -- panel=create_command("LIRE_MAILLAGE",panel) -- panel=nomme_concept("MA",panel) -- -- panel=create_command("AFFE_MODELE",panel) -- command=panel.node -- select_child("MAILLAGE",command) -- panel=select_node(command) -- panel=create_mocle("AFFE",panel) -- parent=panel.node -- panel=select_child("PHENOMENE",parent) -- choose_valeur("MECANIQUE",panel) -- panel=select_child("b_mecanique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("3D",panel) -- add_valeur_into("3D_FLUIDE",panel) -- valider_valeur(panel) -- panel=select_node(parent) -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_node(command) -- panel=nomme_concept("MO",panel) -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() diff --cc Tests/testihm7/testihm4.py index 6dbd0025,505a21ac..00000000 deleted file mode 100644,100644 --- a/Tests/testihm7/testihm4.py +++ /dev/null @@@ -1,55 -1,55 +1,0 @@@ --# -*- coding: utf-8 -*- --# Modules Python --import os --import unittest --import difflib --import compare --import sys --import Tkinter -- --# Modules Eficas --import prefs --from Editeur import session --from InterfaceTK import eficas_go,splash,eficas,images --from common import * -- -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.root = Tkinter.Tk() -- images.update_cache() -- # Analyse des arguments de la ligne de commande -- options=session.parse([]) -- options.cata="v7" -- pass -- -- def tearDown(self): -- self.root.destroy() -- init_common(None,None) -- pass -- -- def test000(self): -- root=self.root -- code="ASTER" -- splash.init_splash(root,code=code,titre="Lancement d'EFICAS pour %s" %code) -- splash._splash.configure(text="Chargement d'EFICAS en cours.\n Veuillez patienter ...") -- app=eficas.EFICAS(root,code=code) -- file=os.path.join(prefs.INSTALLDIR,"Tests/testelem/az.comm") -- j=app.bureau.openJDC(file=file) -- jdcdisplay=app.bureau.JDCDisplay_courant -- init_common(root,jdcdisplay) -- jdctree=jdcdisplay.tree.tree.children[0] -- #commentariser commande MACRO_MATR_ASSE -- panel=select_child("MACRO_MATR_ASSE",jdctree) -- panel=comment_command(panel) -- #decommentariser commande MACRO_MATR_ASSE - panel=uncomment_command(panel) - panel=unComment_command(panel) -- #creation commande commentée -- panel=create_command("LIRE_MAILLAGE",panel) -- panel=comment_command(panel) -- panel=change_commandcomm("mm=LIRE_MAILLAGE(INFO=2,UNITE=21)",panel) - panel=uncomment_command(panel) - panel=unComment_command(panel) -- panel=select_child("DEFI_FONCTION",jdctree) -- delete_node(panel) -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() diff --cc Tests/testihm9/common.py index 911387bf,35eafb0f..00000000 deleted file mode 100644,100644 --- a/Tests/testihm9/common.py +++ /dev/null @@@ -1,209 -1,209 +1,0 @@@ --# -*- coding: utf-8 -*- -- --from tkMessageBox import showinfo --root=None --jdcdisplay=None -- --class UnKnownNode(Exception):pass -- --def pause(): -- if 1: -- showinfo("Pause","Pause") -- --def init_common(r,j): -- global root,jdcdisplay -- root=r -- jdcdisplay=j -- --def KP_return(): -- root.event_generate("") -- root.update() -- --def delete_node(panel): -- panel.node.delete() -- - def uncomment_command(panel): -def unComment_command(panel): -- panel.bouton_unc.invoke() -- root.update() -- panel=jdcdisplay.panel_courant -- return panel -- --def comment_command(panel): -- panel.nb.selectpage('Commentaire') -- panel.comment_commande() -- root.update() -- panel=jdcdisplay.panel_courant -- return panel -- --def create_mocle(nom,panel): -- panel.nb.selectpage('Mocles') -- panel.Liste.afficheMot(nom) -- root.update() -- label=panel.Liste.dico_labels[nom] -- label.event_generate("") -- root.event_generate("") -- root.update() -- return jdcdisplay.panel_courant -- --def change_commandcomm(text,panel): -- panel.widget_text.setvalue(text) -- root.update() -- panel.bouton_val.invoke() -- return panel -- --def create_command(nom,panel): -- panel.nb.selectpage('Commande') -- root.update() -- panel.command_entry.setentry(nom) -- panel.command_entry.component('entry').focus_set() -- root.event_generate("") -- root.update() -- label=panel.liste_command.dico_labels[nom] -- label.event_generate("") -- label.event_generate("") -- root.update() -- panel=jdcdisplay.panel_courant -- return panel -- --def create_comment(text,panel): -- panel.nb.selectpage('Commentaire') -- panel.ajout_commentaire() -- root.update() -- panel=jdcdisplay.panel_courant -- panel.widget_text.setvalue(text) -- root.update() -- panel.bouton_val.invoke() -- #panel.change_valeur() -- return panel -- --def create_param(nom,valeur,panel): -- panel.nb.selectpage('Commentaire') -- panel.ajout_parametre() -- root.update() -- panel=jdcdisplay.panel_courant -- if nom: -- panel.entry_nom.delete(0,"end") -- panel.entry_nom.insert(0,nom) -- panel.entry_nom.event_generate("") -- panel.entry_val.delete(0,"end") -- panel.entry_val.insert(0,valeur) -- panel.entry_val.event_generate("") -- panel.bouton_val.invoke() -- root.update() -- return panel -- --def create_formule(nom,args,expr,panel): -- panel=create_command("FORMULE",panel) -- panel.entry_nom.delete(0,"end") -- panel.entry_nom.insert(0,nom) -- panel.entry_nom.event_generate("") -- panel.entry_arg.delete(0,"end") -- panel.entry_arg.insert(0,args) -- panel.entry_arg.event_generate("") -- panel.entry_exp.delete(0,"end") -- panel.entry_exp.insert(0,expr) -- panel.entry_exp.event_generate("") -- panel.bouton_val.invoke() -- root.update() -- return panel -- --def nomme_concept(nom,panel): -- panel.nb.selectpage('Concept') -- root.update() -- panel._any.delete(0,"end") -- panel._any.insert(0,nom) -- panel.but_ok.invoke() -- root.update() -- return jdcdisplay.panel_courant -- --def select_mcf(nom,ind,node): -- panel=select_child(nom,node) -- parent=panel.node -- parent.expand() -- parent.select_next(ind) -- panel=jdcdisplay.panel_courant -- panel.node.expand() -- return panel -- --def select_child(nom,node): -- """node est le parent dont on veut le fils nom""" -- for n in node.children: -- if n.item.nom == nom: -- n.select() -- root.update() -- panel= jdcdisplay.panel_courant -- panel.node.expand() -- return panel -- raise UnKnownNode(nom) -- --def select_node(node): -- node.select() -- node.expand() -- root.update() -- return jdcdisplay.panel_courant -- --def choose_valeur(valeur,panel): -- panel.Liste_choix.afficheMot(valeur) -- root.update() -- label=panel.Liste_choix.dico_labels[valeur] -- label.event_generate("") -- label.event_generate("") -- root.update() -- --def choose_sdco(valeur,panel): -- i = list(panel.listbox.get(0, 'end')).index(valeur) -- panel.listbox.component("listbox").selection_set(i) -- panel.listbox.component("listbox").focus_set() -- panel.listbox.component("listbox").event_generate("") -- root.update() -- --def choose_assd(valeur,panel): -- i = list(panel.listbox.get(0, 'end')).index(valeur) -- panel.listbox.component("listbox").selection_set(i) -- panel.but_val.invoke() -- root.update() -- --def set_valeur(valeur,panel): -- panel.entry.delete(0,"end") -- panel.entry.insert(0,valeur) -- panel.entry.event_generate("") -- root.update() -- --def set_sdco(valeur,panel): -- panel.b_co.invoke('OUI') -- root.update() -- panel.entry_co.delete(0,"end") -- panel.entry_co.insert(0,valeur) -- panel.entry_co.event_generate("") -- root.update() -- --def set_complexe(valeur,panel): -- panel.entry3.setentry(valeur) -- panel.entry3.component('entry').focus_set() -- panel.entry3.event_generate("") -- root.update() -- --def add_valeur_into(valeur,panel): -- label=panel.Liste_choix.dico_labels[valeur] -- panel.Liste_choix.afficheMot(valeur) -- root.update() -- label.event_generate("<1>") -- panel.bouton_add.invoke() -- root.update() -- --def add_valeur(valeur,panel): -- panel.entry.delete(0,"end") -- panel.entry.insert(0,valeur) -- panel.entry.event_generate("") -- root.update() -- --def valider_valeur(panel): -- panel.bouton_accepter.invoke() -- root.update() -- --def copier_coller(): -- root.event_generate("") -- root.event_generate("") -- root.update() -- return jdcdisplay.panel_courant -- diff --cc Tests/testihm9/testihm1.py index 0c1b6699,98b18eeb..00000000 deleted file mode 100644,100644 --- a/Tests/testihm9/testihm1.py +++ /dev/null @@@ -1,334 -1,334 +1,0 @@@ --# -*- coding: utf-8 -*- --# Modules Python --import os --import unittest --import difflib --import compare --import sys --import Tkinter -- --# Modules Eficas --import prefs --from Editeur import session --from InterfaceTK import eficas_go,splash,eficas,images --from common import * -- --version='v9' -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.root = Tkinter.Tk() -- images.update_cache() -- # Analyse des arguments de la ligne de commande -- options=session.parse([]) -- options.cata=version -- pass -- -- def tearDown(self): -- self.root.destroy() -- init_common(None,None) -- pass -- -- def test000(self): -- root=self.root -- code="ASTER" -- splash.init_splash(root,code=code,titre="Lancement d'EFICAS pour %s" %code) -- splash._splash.configure(text="Chargement d'EFICAS en cours.\n Veuillez patienter ...") -- app=eficas.EFICAS(root,code=code) -- j=app.bureau.newJDC() -- jdcdisplay=app.bureau.JDCDisplay_courant -- init_common(root,jdcdisplay) -- -- # commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) -- # commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) -- -- jdctree=jdcdisplay.tree.tree.children[0] -- panel=select_child("DEBUT",jdctree) -- -- panel=create_param("P1",9.8,panel) -- panel=create_param("P2",8.8,panel) -- panel=create_param("P3",7,panel) -- panel=create_param("P4","[2,3,4]",panel) -- panel=create_param("P5","P3*P1",panel) -- panel=create_param(None,"P1-3",panel) -- panel=create_comment("Pas trouve shellpanel",panel) -- -- #commnde LIRE_MAILLAGE -- panel=create_command("LIRE_MAILLAGE",panel) -- command=panel.node -- panel=nomme_concept("MAILLA2",panel) -- panel=select_node(command) -- panel=create_mocle("UNITE",panel) -- panel=set_valeur("P4[1]",panel) -- command.collapse() -- panel=select_node(command) -- #FORMULE -- panel=create_formule("az","a,z","a+z",panel) -- #commande AFFE_MODELE -- panel=create_command("AFFE_MODELE",panel) -- command=panel.node -- select_child("MAILLAGE",command) -- panel=select_node(command) -- panel=create_mocle("AFFE",panel) -- parent=panel.node -- panel=select_child("PHENOMENE",parent) -- choose_valeur("MECANIQUE",panel) -- panel=select_child("b_mecanique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("3D",panel) -- add_valeur_into("3D_FLUIDE",panel) -- valider_valeur(panel) -- panel=select_node(parent) -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_node(command) -- panel=nomme_concept("MO",panel) -- command.collapse() -- #fin commande AFFE_MODELE -- panel=copier_coller() -- command=panel.node -- panel=create_mocle("AFFE",panel) -- panel=select_node(command) -- panel=create_mocle("AFFE",panel) -- panel=select_mcf("AFFE",1,command) -- parent=panel.node -- panel=create_mocle("GROUP_NO",panel) -- add_valeur("'GNP3','GNP5','GNP6','GNP7','GNP8','GNP9','GNP10','GNP11','GNP12'",panel) -- valider_valeur(panel) -- panel=select_child("PHENOMENE",parent) -- choose_valeur("ACOUSTIQUE",panel) -- panel=select_child("b_acoustique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("PLAN",panel) -- valider_valeur(panel) -- -- panel=select_mcf("AFFE",2,command) -- parent=panel.node -- panel=create_mocle("GROUP_MA",panel) -- add_valeur("MASSES",panel) -- valider_valeur(panel) -- panel=select_child("PHENOMENE",parent) -- choose_valeur("THERMIQUE",panel) -- panel=select_child("b_thermique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("COQUE",panel) -- valider_valeur(panel) -- -- panel=select_node(command) -- panel=nomme_concept("AFFE1",panel) -- command.collapse() -- #fin commande AFFE_MODELE -- #commande AFFE_CARA_ELEM -- panel=create_command("AFFE_CARA_ELEM",panel) -- command=panel.node -- panel=select_node(command) -- panel=create_mocle("POUTRE",panel) -- parent=panel.node -- panel=select_child("SECTION",parent) -- choose_valeur("CERCLE",panel) -- panel=select_child("b_cercle",parent) -- panel=select_child("b_constant",panel.node) -- p=panel.node -- panel=select_child("CARA",p) -- add_valeur_into("R",panel) -- add_valeur_into("EP",panel) -- valider_valeur(panel) -- panel=select_child("VALE",p) -- add_valeur("1,2",panel) -- valider_valeur(panel) -- panel=select_node(parent) -- panel=create_mocle("GROUP_MA",panel) -- add_valeur("GR1,GR2",panel) -- valider_valeur(panel) -- panel=select_child("MODELE",command) -- choose_assd("MO",panel) -- panel=select_node(command) -- panel=nomme_concept("CARA",panel) -- command.collapse() -- #fin commande AFFE_CARA_ELEM -- panel=create_command("DEFI_FONCTION",panel) -- command=panel.node -- panel=create_mocle("VALE",panel) -- add_valeur("5.0,3.0",panel) -- add_valeur("P4[1],P3",panel) -- valider_valeur(panel) -- panel=select_child("NOM_PARA",command) -- choose_valeur("DX",panel) -- panel=select_node(command) -- panel=nomme_concept("F1",panel) -- command.collapse() -- #fin DEFI_FONCTION -- panel=create_command("DEFI_FONCTION",panel) -- command=panel.node -- panel=create_mocle("VALE_C",panel) -- add_valeur("5.0,7.0,9.0",panel) -- add_valeur("9.0,8.0,7.0",panel) -- valider_valeur(panel) -- panel=select_child("NOM_PARA",command) -- choose_valeur("DRX",panel) -- panel=select_node(command) -- panel=nomme_concept("F3",panel) -- command.collapse() -- #fin DEFI_FONCTION --#MATER2=DEFI_MATERIAU(ELAS=_F(E=100000000000.0, --# NU=0.0,), --# ECRO_ASYM_LINE=_F(DC_SIGM_EPSI=0.0, --# SY_C=200000000.0, --# DT_SIGM_EPSI=0.0, --# SY_T=50000000.0,),); -- -- panel=create_command("DEFI_MATERIAU",panel) -- command=panel.node -- panel=create_mocle("ELAS",panel) -- p=panel.node -- panel=select_child("E",p) -- set_valeur("100000000000.0",panel) -- panel=select_child("NU",p) -- set_valeur("0.0",panel) -- panel=select_node(command) -- panel=create_mocle("ECRO_ASYM_LINE",panel) -- p=panel.node -- panel=select_child("DC_SIGM_EPSI",p) -- set_valeur("0.0",panel) -- panel=select_child("SY_C",p) -- set_valeur("200000000.0",panel) -- panel=select_child("DT_SIGM_EPSI",p) -- set_valeur("0.0",panel) -- panel=select_child("SY_T",p) -- set_valeur("50000000.0",panel) -- panel=select_node(command) -- panel=nomme_concept("MATER2",panel) -- command.collapse() -- #fin DEFI_MATERIAU -- #PS1=DEFI_PARA_SENSI(VALE=1.0,); -- #PS2=DEFI_PARA_SENSI(VALE=1.0,); -- #PS3=DEFI_PARA_SENSI(VALE=1.0,); -- panel=create_command("DEFI_PARA_SENSI",panel) -- command=panel.node -- panel=select_child("VALE",command) -- set_valeur("1.0",panel) -- panel=select_node(command) -- panel=nomme_concept("PS1",panel) -- command.collapse() -- panel=create_command("DEFI_PARA_SENSI",panel) -- command=panel.node -- panel=select_child("VALE",command) -- set_valeur("1.0",panel) -- panel=select_node(command) -- panel=nomme_concept("PS2",panel) -- command.collapse() -- panel=create_command("DEFI_PARA_SENSI",panel) -- command=panel.node -- panel=select_child("VALE",command) -- set_valeur("1.0",panel) -- panel=select_node(command) -- panel=nomme_concept("PS3",panel) -- command.collapse() --#CHMAT2=AFFE_MATERIAU(MAILLAGE=MAIL, --# AFFE=_F(TOUT='OUI', --# MATER=MATER2,),); -- panel=create_command("AFFE_MATERIAU",panel) -- command=panel.node -- panel=select_child("MAILLAGE",command) -- panel=select_child("AFFE",command) -- affe=panel.node -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_child("MATER",affe) -- add_valeur_into("MATER2",panel) -- valider_valeur(panel) -- panel=select_node(command) -- panel=nomme_concept("CHMAT2",panel) -- command.collapse() --#AAAZ=AFFE_CHAR_THER(MODELE=AFFE1, --# TEMP_IMPO=_F(TOUT='OUI', --# TEMP=0.0,),); -- panel=create_command("AFFE_CHAR_THER",panel) -- command=panel.node -- panel=create_mocle("TEMP_IMPO",panel) -- temp=panel.node -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_node(temp) -- panel=create_mocle("TEMP",panel) -- panel=set_valeur("0.0",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_node(command) -- panel=nomme_concept("AAAZ",panel) -- command.collapse() --#TH1=THER_LINEAIRE(MODELE=AFFE1, --# CHAM_MATER=CHMAT2, --# EXCIT=_F(CHARGE=AAAZ,), --# SENSIBILITE=(PS1,PS2,),); -- panel=create_command("THER_LINEAIRE",panel) -- command=panel.node -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("CHAM_MATER",command) -- panel=select_child("EXCIT",command) -- panel=select_child("CHARGE",panel.node) -- panel=select_node(command) -- panel=create_mocle("SENSIBILITE",panel) -- add_valeur_into("PS1",panel) -- add_valeur_into("PS2",panel) -- valider_valeur(panel) -- panel=select_node(command) -- panel=nomme_concept("TH1",panel) -- command.collapse() --#ACA1=AFFE_CHAR_ACOU(MODELE=AFFE1, --# PRES_IMPO=_F(TOUT='OUI', --# PRES=('RI',3.0,3.0,),),); -- panel=create_command("AFFE_CHAR_ACOU",panel) -- command=panel.node -- panel=create_mocle("PRES_IMPO",panel) -- pres=panel.node -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("PRES",pres) -- set_complexe("'RI',3.0,3.0",panel) -- panel=select_node(command) -- panel=nomme_concept("ACA1",panel) -- command.collapse() --#MACRO_MATR_ASSE(MODELE=AFFE1, --# NUME_DDL=CO('DDL1'), --# MATR_ASSE=_F(MATRICE=CO('MAT1'), --# OPTION='RIGI_THER',),); -- panel=create_command("MACRO_MATR_ASSE",panel) -- command=panel.node -- panel=select_child("NUME_DDL",command) -- set_sdco("DDL1",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("MATR_ASSE",command) -- matr=panel.node -- panel=select_child("OPTION",matr) -- choose_valeur("RIGI_THER",panel) -- panel=select_child("MATRICE",matr) -- set_sdco("MAT1",panel) -- panel=select_node(command) -- command.collapse() --#MACRO_MATR_ASSE(MODELE=AFFE1, --# NUME_DDL=DDL1, --# MATR_ASSE=_F(MATRICE=MAT1, --# OPTION='RIGI_THER',),); -- panel=create_command("MACRO_MATR_ASSE",panel) -- command=panel.node -- panel=select_child("NUME_DDL",command) -- choose_sdco("DDL1",panel) -- panel=select_child("MODELE",command) -- choose_assd("AFFE1",panel) -- panel=select_child("MATR_ASSE",command) -- matr=panel.node -- panel=select_child("OPTION",matr) -- choose_valeur("RIGI_THER",panel) -- panel=select_child("MATRICE",matr) -- set_sdco("MAT2",panel) -- panel=select_node(command) -- command.collapse() -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() diff --cc Tests/testihm9/testihm2.py index ee3762d9,08d38d6b..00000000 deleted file mode 100644,100644 --- a/Tests/testihm9/testihm2.py +++ /dev/null @@@ -1,70 -1,70 +1,0 @@@ --# -*- coding: utf-8 -*- --# Modules Python --import os --import unittest --import difflib --import compare --import sys --import Tkinter -- --# Modules Eficas --import prefs --from Editeur import session --from InterfaceTK import eficas_go,splash,eficas,images --from common import * -- -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.root = Tkinter.Tk() -- images.update_cache() -- # Analyse des arguments de la ligne de commande -- options=session.parse([]) -- options.cata="v9" -- pass -- -- def tearDown(self): -- self.root.destroy() -- init_common(None,None) -- pass -- -- def test000(self): -- root=self.root -- code="ASTER" -- splash.init_splash(root,code=code,titre="Lancement d'EFICAS pour %s" %code) -- splash._splash.configure(text="Chargement d'EFICAS en cours.\n Veuillez patienter ...") -- app=eficas.EFICAS(root,code=code) -- j=app.bureau.newJDC() -- jdcdisplay=app.bureau.JDCDisplay_courant -- init_common(root,jdcdisplay) -- -- # commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) -- # commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) -- -- jdctree=jdcdisplay.tree.tree.children[0] -- panel=select_child("DEBUT",jdctree) -- panel=create_command("LIRE_MAILLAGE",panel) -- panel=nomme_concept("MA",panel) -- -- panel=create_command("AFFE_MODELE",panel) -- command=panel.node -- select_child("MAILLAGE",command) -- panel=select_node(command) -- panel=create_mocle("AFFE",panel) -- parent=panel.node -- panel=select_child("PHENOMENE",parent) -- choose_valeur("MECANIQUE",panel) -- panel=select_child("b_mecanique",parent) -- panel=select_child("MODELISATION",panel.node) -- add_valeur_into("3D",panel) -- add_valeur_into("3D_FLUIDE",panel) -- valider_valeur(panel) -- panel=select_node(parent) -- panel=create_mocle("TOUT",panel) -- choose_valeur("OUI",panel) -- panel=select_node(command) -- panel=nomme_concept("MO",panel) -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() diff --cc Tests/testihm9/testihm3.py index f96a73b8,e95c7def..00000000 deleted file mode 100644,100644 --- a/Tests/testihm9/testihm3.py +++ /dev/null @@@ -1,93 -1,93 +1,0 @@@ --# -*- coding: utf-8 -*- --# Modules Python --import os --import unittest --import difflib --import compare --import sys --import Tkinter -- --# Modules Eficas --import prefs --from Editeur import session --from InterfaceTK import eficas_go,splash,eficas,images --from common import * -- -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.root = Tkinter.Tk() -- images.update_cache() -- # Analyse des arguments de la ligne de commande -- options=session.parse([]) -- options.cata="petit" -- pass -- -- def tearDown(self): -- self.root.destroy() -- init_common(None,None) -- pass -- -- def test000(self): -- root=self.root -- code="ASTER" -- splash.init_splash(root,code=code,titre="Lancement d'EFICAS pour %s" %code) -- splash._splash.configure(text="Chargement d'EFICAS en cours.\n Veuillez patienter ...") -- app=eficas.EFICAS(root,code=code) -- j=app.bureau.newJDC() -- jdcdisplay=app.bureau.JDCDisplay_courant -- init_common(root,jdcdisplay) -- -- # commande DEBUT - co=j.addentite("DEBUT",0) - co=j.addEntite("DEBUT",0) -- # commande FIN - co=j.addentite("FIN",1) - co=j.addEntite("FIN",1) -- -- jdctree=jdcdisplay.tree.tree.children[0] -- panel=select_child("DEBUT",jdctree) -- panel=create_command("TESTS_VALID",panel) -- command=panel.node -- panel=select_child("LongStr",command) -- set_valeur("aaa",panel) -- panel=select_child("ListStr",command) -- add_valeur("aaa",panel) -- add_valeur("bbbb,ccc",panel) -- valider_valeur(panel) -- panel=select_child("PairVal",command) -- add_valeur(2,panel) -- add_valeur("4,6",panel) -- valider_valeur(panel) -- panel=select_child("RangeVal",command) -- set_valeur(4,panel) -- panel=select_child("CardVal",command) -- add_valeur("4,6,5,7",panel) -- valider_valeur(panel) -- panel=select_child("EnumVal",command) -- choose_valeur(3,panel) -- panel=select_child("OrdList",command) -- add_valeur("4,6,5,7",panel) -- valider_valeur(panel) -- panel=select_child("OrdList2",command) -- add_valeur_into(2,panel) -- valider_valeur(panel) -- panel=select_child("TypeVal",command) -- set_valeur(5,panel) -- panel=select_child("Compul",command) -- add_valeur("2",panel) -- add_valeur("1",panel) -- valider_valeur(panel) -- panel=select_child("CompulInto",command) -- add_valeur_into(2,panel) -- add_valeur_into(1,panel) -- valider_valeur(panel) -- panel=select_child("Norep",command) -- add_valeur("2",panel) -- valider_valeur(panel) -- panel=select_child("NorepInto",command) -- add_valeur_into(2,panel) -- valider_valeur(panel) -- -- panel=select_node(command) -- panel=nomme_concept("MA",panel) -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() diff --cc Tests/testihm9/testihm4.py index 20e44bb1,c9a0bfa8..00000000 deleted file mode 100644,100644 --- a/Tests/testihm9/testihm4.py +++ /dev/null @@@ -1,55 -1,55 +1,0 @@@ --# -*- coding: utf-8 -*- --# Modules Python --import os --import unittest --import difflib --import compare --import sys --import Tkinter -- --# Modules Eficas --import prefs --from Editeur import session --from InterfaceTK import eficas_go,splash,eficas,images --from common import * -- -- --class TestCase(unittest.TestCase): -- def setUp(self): -- self.root = Tkinter.Tk() -- images.update_cache() -- # Analyse des arguments de la ligne de commande -- options=session.parse([]) -- options.cata="v9" -- pass -- -- def tearDown(self): -- self.root.destroy() -- init_common(None,None) -- pass -- -- def test000(self): -- root=self.root -- code="ASTER" -- splash.init_splash(root,code=code,titre="Lancement d'EFICAS pour %s" %code) -- splash._splash.configure(text="Chargement d'EFICAS en cours.\n Veuillez patienter ...") -- app=eficas.EFICAS(root,code=code) -- file=os.path.join(prefs.INSTALLDIR,"Tests/testelem/az.comm") -- j=app.bureau.openJDC(file=file) -- jdcdisplay=app.bureau.JDCDisplay_courant -- init_common(root,jdcdisplay) -- jdctree=jdcdisplay.tree.tree.children[0] -- #commentariser commande MACRO_MATR_ASSE -- panel=select_child("MACRO_MATR_ASSE",jdctree) -- panel=comment_command(panel) -- #decommentariser commande MACRO_MATR_ASSE - panel=uncomment_command(panel) - panel=unComment_command(panel) -- #creation commande commentée -- panel=create_command("LIRE_MAILLAGE",panel) -- panel=comment_command(panel) -- panel=change_commandcomm("mm=LIRE_MAILLAGE(INFO=2,UNITE=21)",panel) - panel=uncomment_command(panel) - panel=unComment_command(panel) -- panel=select_child("DEFI_FONCTION",jdctree) -- delete_node(panel) -- - assert j.isvalid(),j.report() - assert j.isValid(),j.report() diff --cc Tools/generateComm.py index 00000000,00000000..2cbc9c7d new file mode 100755 --- /dev/null +++ b/Tools/generateComm.py @@@ -1,0 -1,0 +1,36 @@@ ++#!/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 ++# ++""" ++"" ++ cree le .xml associe au .comm ++ generateXML.py -c leCatalogue le.comm ++ 23 avril ++ ++""" ++# Modules Python ++# Modules Eficas ++ ++import sys ++import os ++sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'../')) ++ ++from InterfaceQT4 import eficas_go ++eficas_go.genereComm(code='NonConnu') diff --cc Tools/generateStructure.py index 00000000,3bcfdc3f..bfcdff00 mode 000000,100755..100755 --- a/Tools/generateStructure.py +++ b/Tools/generateStructure.py @@@ -1,0 -1,33 +1,33 @@@ + #!/usr/bin/env python + # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D ++# 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 + # + """ + cree le .xsd associe au .py + generateXSD.py -c leCatalogueAVECSONNOMCOMPLET POUR TROUVER LE DRIVER + 23 avril + """ + # Modules Python + # Modules Eficas + import sys + import os + sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..')) + + from InterfaceQT4 import eficas_go + eficas_go.genereStructure(code='NonConnu') diff --cc Tools/generateXML.py index 00000000,c67da453..00e995ce mode 000000,100755..100755 --- a/Tools/generateXML.py +++ b/Tools/generateXML.py @@@ -1,0 -1,36 +1,36 @@@ + #!/usr/bin/env python + # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D ++# 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 + # + """ + "" + cree le .xml associe au .comm + generateXML.py -c leCatalogue le.comm + 23 avril + + """ + # Modules Python + # Modules Eficas + + import sys + import os + sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'../')) + + from InterfaceQT4 import eficas_go + eficas_go.genereXML(code='NonConnu') diff --cc Tools/generateXSD.py index 00000000,3f8ad835..2a2c6504 mode 000000,100755..100755 --- a/Tools/generateXSD.py +++ b/Tools/generateXSD.py @@@ -1,0 -1,33 +1,33 @@@ + #!/usr/bin/env python + # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D ++# 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 + # + """ + cree le .xsd associe au .py + generateXSD.py -c leCatalogueAVECSONNOMCOMPLET POUR TROUVER LE DRIVER + 23 avril + """ + # Modules Python + # Modules Eficas + import sys + import os + sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..')) + + from InterfaceQT4 import eficas_go + eficas_go.genereXSD(code='NonConnu') diff --cc Tools/qtEficasGui.py index 00000000,f4315a47..4d6168fd mode 000000,100755..100755 --- a/Tools/qtEficasGui.py +++ b/Tools/qtEficasGui.py @@@ -1,0 -1,46 +1,46 @@@ + #!/usr/bin/env python + # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D ++# 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 + # + """ + Ce module sert a lancer EFICAS contre l avis de Pascale sans directory associee + Dans ce cas on peut taper + a) de n importe ou sans avoir rien positionne : + /leCheminVersTools/qtEficasGui.py -c leFichierCatalogueAvecSonPathComplet + b) En ayant positionne le PYTHONPATH avec la directory qui contient ce qu il faut + c est a dire le prefs.py et prefs_leCode.py + exemple pour Adao + /leCheminVersTools/qtEficasGui.py -k Adao + /leCheminVersTools/qtEficasGui.py -k Adao -v V95 + version du 23 avril + + """ + # Modules Python + # Modules Eficas + + import sys + import os + + repIni=os.path.dirname(os.path.abspath(__file__)) + INSTALLDIR=os.path.join(repIni,'..') + sys.path[:0]=[INSTALLDIR] + #sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'../..')) + + from InterfaceQT4 import eficas_go + eficas_go.lanceEficas(code='NonConnu') diff --cc Tools/validateDataSet.py index 00000000,0ba40437..eb97b15d mode 000000,100755..100755 --- a/Tools/validateDataSet.py +++ b/Tools/validateDataSet.py @@@ -1,0 -1,36 +1,36 @@@ + #!/usr/bin/env python + # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D ++# 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 + # + """ + "" + cree le .xml associe au .comm + generateXML.py -c leCatalogue le.comm + 23 avril + + """ + # Modules Python + # Modules Eficas + + import sys + import os + sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'../')) + + from InterfaceQT4 import eficas_go + eficas_go.validateDataSet(code='NonConnu') diff --cc Traducteur/__init__.py index e4044aec,e4044aec..5b4f0e3b --- a/Traducteur/__init__.py +++ b/Traducteur/__init__.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/calcG.py index 0fb34d91,2549826d..c8879f13 --- a/Traducteur/calcG.py +++ b/Traducteur/calcG.py @@@ -1,5 -1,5 +1,5 @@@ - # -*- coding: utf-8 -*- - # Copyright (C) 2007-2017 EDF R&D + #### -*- coding: utf-8 -*- -# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/changeValeur.py index f9130016,50b0c9c9..3beb5fe1 --- a/Traducteur/changeValeur.py +++ b/Traducteur/changeValeur.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/dictErreurs.py index 1f057c3e,82fc058f..9499e408 --- a/Traducteur/dictErreurs.py +++ b/Traducteur/dictErreurs.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/inseremocle.py index 98448b99,19dc1ceb..4de6dd02 --- a/Traducteur/inseremocle.py +++ b/Traducteur/inseremocle.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/load.py index 2375e805,97128e83..84702cb0 --- a/Traducteur/load.py +++ b/Traducteur/load.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/log.py index 779a9bb5,21c4ab61..385becf8 --- a/Traducteur/log.py +++ b/Traducteur/log.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/mocles.py index 08b2c765,ad5d9bd4..dbbe738a --- a/Traducteur/mocles.py +++ b/Traducteur/mocles.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/movemocle.py index d75ae999,b6b8d919..f4f8fb31 --- a/Traducteur/movemocle.py +++ b/Traducteur/movemocle.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: iso-8859-1 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/parseur.py index e715f2a9,3a525a2f..88315ded --- a/Traducteur/parseur.py +++ b/Traducteur/parseur.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/regles.py index dd11ff29,034844f7..caed7b1f --- a/Traducteur/regles.py +++ b/Traducteur/regles.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/removemocle.py index f9da5345,6694cc1d..b960e22a --- a/Traducteur/removemocle.py +++ b/Traducteur/removemocle.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/renamemocle.py index 188a24a6,2372bf41..da2862e5 --- a/Traducteur/renamemocle.py +++ b/Traducteur/renamemocle.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/toto.comm index a2f211ed,a2f211ed..00000000 deleted file mode 100644,100644 --- a/Traducteur/toto.comm +++ /dev/null @@@ -1,10 -1,10 +1,0 @@@ --DEBUT(); -- --CALC_NONO(reuse=MSLIN, -- RESULTAT=MSLIN, -- OPTION=('EPSI_NOEU','SIEQ_NOEU','EPEQ_NOEU','SIGM_NOEU',),); -- --CALC_NONO(reuse=MSLIN, -- RESULTAT=MSLIN, -- OPTION=('AA','EPSI_NOEU','SIEQ_NOEU','EPEQ_NOEU','SIGM_NOEU',),); --FIN(); diff --cc Traducteur/traduitV10V11.py index aeb62ea8,f15f7b13..5f638c2c --- a/Traducteur/traduitV10V11.py +++ b/Traducteur/traduitV10V11.py @@@ -1,6 -1,6 +1,6 @@@ #!/usr/bin/env python # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/traduitV11V12.py index 37212deb,e64fad7c..da0acf71 --- a/Traducteur/traduitV11V12.py +++ b/Traducteur/traduitV11V12.py @@@ -1,6 -1,6 +1,6 @@@ #!/usr/bin/env python # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/traduitV7V8.py index 5f3b6888,d0a79658..3962c0fd --- a/Traducteur/traduitV7V8.py +++ b/Traducteur/traduitV7V8.py @@@ -1,6 -1,6 +1,6 @@@ #!/usr/bin/env python # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/traduitV8V9.py index 224e781b,092e6c19..975f4982 --- a/Traducteur/traduitV8V9.py +++ b/Traducteur/traduitV8V9.py @@@ -1,6 -1,6 +1,6 @@@ #!/usr/bin/env python # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/traduitV9V10.py index 45570a61,11db2ccd..24f7e53f --- a/Traducteur/traduitV9V10.py +++ b/Traducteur/traduitV9V10.py @@@ -1,6 -1,6 +1,6 @@@ #!/usr/bin/env python # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/utils.py index 9ab9601c,31ab5e87..51174a6c --- a/Traducteur/utils.py +++ b/Traducteur/utils.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc Traducteur/visiteur.py index b58fcba9,b1e8aa2f..c7d9db44 --- a/Traducteur/visiteur.py +++ b/Traducteur/visiteur.py @@@ -1,5 -1,5 +1,5 @@@ # -*- coding: utf-8 -*- --# Copyright (C) 2007-2017 EDF R&D ++# 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 diff --cc UiQT5/Newdoc.tgz index 1ec9456b,1ec9456b..00000000 deleted file mode 100644,100644 Binary files differ diff --cc convert/__init__.py index 04ceb33d,0a063d7a..00000000 deleted file mode 100644,100644 --- a/convert/__init__.py +++ /dev/null @@@ -1,33 -1,32 +1,0 @@@ --# -*- coding: utf-8 -*- - # Copyright (C) 2007-2017 EDF R&D -# 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 --# --""" -- Ce package contient tous les convertisseurs de formats d'entree -- en objets comprehensibles par EFICAS. -- -- Ces convertisseurs sont implementes sous forme de plugins --""" -- --from __future__ import absolute_import --from Extensions import pluginloader -- --import convert -- --plugins=pluginloader.PluginLoader(convert) - diff --cc convert/autre_parseur.py index 794f888a,02428b5b..00000000 deleted file mode 100644,100644 --- a/convert/autre_parseur.py +++ /dev/null @@@ -1,907 -1,907 +1,0 @@@ --# -*- coding: utf-8 -*- - # Copyright (C) 2007-2017 EDF R&D -# 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 __future__ import print_function - try : - from future import standard_library - standard_library.install_aliases() -try : - from future import standard_library - standard_library.install_aliases() --except : - pass - try : - from builtins import str - pass -try : - from builtins import str --except : - pass - pass --from builtins import object --import sys,re,tokenize --import io -- -- --class ENTITE_JDC(object) : -- def __init__(self): -- self.texte = '' -- -- def setText(self,texte): -- self.texte = texte -- -- def appendText(self,texte): -- """ -- """ -- self.texte = self.texte +texte -- --class COMMENTAIRE(ENTITE_JDC): -- -- def __str__(self): -- """ -- Retourne une chaine de caracteres representant self -- sous une forme interpretable par EFICAS -- """ -- t=repr(self.texte) -- return "COMMENTAIRE(u"+t+")\n" -- -- def appendText(self,texte): -- """ -- Ajoute texte a self.texte en enlevant le # initial -- """ -- if texte[0] == '#': -- self.texte = self.texte+texte[1:] -- else: -- # le diese n'est pas sur le premier caractere -- amont,aval = texte.split('#',1) # on decoupe suivant la premiere occurrence de # -- self.texte = self.texte +amont + aval - - --class AFFECTATION(ENTITE_JDC): -- -- def appendText(self,texte): -- """ -- Ajoute texte a self.texte en enlevant tout retour chariot et tout point virgule -- """ -- self.texte = self.texte+texte - - -- def __str__(self): -- """ -- Retourne une expression de l'affectation comprehensible par ACCAS -- et exploitable par EFICAS -- """ -- #t=repr(self.texte) -- t=self.texte -- return "PARAMETRE(nom='"+self.name+"',valeur="+t+")" -- --class COMMANDE_COMMENTARISEE(ENTITE_JDC): -- -- def appendText(self,texte): -- """ -- Ajoute texte a self.texte en enlevant les doubles commentaires -- """ -- texte = texte.strip() -- texte = texte[2:].strip() -- self.texte = self.texte+(len(self.texte)>0)*'\n'+texte -- -- def __str__(self): -- """ -- Retourne une expression de la commande commentarisee comprehensible par ACCAS -- et exploitable par EFICAS -- """ -- return "COMMANDE_COMM(texte="+repr(self.texte)+")\n" -- - - --next = {} --next['if'] = next['elif'] = 'elif', 'else', 'end' --next['while'] = next['for'] = 'else', 'end' --next['try'] = 'except', 'finally' --next['except'] = 'except', 'else', 'end' --next['else'] = next['finally'] = next['def'] = next['class'] = 'end' --next['end'] = () --start = 'if', 'while', 'for', 'try', 'def', 'class' -- --class PARSEUR_PYTHON(object): -- """ - Cette classe sert a creer un objet PARSEUR_PYTHON qui realise l'analyse d'un texte - Cette classe sert a creer un objet PARSEUR_PYTHON qui realise l'analyse d'un texte -- representant un JDC Python en distinguant : -- - les commentaires inter commandes -- - les affectations -- - les commandes -- """ -- # au moins 1 caractere non blanc ou non tabulation -- #pattern_ligne_non_blanche = re.compile(r'^[\w\t]+') -- pattern_ligne_non_blanche = re.compile(r'[^ \t]+') -- kwprog = re.compile( -- r'^\s*(?P[a-z]+)' -- r'(\s+(?P[a-zA-Z_]\w*))?' -- r'[^\w]') -- endprog = re.compile( -- r'^\s*#?\s*end\s+(?P[a-z]+)' -- r'(\s+(?P[a-zA-Z_]\w*))?' -- r'[^\w]') -- wsprog = re.compile(r'^[ \t]*') -- optionprog=re.compile(r'#\s*parse:\s*([^\n\'"]*)$') -- -- def __init__(self,texte): -- # on verifie que le texte fourni se compile correctement -- compile(texte,"",'exec') -- self.texte = io.StringIO(texte) -- self.line='' -- self.out="" -- self.lastcol = 0 -- self.lastrow = 1 -- self.please_indent = 1 -- self.indent_list = [] -- self.indentation=0 -- self.paren_level=0 -- self.affectation=0 -- self.indent_list=[""] -- self.objet_courant=None -- self.affectation_flag=1 -- self.comment_flag=1 -- self.buffer=[] -- self.buffer_indent="" -- -- def getOptions(self): -- m= self.optionprog.match(self.line) -- if m: - option=m.group(1) - name=option[1:] - flag=(option[0] == '+') - if name == "affectation": self.affectation_flag=flag - if name == "comment": self.comment_flag=flag - if name == "all": - self.comment_flag=flag - self.affectation_flag=flag - option=m.group(1) - name=option[1:] - flag=(option[0] == '+') - if name == "affectation": self.affectation_flag=flag - if name == "comment": self.comment_flag=flag - if name == "all": - self.comment_flag=flag - self.affectation_flag=flag -- -- def readline(self): -- self.line= self.texte.readline() -- #print "line:",self.line -- # option ? -- self.getOptions() -- return self.line -- - def getTexte(self,appli=None): - def getTexte(self,appliEficas=None): -- """ -- Retourne le texte issu de l'analyse -- """ -- for tk in tokenize.generate_tokens(self.readline): -- self.processToken(tk) -- return self.out -- -- def processToken(self, tk): -- """ -- """ -- ttype, tstring, spos, epos, line = tk -- thisrow, thiscol = spos -- #print spos, epos,tokenize.tok_name[ttype],self.lastrow, self.lastcol -- -- if thisrow > self.lastrow: -- # si plusieurs lignes (>1) -- self.out=self.out+"\n" * (thisrow - self.lastrow - 1) -- self.lastcol = 0 -- --# if thiscol > self.lastcol : --# self.out=self.out+ " " * (thiscol - self.lastcol) --# self.please_indent = None -- -- self.thiscol=thiscol -- #self.nextrow, self.nextcol = epos -- -- try: -- fn = getattr(self, tokenize.tok_name[ttype]) -- except AttributeError: -- print( "No match!", tokenize.tok_name[ttype], tstring) -- return -- -- if ttype != tokenize.DEDENT and ttype != tokenize.INDENT and self.please_indent: -- self.doIndent() -- -- fn(tstring) -- self.lastrow, self.lastcol = epos -- -- def output(self,tstring): -- #print "output",tstring -- -- if self.thiscol > self.lastcol : -- #print self.thiscol,self.lastcol -- self.out=self.out+ " " * (self.thiscol - self.lastcol) -- self.lastcol=self.thiscol -- -- self.out=self.out+tstring -- -- def outputCom(self,tstring): -- self.out=self.out+tstring -- -- def updateIndent(self): -- #print "updateIndent",len(self.indent_list[-1]),len(self.buffer_indent) -- if len(self.indent_list[-1]) > len(self.buffer_indent): - self.out=self.out+(len(self.indent_list[-1]) - len(self.buffer_indent))*" " - self.buffer_indent=self.indent_list[-1] - self.out=self.out+(len(self.indent_list[-1]) - len(self.buffer_indent))*" " - self.buffer_indent=self.indent_list[-1] -- -- def doIndent(self): -- #print "indentation dans doIndent",len(self.indent_list) -- -- self.out=self.out+self.indent_list[-1] -- self.buffer_indent=self.indent_list[-1] -- if self.lastcol+len(self.indent_list[-1]) > self.thiscol: - self.lastcol=self.thiscol - self.lastcol=self.thiscol -- else: - self.lastcol=self.lastcol+len(self.indent_list[-1]) - self.lastcol=self.lastcol+len(self.indent_list[-1]) -- self.please_indent = None -- -- def flush_buffer(self): -- #if self.buffer: -- # print len(self.indent_list),self.please_indent -- for ob in self.buffer: - self.out= self.out+ str(ob) - self.doIndent() - self.out= self.out+ str(ob) - self.doIndent() -- self.buffer=[] -- self.objet_courant=None -- -- def NL(self, tstring): -- if self.affectation: - if self.paren_level == 0: - # affectation en cours mais complete - self.out= self.out+ str(self.affectation_courante) - self.affectation_courante=None - self.please_indent=1 - self.affectation=0 - else: - # affectation en cours, on ajoute - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - return - - if self.paren_level == 0: - # affectation en cours mais complete - self.out= self.out+ str(self.affectation_courante) - self.affectation_courante=None - self.please_indent=1 - self.affectation=0 - else: - # affectation en cours, on ajoute - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - return - -- if self.objet_courant: - self.objet_courant=None - self.buffer.append(tstring) - self.objet_courant=None - self.buffer.append(tstring) -- # self.please_indent = None - return - return -- self.output(tstring) -- self.please_indent = 1 -- -- def COMMENT(self, tstring): -- liste= string.split(self.line,"##",1) -- if len(liste) > 1: - # On a trouve un double commentaire - before,after=liste - if self.affectation: - # affectation en cours, on ignore - pass - elif self.paren_level > 0: - self.output(tstring) - elif self.comment_flag and not self.pattern_ligne_non_blanche.search(before): - # il s'agit d'une commande commentarisee - if self.objet_courant == None: - if not self.buffer:self.buffer_indent=self.indent_list[-1] - self.objet_courant=COMMANDE_COMMENTARISEE() - self.buffer.append(self.objet_courant) - self.objet_courant.appendText(tstring) - self.please_indent = None - elif isinstance(self.objet_courant,COMMENTAIRE): - self.objet_courant=COMMANDE_COMMENTARISEE() - self.buffer.append(self.objet_courant) - self.objet_courant.appendText(tstring) - self.please_indent = None - else: - self.objet_courant.appendText(tstring) - self.please_indent = None - else: - # commentaire inline - self.output(tstring) - self.please_indent = 1 - return - # On a trouve un double commentaire - before,after=liste - if self.affectation: - # affectation en cours, on ignore - pass - elif self.paren_level > 0: - self.output(tstring) - elif self.comment_flag and not self.pattern_ligne_non_blanche.search(before): - # il s'agit d'une commande commentarisee - if self.objet_courant == None: - if not self.buffer:self.buffer_indent=self.indent_list[-1] - self.objet_courant=COMMANDE_COMMENTARISEE() - self.buffer.append(self.objet_courant) - self.objet_courant.appendText(tstring) - self.please_indent = None - elif isinstance(self.objet_courant,COMMENTAIRE): - self.objet_courant=COMMANDE_COMMENTARISEE() - self.buffer.append(self.objet_courant) - self.objet_courant.appendText(tstring) - self.please_indent = None - else: - self.objet_courant.appendText(tstring) - self.please_indent = None - else: - # commentaire inline - self.output(tstring) - self.please_indent = 1 - return -- -- else: - # On a un commentaire simple - new_line = self.line.split('#')[0] - if self.affectation: - # affectation en cours, on ignore - pass - elif self.paren_level > 0: - self.output(tstring) - elif self.comment_flag and not self.pattern_ligne_non_blanche.search(new_line): - # commentaire precede de blancs - if self.objet_courant == None: - if not self.buffer:self.buffer_indent=self.indent_list[-1] - self.objet_courant=COMMENTAIRE() - self.buffer.append(self.objet_courant) - self.objet_courant.appendText(tstring) - self.please_indent = None - elif isinstance(self.objet_courant,COMMANDE_COMMENTARISEE): - self.objet_courant=COMMENTAIRE() - self.buffer.append(self.objet_courant) - self.objet_courant.appendText(tstring) - self.please_indent = None - else: - self.objet_courant.appendText(tstring) - self.please_indent = None - else: - # commentaire inline - self.output(tstring) - self.please_indent = 1 - return - # On a un commentaire simple - new_line = self.line.split('#')[0] - if self.affectation: - # affectation en cours, on ignore - pass - elif self.paren_level > 0: - self.output(tstring) - elif self.comment_flag and not self.pattern_ligne_non_blanche.search(new_line): - # commentaire precede de blancs - if self.objet_courant == None: - if not self.buffer:self.buffer_indent=self.indent_list[-1] - self.objet_courant=COMMENTAIRE() - self.buffer.append(self.objet_courant) - self.objet_courant.appendText(tstring) - self.please_indent = None - elif isinstance(self.objet_courant,COMMANDE_COMMENTARISEE): - self.objet_courant=COMMENTAIRE() - self.buffer.append(self.objet_courant) - self.objet_courant.appendText(tstring) - self.please_indent = None - else: - self.objet_courant.appendText(tstring) - self.please_indent = None - else: - # commentaire inline - self.output(tstring) - self.please_indent = 1 - return -- -- def ERRORTOKEN(self, tstring): -- print("ERRORTOKEN", tstring) -- -- def NAME(self, tstring): -- if self.buffer: - self.updateIndent() - self.updateIndent() -- self.flush_buffer() -- -- if self.affectation ==1: - # on a une expression du type NAME=NAME - # on ne veut pas des expressions qui commencent par NAME=NAME(NAME= - # on en prend le chemin : on met affectation a 3 pour le signaler - # on attend d'en savoir plus - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=3 - return - # on a une expression du type NAME=NAME - # on ne veut pas des expressions qui commencent par NAME=NAME(NAME= - # on en prend le chemin : on met affectation a 3 pour le signaler - # on attend d'en savoir plus - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=3 - return -- elif self.affectation ==4: - # on a une expression qui commence par NAME=NAME(NAME - # il s'agit tres probablement d'une commande - # on annule l'affectation en cours - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=5 - return - # on a une expression qui commence par NAME=NAME(NAME - # il s'agit tres probablement d'une commande - # on annule l'affectation en cours - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=5 - return -- elif self.affectation == 2: - # affectation en cours, on ajoute - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=2 - return - # affectation en cours, on ajoute - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=2 - return -- self.affectation=0 -- self.name=None - if self.paren_level == 0 and self.affectation_flag: - # si on est en dehors de parentheses et en mode transformation d'affectation - # on initialise l'attribut name qui indique une affectation en cours - self.name=tstring - if self.paren_level == 0 and self.affectation_flag: - # si on est en dehors de parentheses et en mode transformation d'affectation - # on initialise l'attribut name qui indique une affectation en cours - self.name=tstring -- self.output(tstring) -- -- def ident(self, tstring): -- self.flush_buffer() -- self.affectation=0 -- self.output(tstring) -- -- def NUMBER(self, tstring): -- self.flush_buffer() -- if self.affectation>=1: - # affectation en cours, on ajoute - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=2 - return - # affectation en cours, on ajoute - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=2 - return -- self.output(tstring) -- -- def OP(self,tstring): -- self.flush_buffer() -- if tstring in ('(','[','{'): self.paren_level=self.paren_level+1 -- if tstring in (')',']','}'): self.paren_level=self.paren_level-1 -- -- if tstring == '=' and self.affectation ==5: - # on a une expression qui commence par NAME=NAME(NAME=) - # il peut s'agir d'une commande - # on annule l'affectation en cours - self.out= self.out+ self.affectation_courante.texte - self.affectation_courante=None - self.name=None - self.affectation=0 - # on a une expression qui commence par NAME=NAME(NAME=) - # il peut s'agir d'une commande - # on annule l'affectation en cours - self.out= self.out+ self.affectation_courante.texte - self.affectation_courante=None - self.name=None - self.affectation=0 -- elif tstring == ')' and self.affectation ==4: - # on a une expression qui commence par NAME=NAME() - # il peut s'agir d'une commande - # on annule l'affectation en cours - self.out= self.out+ self.affectation_courante.texte - self.affectation_courante=None - self.affectation=0 - # on a une expression qui commence par NAME=NAME() - # il peut s'agir d'une commande - # on annule l'affectation en cours - self.out= self.out+ self.affectation_courante.texte - self.affectation_courante=None - self.affectation=0 -- elif tstring == '(' and self.affectation == 3: - # on a deja trouve NAME=NAME - # on passe affectation a 4 - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=4 - return - # on a deja trouve NAME=NAME - # on passe affectation a 4 - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=4 - return -- elif tstring == ';' and self.affectation>=1: - # l'affectation est terminee - self.out= self.out+ str(self.affectation_courante) - self.affectation_courante=None - self.please_indent=1 - self.affectation=0 - # l'affectation est terminee - self.out= self.out+ str(self.affectation_courante) - self.affectation_courante=None - self.please_indent=1 - self.affectation=0 -- elif self.affectation>=1: - # on complete l'affectation - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=2 - return - # on complete l'affectation - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=2 - return -- -- self.affectation=0 - if self.name and tstring=='=': - self.affectation=1 - self.affectation_courante=AFFECTATION() - self.affectation_courante.name=self.name - if self.name and tstring=='=': - self.affectation=1 - self.affectation_courante=AFFECTATION() - self.affectation_courante.name=self.name -- self.output(tstring) -- -- ENDMARKER = ident -- NEWLINE=NL -- -- def INDENT(self, tstring): -- #tstring=str(len(self.indent_list))*len(tstring) - self.indent_list.append(tstring) - self.indent_list.append(tstring) -- #print "indentation dans INDENT",len(self.indent_list),len(tstring) -- self.affectation=0 -- if self.buffer: - self.updateIndent() - self.updateIndent() -- self.flush_buffer() -- -- def DEDENT(self, tstring): -- #print "DEDENT",tstring,len(tstring) -- if self.buffer: - self.out= self.out+ str(self.buffer[0]) - if len(self.buffer) > 1: - for ob in self.buffer[1:]: - self.doIndent() - self.out= self.out+ str(ob) - self.buffer=[] - self.objet_courant=None - self.please_indent=1 - self.out= self.out+ str(self.buffer[0]) - if len(self.buffer) > 1: - for ob in self.buffer[1:]: - self.doIndent() - self.out= self.out+ str(ob) - self.buffer=[] - self.objet_courant=None - self.please_indent=1 -- -- self.affectation=0 - self.indent_list = self.indent_list[:-1] - self.indent_list = self.indent_list[:-1] -- #print "indentation dans DEDENT",len(self.indent_list) -- -- def STRING(self, tstring): -- self.flush_buffer() -- if self.affectation>=1: - # affectation en cours, on ajoute - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=2 - return - # affectation en cours, on ajoute - if self.thiscol > self.lastcol :self.affectation_courante.appendText((self.thiscol - self.lastcol)*" ") - self.affectation_courante.appendText(tstring) - self.affectation=2 - return -- self.output(tstring) -- --if __name__ == "__main__" : -- import sys -- import io -- text=""" --# --# comment --# comment --# comment --# -- --import sys,os -- --# commentaire --# commentaire --# commentaire -- --DEBUT(); --##toto = FORMULE(REEL='(REEL:A) = A',); -- --x=2*cos(90.)/34. -- --a=1. --if a != 0: -- a=+1 -- --b=2. --c=a+b --#if 1: --# d=3 --# e=5 --#try: --# a=1/2 --#except KeyError: --# pass -- --if 1: -- a=2 -- b=3 -- # commenta --else: -- # commen -- # commen -- a=3 -- #qqqqqqqqqqqqqqqqqqqqqqqq -- c=5 -- --b=5 -- # commentaire --toto = FORMULE(REEL='(REEL:A) = A',); --titi = FORMULE(REEL='(REEL:A) = A',) # commentaire inline --tutu = FORMULE(REEL='(REEL:A) = A',) ## commentaire inline -- --TEST_TABLE( TABLE=RELV[k], -- FILTRE=( -- _F( NOM_PARA = 'QUANTITE', -- VALE_K = 'MAXIMUM'),), - # commentaire - # commentaire -- NOM_PARA='VMIS', # comm -- VALE=1.9669824189084E9, -- REFERENCE='NON_REGRESSION', -- VERSION='8.1.0' ) -- --if 1: -- a=fff(a=1, -- b=2) --if 1: -- a=2 -- b=3 -- # commenta --else: -- # commen -- # commen -- a=3 -- --for k in range(1,10): -- -- # Appel a GMSH pour le maillage -- -- f=open("coque.geo","w") -- -- --a = 1. --b=3 --c= 3 * 5 --d= 4 + \ -- 5 \ -- -4 --e=toto(a=1) --x=(1,2) --y=[3, --#comme --4] --z="a" --zz='v' --u='''aaaa --bbbb''' --if 1: -- a=45 --else: -- a=5.6 --d={"a":0} --e={"a":0, --#comme --"d":4} --a==1 --x=a==1 --s="-"*80 --fmt_raison='-'*80+''' -- -- Exception erreur_Fatale interceptee -- Raison : %s -- --'''+'-'*80+'xxxxxxxxxxxxxxxx' --q=30*cos(12) --f=cos(12) --#commen''' --#commen''' --y=a[1] --y=["x"]*10 -- --##toto = FORMULE(REEL='(REEL:A) = A', --## X=2 --## ); --# --# comment --# comment --# comment --# --zz=8.9; --zz=8.9;aa=10 --P1 = 9.8; -- --P2 = 8.8; -- --P3 = 7; -- --P5 = P3*P1; -- --P6 = P1-3; -- --P4 = [2,3,4]; -- --P7=P4[1] --MA=LIRE_MAILLAGE() --MA=LIRE_MAILLAGE(#comment --) --xyz=cos(10) --MA=LIRE_MAILLAGE(INFO=1) --MA=LIRE_MAILLAGE( -- NFO=1) --MA=LIRE_MAILLAGE(#comme -- NFO=1) --MA=\ --LIRE_MAILLAGE(INFO=1) --MA= LIRE_MAILLAGE() --TFIN = 1.790 # Temps fin pour le calcul -- --PAS = 0.001 # pas de temps du calcul --# parse: -affectation --DS1=[None]*5 --DS2=[None]*5 --DS3=[None]*5 --DS4=[None]*5 --CHS1=[None]*5 --CHS2=[None]*5 --MO=AFFE_MODELE( MAILLAGE=MA, -- #test de validateur GEOM (typ=grma) avec grma derive de GEOM -- AFFE=(_F(GROUP_MA = ('LI1'), -- PHENOMENE = 'MECANIQUE', -- MODELISATION = 'DIS_TR'), -- ), -- INFO=2,); -- --for k in range(1,5): -- DS1[k] = CREA_CHAMP( OPERATION='EXTR', TYPE_CHAM='NOEU_DEPL_R', -- RESULTAT= MODESTA1, NUME_ORDRE=k, NOM_CHAM = 'DEPL'); -- --# parse: +affectation --ff=23 # parametre bidon -- --# parse: -all --a=45 --#commment1 --##toto = FORMULE(REEL='(REEL:A) = A', --## X=2 --## ); --# parse: +all --b=45 --#commment2 --##toto = FORMULE(REEL='(REEL:A) = A', --## X=2 --## ); --# parse: -comment --c=45 --#commment3 --##toto = FORMULE(REEL='(REEL:A) = A', --## X=2 --## ); --# parse: +comment --d=45 --#commment5 --##toto = FORMULE(REEL='(REEL:A) = A', --## X=2 --## ); --p=sin(ff) -- --e=toto(a=1) --e=toto(a=1,b=3) --e=toto(1,b=3) --e=toto(a,b=3) --e=toto() --sensible=[2.1E11, 0.3, 1.E-6, 1.E-6, ] -- --n=len(sensible) --# parse: -affectation -- --PS=[None]*n -- --for i in range(n): -- PS[i]=DEFI_PARA_SENSI(VALE=sensible[i]) --# parse: +affectation -- --TEST_RESU(RESU=(_F(RESULTAT = U3L, -- INST = 1.0, -- NOM_CHAM = 'DEPL', -- GROUP_NO = 'PPA', -- NOM_CMP = 'DX', -- VALE = 2.86E-5, -- PRECISION = 5.E-2, -- REFERENCE = 'AUTRE_ASTER', -- VERSION = '7.1.11', -- ), -- ) -- )# --# --FIN() --# -- --TEST_RESU(RESU=(_F(RESULTAT = U3L, -- INST = 1.0, -- NOM_CHAM = 'DEPL', -- GROUP_NO = 'PPA', -- NOM_CMP = 'DX', -- VALE = 2.86E-5, -- PRECISION = 5.E-2, -- REFERENCE = 'AUTRE_ASTER', -- VERSION = '7.1.11', -- ), -- ) -- ) #a -- --titi = FORMULE(REEL='(REEL:A) = A', --) # commentaire inline --titi = FORMULE(REEL='(REEL:A) = A', -- ) # commentaire inline -- --def f(x):return x --#comment --def f(x): --#comment -- for i in range(10): s=0 -- --#com1 --#com2 -- --#com3 --a=1 --##commendcomm --for k in range(1,10): -- -- # Appel a GMSH pour le maillage -- -- f=open("coque.geo","w") --#comm -- if a==1: -- -- #comm -- -- for i in x: --#comm --##commendcomm --#comm --##commendcomm --#comm -- if x==3: --#comm -- r=1 -- if w==4: --#comm -- -- if k: -- --#comm -- if g: -- --#comm -- -- if t: - a=5 - a=5 --#comm --if 1: -- a=2 -- b=3 -- # commenta --else: -- # commen -- # commen -- a=3 -- # qqqqqqqqqqqqqqqq -- c=5 -- --b=5 -- --if 1: -- a=2 -- # commenta --else: -- a=3 --if 1: -- if 2: -- if 3: -- a=1 -- elif 4: -- b=1 -- else: -- c=5 -- elif 3: -- x=1 -- else: -- y=4 --elif 4: -- s=1 --else: -- t=9 --#com1 --#com2 -- --#com3 --a=1 --##commendcomm --for k in range(1,10): -- -- # Appel a GMSH pour le maillage -- -- f=open("coque.geo","w") --#comm - if 1: - if 1: -- if 2: -- if 3: -- a=1 -- else: -- a=6 --a=1 --##commendcomm --for k in range(1,10): -- -- # Appel a GMSH pour le maillage -- -- f=open("coque.geo","w") --#comm -- -- if a==1: -- -- #comm -- -- for i in x: --#comm --##commendcomm --#comm --##commendcomm --#comm -- if x==3: --#comm -- r=1 -- -- if 1: -- if 2: -- if 3: -- a=1 -- else: -- a=6 -- --if 1: -- if 2: -- if 3: -- r=1 -- # comm -- else: -- x=7 -- toto(a=1, --b=3) --SUP_=dict([(grand,0.) for grand in grand_obs]) -- --for k in range(1,ns+1): -- x=toto(a=1,b=2) --# comm -- if 1: -- #com -- -- #com -- x=1 -- #com -- -- #com -- ##com -- elif 3: -- ##com -- x=1 -- else: -- y=3 -- --def f(): -- return --######################################################################## -- --######################################################################## --# macro commande de post-traitement (ex POST_GOUJ2E) --# calcul des reactions cumulees suivant les filets -- --def POST_GOUJ_ops(self,TABLE): -- ier=0 -- --""" -- if len(sys.argv)== 2: - progname, input = sys.argv - f=open(input) - t=f.read() - f.close() - progname, input = sys.argv - f=open(input) - t=f.read() - f.close() -- else: - t=text - t=text -- txt = PARSEUR_PYTHON(t).getTexte() -- print (txt) -- compile(txt,"",'exec') diff --cc convert/convert_XML.py index 8d9f9b8e,7a6be7b0..00000000 deleted file mode 100644,100644 --- a/convert/convert_XML.py +++ /dev/null @@@ -1,78 -1,75 +1,0 @@@ - # Copyright (C) 2007-2017 EDF R&D -# 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 -- -- --import re --from Extensions.i18n import tr -- --#import traceback --#traceback.print_stack() -- --from Extensions import localisation --from Noyau import N_CR -- -- --def entryPoint(): - """ - Return a dictionary containing the description needed to load the plugin - """ - return { - 'name' : 'xml', - 'factory' : XMLparser - } - """ - Return a dictionary containing the description needed to load the plugin - """ - return { - 'name' : 'xml', - 'factory' : XMLparser - } -- --class XMLparser: - """ - This converter works like Pythonparser, except that it is supposed to read XML - """ - """ - This converter works like Pythonparser, except that it is supposed to read XML - """ -- - def __init__(self,cr=None): - self.text='' - if cr : self.cr=cr - else: self.cr=N_CR.CR(debut='CR convertisseur format XML', - fin='fin CR format XML') - def __init__(self,cr=None): - print ('dans XML convert') - self.text='' - if cr : self.cr=cr - else: self.cr=N_CR.CR(debut='CR convertisseur format XML', - fin='fin CR format XML') -- - def readfile(self,filename): - self.filename=filename - try: - self.text=open(filename).read() - except: - self.cr.exception(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - self.cr.fatal(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - return - def readfile(self,filename): - self.filename=filename - try: - with open(filename) as fd : - self.text=fd.read() - except: - self.cr.exception(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - self.cr.fatal(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - return -- -- -- - def convert(self, outformat, appli=None): - # ici on ne fait rien - # on le fera a la creation du JDC - try: - def convert(self, outformat, appliEficas=None): - # ici on ne fait rien - # on le fera a la creation du JDC - try: -- return self.text - except EficasException: - except EficasException: -- # Erreur lors de la conversion -- l=traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1], -- sys.exc_info()[2]) -- self.cr.exception(tr("Impossible de convertir le fichier XML\n %s", ''.join(l))) -- return "" - - - - - diff --cc convert/convert_dico.py index 52a8d37e,c2996a0b..00000000 deleted file mode 100644,100644 --- a/convert/convert_dico.py +++ /dev/null @@@ -1,100 -1,100 +1,0 @@@ - # Copyright (C) 2007-2017 EDF R&D -# 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 Extensions.i18n import tr - #from Extensions import localisation -from Extensions.i18n import tr -from Extensions import localisation -- -- --from .convert_python import Pythonparser --from Noyau import N_CR -- --try: - basestring - basestring --except NameError: - basestring = str - basestring = str -- -- -- --def entryPoint(): - """ - Return a dictionary containing the description needed to load the plugin - """ - return { - 'name' : 'dico', - 'factory' : Dicoparser - } - """ - Return a dictionary containing the description needed to load the plugin - """ - return { - 'name' : 'dico', - 'factory' : Dicoparser - } -- --class Dicoparser(Pythonparser): - """ - This converter initializes model variable from a python dictionnary - """ - - def __init__(self,cr=None): - # Si l'objet compte-rendu n'est pas fourni, on utilise le - # compte-rendu standard - self.text='' - self.textePy='' - if cr : - self.cr=cr - else: - self.cr=N_CR.CR(debut='CR convertisseur format dico', - fin='fin CR format dico') - """ - This converter initializes model variable from a python dictionnary - """ -- - def readfile(self,filename): - self.filename=filename - try: - self.text=open(filename).read() - except: - self.cr.exception(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - self.cr.fatal(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - return - def __init__(self,cr=None): - # Si l'objet compte-rendu n'est pas fourni, on utilise le - # compte-rendu standard - self.text='' - self.textePy='' - if cr : - self.cr=cr - else: - self.cr=N_CR.CR(debut='CR convertisseur format dico', - fin='fin CR format dico') -- - def convert(self,outformat,appli=None): - monTexteDico={} - exec (self.text,globals(),monTexteDico) - if len(monTexteDico.keys()) != 1 : - self.cr.exception(tr("Impossible de traiter le fichier %s" ,str(filename))) - self.cr.fatal(tr("Impossible de traiter le fichier %s" ,str(filename))) - return - self.textePy="" - monDico=monTexteDico[monTexteDico.keys()[0]] - for commande in monDico : - valeurs=monDico[commande] - if valeurs.has_key('NomDeLaSdCommande') : - # cas d un oper - self.textePy+=valeurs['NomDeLaSdCommande']+' = '+commande+'(' - del valeurs['NomDeLaSdCommande'] - else : - self.textePy+=commande+'(' - for mot in valeurs : - if isinstance(valeurs[mot],dict) : self.traiteMCFact(mot,valeurs[mot]) - else : self.textePy += mot+' = ' +str(valeurs[mot])+',' - self.textePy+=');\n' # fin de la commande - print (self.textePy) - return self.textePy - def readfile(self,filename): - self.filename=filename - try: - with open(filename) as fd : - self.text=fd.read() - except: - self.cr.exception(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - self.cr.fatal(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - return -- - def traiteMCFact(self,mot,valeurs): - self.textePy += mot + '=_F(' - for mot in valeurs : - if isinstance(valeurs[mot],dict) : self.traiteMCFact(mot,valeurs[mot]) - else : self.textePy +=mot+' = ' +str(valeurs[mot])+',' - self.textePy +='),' - def convert(self,outformat,appli=None): - monTexteDico={} - exec (self.text,globals(),monTexteDico) - if len(monTexteDico.keys()) != 1 : - self.cr.exception(tr("Impossible de traiter le fichier %s" ,str(filename))) - self.cr.fatal(tr("Impossible de traiter le fichier %s" ,str(filename))) - return - self.textePy="" - monDico=monTexteDico[monTexteDico.keys()[0]] - for commande in monDico : - valeurs=monDico[commande] - if valeurs.has_key('NomDeLaSdCommande') : - # cas d un oper - self.textePy+=valeurs['NomDeLaSdCommande']+' = '+commande+'(' - del valeurs['NomDeLaSdCommande'] - else : - self.textePy+=commande+'(' - for mot in valeurs : - if isinstance(valeurs[mot],dict) : self.traiteMCFact(mot,valeurs[mot]) - else : self.textePy += mot+' = ' +str(valeurs[mot])+',' - self.textePy+=');\n' # fin de la commande - #print (self.textePy) - return self.textePy -- - def traiteMCFact(self,mot,valeurs): - self.textePy += mot + '=_F(' - for mot in valeurs : - if isinstance(valeurs[mot],dict) : self.traiteMCFact(mot,valeurs[mot]) - else : self.textePy +=mot+' = ' +str(valeurs[mot])+',' - self.textePy +='),' diff --cc convert/convert_pyth.py index 098612eb,b0dee985..00000000 deleted file mode 100644,100644 --- a/convert/convert_pyth.py +++ /dev/null @@@ -1,128 -1,129 +1,0 @@@ --# -*- coding: utf-8 -*- - # Copyright (C) 2007-2017 EDF R&D -# 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 --# --""" -- Ce module contient le plugin convertisseur de fichier -- au format python pour EFICAS. -- -- Un plugin convertisseur doit fournir deux attributs de classe : -- extensions et formats et deux methodes : readfile,convert. -- -- L'attribut de classe extensions est une liste d'extensions -- de fichiers preconisees pour ce type de format. Cette information -- est seulement indicative. -- -- L'attribut de classe formats est une liste de formats de sortie -- supportes par le convertisseur. Les formats possibles sont : -- eval, dict ou exec. -- Le format eval est un texte source Python qui peut etre evalue. Le -- resultat de l'evaluation est un objet Python quelconque. -- Le format dict est un dictionnaire Python. - Le format exec est un texte source Python qui peut etre execute. - Le format exec est un texte source Python qui peut etre execute. -- -- La methode readfile a pour fonction de lire un fichier dont le -- nom est passe en argument de la fonction. -- - convertisseur.readfile(nom_fichier) -- -- La methode convert a pour fonction de convertir le fichier -- prealablement lu dans un objet du format passe en argument. -- - objet=convertisseur.convert(outformat) -- -- Ce convertisseur supporte le format de sortie dict -- --""" --from __future__ import absolute_import --try : - from builtins import str - from builtins import object - from builtins import str - from builtins import object --except : - pass - pass -- --import sys,traceback -- --from Noyau import N_CR --from Extensions.i18n import tr --from Extensions.eficas_exception import EficasException -- --def entryPoint(): - """ - Retourne les informations necessaires pour le chargeur de plugins - Ces informations sont retournees dans un dictionnaire - """ - return { - # Le nom du plugin - 'name' : 'pyth', - # La factory pour creer une instance du plugin - 'factory' : Pythparser, - } - """ - Retourne les informations necessaires pour le chargeur de plugins - Ces informations sont retournees dans un dictionnaire - """ - return { - # Le nom du plugin - 'name' : 'pyth', - # La factory pour creer une instance du plugin - 'factory' : Pythparser, - } -- -- --class Pythparser(object): - """ - Ce convertisseur lit un fichier au format pyth avec la - methode readfile : convertisseur.readfile(nom_fichier) - et retourne le texte au format outformat avec la - methode convertisseur.convert(outformat) - """ - Ce convertisseur lit un fichier au format pyth avec la - methode readfile : convertisseur.readfile(nom_fichier) - et retourne le texte au format outformat avec la - methode convertisseur.convert(outformat) -- - Ses caracteristiques principales sont exposees dans 2 attributs - de classe : - - extensions : qui donne une liste d'extensions de fichier preconisees - - formats : qui donne une liste de formats de sortie supportes - """ - # Les extensions de fichier preconisees - extensions=('.pyth',) - # Les formats de sortie supportes (eval dict ou exec) - formats=('dict',) - Ses caracteristiques principales sont exposees dans 2 attributs - de classe : - - extensions : qui donne une liste d'extensions de fichier preconisees - - formats : qui donne une liste de formats de sortie supportes - """ - # Les extensions de fichier preconisees - extensions=('.pyth',) - # Les formats de sortie supportes (eval dict ou exec) - formats=('dict',) -- - def __init__(self,cr=None): - # Si l'objet compte-rendu n'est pas fourni, on utilise le compte-rendu standard - if cr : - self.cr=cr - else: - self.cr=N_CR.CR(debut='CR convertisseur format pyth', - fin='fin CR format pyth') - self.g={} - def __init__(self,cr=None): - # Si l'objet compte-rendu n'est pas fourni, on utilise le compte-rendu standard - if cr : - self.cr=cr - else: - self.cr=N_CR.CR(debut='CR convertisseur format pyth', - fin='fin CR format pyth') - self.g={} -- - def readfile(self,filename): - self.filename=filename - try: - self.text=open(filename).read() - except: - self.cr.fatal(tr("Impossible d'ouvrir le fichier : %s",str( filename))) - return - self.g={} - try: - exec(self.text, self.g) - except EficasException as e: - l=traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],sys.exc_info()[2]) - s= ''.join(l[2:]) - s= s.replace('""','"<%s>"'%self.filename) - self.cr.fatal(tr("Erreur a l'evaluation :\n %s", s)) - def readfile(self,filename): - self.filename=filename - try: - with open(filename) as fd : - self.text=fd.read() - except: - self.cr.fatal(tr("Impossible d'ouvrir le fichier : %s",str( filename))) - return - self.g={} - try: - exec(self.text, self.g) - except EficasException as e: - l=traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],sys.exc_info()[2]) - s= ''.join(l[2:]) - s= s.replace('""','"<%s>"'%self.filename) - self.cr.fatal(tr("Erreur a l'evaluation :\n %s", s)) -- - def convert(self,outformat,appli=None): - if outformat == 'dict': - return self.getdict() - else: - raise EficasException(tr("Format de sortie : %s, non supporte", outformat)) - def convert(self,outformat,appliEficas=None): - if outformat == 'dict': - return self.getdict() - else: - raise EficasException(tr("Format de sortie : %s, non supporte", outformat)) -- - def getdict(self): - d={} - for k,v in list(self.g.items()): - if k[0] != '_':d[k]=v - return d - def getdict(self): - d={} - for k,v in list(self.g.items()): - if k[0] != '_':d[k]=v - return d diff --cc convert/convert_python.py index 123f3183,535dfaf4..00000000 deleted file mode 100644,100644 --- a/convert/convert_python.py +++ /dev/null @@@ -1,142 -1,143 +1,0 @@@ --# -*- coding: utf-8 -*- - # Copyright (C) 2007-2017 EDF R&D -# 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 --# --""" -- Ce module contient le plugin convertisseur de fichier -- au format python pour EFICAS. -- -- Un plugin convertisseur doit fournir deux attributs de classe : -- extensions et formats et deux methodes : readfile,convert. -- -- L'attribut de classe extensions est une liste d'extensions -- de fichiers preconisees pour ce type de format. Cette information -- est seulement indicative. -- -- L'attribut de classe formats est une liste de formats de sortie -- supportes par le convertisseur. Les formats possibles sont : -- eval, dict ou exec. -- Le format eval est un texte source Python qui peut etre evalue. Le -- resultat de l'evaluation est un objet Python quelconque. -- Le format dict est un dictionnaire Python. - Le format exec est un texte source Python qui peut etre execute. - Le format exec est un texte source Python qui peut etre execute. -- -- La methode readfile a pour fonction de lire un fichier dont le -- nom est passe en argument de la fonction. -- - convertisseur.readfile(nom_fichier) -- -- La methode convert a pour fonction de convertir le fichier -- prealablement lu dans un objet du format passe en argument. -- - objet=convertisseur.convert(outformat) -- -- Ce convertisseur supporte le format de sortie exec -- --""" --from __future__ import absolute_import --try : - from builtins import str - from builtins import object - from builtins import str - from builtins import object --except : - pass - pass --import sys,traceback -- --from .parseur_python import PARSEUR_PYTHON --from Noyau import N_CR --from Extensions.i18n import tr --from Extensions.eficas_exception import EficasException -- --def entryPoint(): - """ - Retourne les informations necessaires pour le chargeur de plugins - Ces informations sont retournees dans un dictionnaire - """ - return { - # Le nom du plugin - 'name' : 'python', - # La factory pour creer une instance du plugin - 'factory' : Pythonparser, - } - """ - Retourne les informations necessaires pour le chargeur de plugins - Ces informations sont retournees dans un dictionnaire - """ - return { - # Le nom du plugin - 'name' : 'python', - # La factory pour creer une instance du plugin - 'factory' : Pythonparser, - } -- -- --class Pythonparser(object): - """ - Ce convertisseur lit un fichier au format python avec la - methode readfile : convertisseur.readfile(nom_fichier) - et retourne le texte au format outformat avec la - methode convertisseur.convert(outformat) - """ - Ce convertisseur lit un fichier au format python avec la - methode readfile : convertisseur.readfile(nom_fichier) - et retourne le texte au format outformat avec la - methode convertisseur.convert(outformat) -- - Ses caracteristiques principales sont exposees dans 2 attributs - de classe : - - extensions : qui donne une liste d'extensions de fichier preconisees - - formats : qui donne une liste de formats de sortie supportes - """ - # Les extensions de fichier preconisees - extensions=('.py',) - # Les formats de sortie supportes (eval dict ou exec) - # Le format exec est du python executable (commande exec) converti avec PARSEUR_PYTHON - # Le format execnoparseur est du python executable (commande exec) non converti - formats=('exec','execnoparseur') - Ses caracteristiques principales sont exposees dans 2 attributs - de classe : - - extensions : qui donne une liste d'extensions de fichier preconisees - - formats : qui donne une liste de formats de sortie supportes - """ - # Les extensions de fichier preconisees - extensions=('.py',) - # Les formats de sortie supportes (eval dict ou exec) - # Le format exec est du python executable (commande exec) converti avec PARSEUR_PYTHON - # Le format execnoparseur est du python executable (commande exec) non converti - formats=('exec','execnoparseur') -- - def __init__(self,cr=None): - # Si l'objet compte-rendu n'est pas fourni, on utilise le - # compte-rendu standard - self.text='' - if cr : - self.cr=cr - else: - self.cr=N_CR.CR(debut='CR convertisseur format python', - fin='fin CR format python') - def __init__(self,cr=None): - # Si l'objet compte-rendu n'est pas fourni, on utilise le - # compte-rendu standard - self.text='' - if cr : - self.cr=cr - else: - self.cr=N_CR.CR(debut='CR convertisseur format python', - fin='fin CR format python') -- - def readfile(self,filename): - self.filename=filename - try: - self.text=open(filename).read() - except: - self.cr.exception(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - self.cr.fatal(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - return - - def convert(self,outformat,appli=None): - if outformat == 'exec': - try: - #import cProfile, pstats, StringIO - #pr = cProfile.Profile() - #pr.enable() - l= PARSEUR_PYTHON(self.text).getTexte(appli) - def readfile(self,filename): - self.filename=filename - try: - with open(filename) as fd : - self.text=fd.read() - except: - self.cr.exception(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - self.cr.fatal(tr("Impossible d'ouvrir le fichier %s" ,str(filename))) - return -- - #pr.disable() - #s = StringIO.StringIO() - #sortby = 'cumulative' - #ps = pstats.Stats(pr, stream=s).sort_stats(sortby) - #ps.print_stats() - #print (s.getValue()) - def convert(self,outformat,appliEficas=None): - if outformat == 'exec': - try: - #import cProfile, pstats, StringIO - #pr = cProfile.Profile() - #pr.enable() - l= PARSEUR_PYTHON(self.text).getTexte(appliEficas) -- - return l - except EficasException: - # Erreur lors de la conversion - l=traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1], - sys.exc_info()[2]) - self.cr.exception(tr("Impossible de convertir le fichier Python qui doit contenir des erreurs.\n\ - On retourne le fichier non converti. Prevenir la maintenance.\n\n %s", ''.join(l))) - # On retourne neanmoins le source initial non converti (au cas ou) - #pr.disable() - #s = StringIO.StringIO() - #sortby = 'cumulative' - #ps = pstats.Stats(pr, stream=s).sort_stats(sortby) - #ps.print_stats() - #print (s.getValue()) - - return l - except EficasException: - # Erreur lors de la conversion - l=traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1], - sys.exc_info()[2]) - self.cr.exception(tr("Impossible de convertir le fichier Python qui doit contenir des erreurs.\n\ - On retourne le fichier non converti. Prevenir la maintenance.\n\n %s", ''.join(l))) - # On retourne neanmoins le source initial non converti (au cas ou) - return self.text - elif outformat == 'execnoparseur': -- return self.text - elif outformat == 'execnoparseur': - return self.text - else: - raise EficasException(tr("Format de sortie : %s, non supporte", outformat)) - return None - else: - raise EficasException(tr("Format de sortie : %s, non supporte", outformat)) - return None diff --cc convert/parseur_python.py index e3f28ba3,19d73256..00000000 deleted file mode 100644,100644 --- a/convert/parseur_python.py +++ /dev/null @@@ -1,697 -1,696 +1,0 @@@ --# -*- coding: utf-8 -*- - # Copyright (C) 2007-2017 EDF R&D -# 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 __future__ import print_function --try : - from builtins import str - from builtins import range - from builtins import object - from builtins import str - from builtins import object --except : - pass - pass --import sys,string,re --import traceback --from Extensions.i18n import tr - from six.moves import range -- --escapedQuotesRE = re.compile(r"(\\\\|\\\"|\\\')") --stringsAndCommentsRE = \ -- re.compile(u"(\"\"\".*?\"\"\"|'''.*?'''|\"[^\"]*\"|\'[^\']*\'|#.*?\n)", re.DOTALL) --#stringsAndCommentsRE = \ --# re.compile(u"(\"\"\".*\"\"\"|'''.*'''|\"[^\"]*\"|\'[^\']*\'|#.*\n)", re.DOTALL) --import six - if six.PY2 : -if six.PY2 : -- allchars = string.maketrans(u"", "") -- allcharsExceptNewline = allchars[: allchars.index('\n')]+allchars[allchars.index('\n')+1:] -- allcharsExceptNewlineTranstable = string.maketrans(allcharsExceptNewline, '*'*len(allcharsExceptNewline)) - else : -else : -- allchars=bytes.maketrans(b"",b"") -- allcharsExceptNewline = allchars[: allchars.index(b'\n')]+allchars[allchars.index(b'\n')+1:] -- allcharsExceptNewlineTranstable = bytes.maketrans(allcharsExceptNewline, b'*'*len(allcharsExceptNewline)) -- --#if sys.platform[0:5]=="linux" : --# allcharsExceptNewlineTranstable = string.maketrans(allcharsExceptNewline, '*'*len(allcharsExceptNewline)) --#elif sys.platform[0:3]=="win" : --# allcharsExceptNewlineTranstable = dict((ord(char), u'*') for char in allcharsExceptNewline)# --#else : --# allcharsExceptNewlineTranstable = string.maketrans(allcharsExceptNewline, '*'*len(allcharsExceptNewline)) -- --def maskStringsAndComments(src): -- """Masque tous les caracteres de src contenus dans des commentaires ou des strings multilignes (triples -- quotes et guillemets. - Le masquage est realise en remplacant les caracteres par des * - Le masquage est realise en remplacant les caracteres par des * -- Attention : cette fonction doit etre utilisee sur un texte complet et pas ligne par ligne -- """ --# remplace les \\, les \" les \' par ** --# supprime toutes les chaines ou commentaires ,y compris multiligne i - # entre 3 ou 1 simples ou doubles quotes (ouvrantes fermantes) ou # -# entre 3 ou 1 simples ou doubles quotes (ouvrantes fermantes) ou # --# laisse les non fermantes ou non ouvrantes --# on prend 1 sur 2 en raison du split qui donne python, commentaire, python, commentaire... -- -- src = escapedQuotesRE.sub("**", src) -- allstrings = stringsAndCommentsRE.split(src) -- -- # on a une liste d elements constituee successivement de (string, comment) -- for i in range(1, len(allstrings), 2): -- if allstrings[i].startswith(u"'''")or allstrings[i].startswith('"""'): -- allstrings[i] = allstrings[i][:3]+ \ -- allstrings[i][3:-3].translate(allcharsExceptNewlineTranstable)+ \ -- allstrings[i][-3:] -- else: -- allstrings[i] = allstrings[i][0]+ \ -- allstrings[i][1:-1].translate(allcharsExceptNewlineTranstable)+ \ -- allstrings[i][-1] -- -- return "".join(allstrings) -- --implicitContinuationChars = (('(', ')'), ('[', ']'), ('{', '}')) --linecontinueRE = re.compile(r"\\\s*(#.*)?$") --emptyHangingBraces = [0,0,0,0,0] -- --class parserException(Exception): pass --class FatalError(Exception): pass -- --#commentaire double precede d'un nombre quelconque de blancs (pas multiligne) --pattern_2comments = re.compile(r"^\s*##.*") --pattern_finComments = re.compile("^\s*##Fin Commentaire") --#commentaire standard precede d'un nombre quelconque de blancs (pas multiligne) --pattern_comment = re.compile(r"^\s*#.*") --#fin de ligne ; suivi d'un nombre quelconque de blancs (pas multiligne) --pattern_fin = re.compile(r"; *$") --#pattern pour supprimer les blancs, tabulations et fins de ligne --pattern_blancs = re.compile(r"[ \t\r\f\v]") --#pattern_blancs = re.compile(r"[\s\n]") --number_kw_pattern=re.compile(r""" --( -- #groupe nombre decimal -- (?: -- #signe : on ignore le signe + -- [-]? -- #groupe (avec ?: n'apparait pas en tant que groupe dans le resultat) -- (?: -- #mantisse forme entiere.fractionnaire -- \d+(?:\.\d*)? -- | -- #ou forme .fractionnaire -- \.\d+ -- ) -- (?:[eE][+-]?\d+)? -- ) -- | -- #argument keyword -- [a-zA-Z_]\w*= --) --""",re.VERBOSE|re.MULTILINE) -- --def construitGenea(texte,listeMc): -- """ -- Retourne un dictionnaire dont les cles sont des reels et les valeurs sont leurs representations textuelles. -- -- Realise un filtrage sur les reels : -- -- - Ne garde que les reels pour lesquels str ne donne pas une bonne representation. -- - Ne garde que les reels derriere un argument keyword dont le nom est dans listeMc -- -- >>> s = '''a=+21.3e-5*85,b=-.1234,c=81.6 , d= -8 , e=_F(x=342.67,y=-1), f=+1.1, g=(1.3,-5,1.54E-3), -- ... #POMPE_PRIMA._BOUCLE_N._2_ELEMENT_NUMERO:0239 -- ... h=_F(x=34.6,y=-1)''' -- >>> construitGenea(s,['a','x']) -- {0.000213: '21.3e-5'} -- """ -- d={} -- mot="" -- #on masque les strings et commentaires pour ne pas identifier de faux reels -- for m in number_kw_pattern.findall(maskStringsAndComments(texte)): -- if m[-1] == '=': -- #argument keyword -- mot=m[:-1] -- else: -- if mot not in listeMc:continue -- #valeur -- key=eval(m) -- if str(key) != m: d[key]=m -- return d -- -- --class ENTITE_JDC(object) : -- """Classe de base pour tous les objets crees lors de la conversion -- Tout objet derive est enregistre aupres de son pere a sa creation -- """ -- def __init__(self,pere): -- self.texte = '' -- pere.l_objets.append(self) -- -- def setText(self,texte): -- self.texte = texte -- -- def appendText(self,texte): -- """ -- Ajoute texte a self.texte en mettant un retour chariot a la fin de texte -- """ -- texte = texte+'\n' -- self.texte = self.texte +texte -- -- def __str__(self): -- return self.texte -- --class COMMENTAIRE(ENTITE_JDC): -- -- def __str__(self): -- """ -- Retourne une chaine de caracteres representants self -- sous une forme interpretable par EFICAS -- """ -- t=repr(self.texte) -- return "COMMENTAIRE(u"+t+")\n" -- -- #s='COMMENTAIRE(u"""'+self.texte+'""")\n\n' -- #return s -- -- def appendText(self,texte): -- """ -- Ajoute texte a self.texte en enlevant le # initial -- """ -- texte = texte+'\n' -- if texte[0] == '#': -- self.texte = self.texte+texte[1:] -- else: -- # le diese n'est pas sur le premier caractere -- amont,aval = texte.split('#',1) # on decoupe suivant la premiere occurrence de # -- self.texte = self.texte +amont + aval - - --class COMMANDE(ENTITE_JDC): -- -- def __str__(self): -- """ -- Retourne self.texte -- """ -- return self.texte+'\n' - - -- def getNbPar(self): -- """ -- Retourne la difference entre le nombre de parentheses ouvrantes -- et le nombre de parentheses fermantes presentes dans self.texte -- Peut donc retourner un entier negatif -- """ -- # faire attention aux commentaires contenus dans self.texte -- # qui peuvent eux-memes contenir des parentheses !!!! -- l_lignes = self.texte.split('\n') -- nb = 0 -- for ligne in l_lignes: -- ligne = ligne.split('#')[0] -- #nb = nb + (string.count(ligne,'(')-string.count(ligne,')')) -- -- nb = nb + ( ligne.count('(') - ligne.count(')') ) -- return nb -- --class AFFECTATION(ENTITE_JDC): -- -- def appendText(self,texte): -- """ -- Ajoute texte a self.texte en enlevant tout retour chariot et tout point virgule -- PN et tout commentaire -- """ -- if texte[-1] == '\n' : texte = texte[0:-1].rstrip() -- if texte[-1] == ';' : texte = texte[0:-1].rstrip() -- self.texte = self.texte+texte+'\n' - - -- def __str__(self): -- """ -- Retourne une expression de l'affectation comprehensible par ACCAS -- et exploitable par EFICAS -- """ -- nom,valeur = self.texte.split('=',1) -- n = nom.rstrip() -- nom = n.lstrip() -- if valeur[-1] == '\n': valeur = valeur[:-1] -- return n + ' = PARAMETRE(nom=\''+nom+'\',valeur='+valeur+')\n' -- --class COMMANDE_COMMENTARISEE(ENTITE_JDC): -- -- def appendText(self,texte): -- """ -- Ajoute texte a self.texte en enlevant les doubles commentaires -- """ -- texte = texte.strip() -- texte = texte[2:].strip() -- self.texte = self.texte+(len(self.texte)>0)*'\n'+texte -- -- def __str__(self): -- """ -- Retourne une expression de la commande commentarisee comprehensible par ACCAS -- et exploitable par EFICAS -- """ -- return "COMMANDE_COMM(texte="+repr(self.texte)+")\n" -- #return "COMMANDE_COMM(texte='''"+self.texte+"''')\n" -- --class AFFECTATION_EVAL(ENTITE_JDC): -- -- def appendText(self,texte): -- """ -- Ajoute texte a self.texte en enlevant tout retour chariot -- """ -- if texte[-1] == '\n' : texte = texte[1:-1] -- self.texte = self.texte+texte - - -- def __str__(self): -- """ -- Retourne une expression du parametre EVAL comprehensible par ACCAS -- et exploitable par EFICAS -- """ -- nom,valeur = self.texte.split('=',1) -- nom = nom.strip() -- if valeur[-1] == '\n': valeur = valeur[:-1] -- valeur = valeur.strip() -- return nom+' = PARAMETRE_EVAL(nom=\''+nom+'\',valeur=\''+valeur+'\')\n\n' - - --class PARSEUR_PYTHON(object): -- """ - Cette classe sert a generer un objet PARSEUR_PYTHON qui realise l'analyse d'un texte - Cette classe sert a generer un objet PARSEUR_PYTHON qui realise l'analyse d'un texte -- representant un JDC Python en distinguant : -- - les commentaires inter commandes -- - les affectations -- - les commandes -- """ -- pattern_commande = re.compile(r'^([A-Z][a-zA-Z0-9_]+)([ \t\r\f\v]*)\(([\w\W]*)') -- pattern_eval = re.compile(r'^(EVAL)([ \t\r\f\v]*)\(([\w\W]*)') -- pattern_ligne_vide = re.compile(r'^[\t\r\f\v\n]+') -- pattern_name = re.compile(r'[a-zA-Z_]\w*') - - -- def __init__(self,texte): -- self.texte = texte -- self.l_objets=None - self.appli=None - self.appliEficas=None -- -- def isAffectation(self,texte): -- """ -- Methode booleenne qui retourne 1 si le texte est celui d'une affectation dans un jeu de commandes -- Aster, 0 sinon -- """ -- if '=' not in texte : return 0 -- if self.pattern_commande.match(texte): -- # cas d'une procedure ... -- return 0 -- amont,aval = texte.split('=',1) -- aval = aval.strip() -- -- -- if self.pattern_commande.match(aval): -- return 0 -- else: -- s= amont.strip() -- m= self.pattern_name.match(s) -- if m is None : return 0 -- if m.start() != 0 :return 0 -- if m.end() != len(s):return 0 -- return 1 -- -- def isEval(self,texte): -- """ -- Methode booleenne qui retourne 1 si le texte est celui d'une affectation de type EVAL -- dans un jeu de commandes Aster, 0 sinon -- """ -- if '=' not in texte : return 0 -- if self.pattern_commande.match(texte): -- # cas d'une procedure ... -- return 0 -- amont,aval = texte.split('=',1) -- aval = aval.strip() -- if not self.pattern_commande.match(aval) : return 0 -- if self.pattern_eval.match(aval): -- return 1 -- else: -- return 0 - - -- def isCommande(self,texte): -- """ -- Methode booleenne qui retourne 1 si le texte est celui d'une commande dans un jeu de commandes -- Aster, 0 sinon -- """ -- if self.pattern_commande.match(texte): -- # cas d'une procedure ... -- return 1 -- # A ce stade il faut avoir un OPER ou une MACRO, bref un '=' ! -- if '=' not in texte : return 0 -- # on a un texte de la forme xxxx = yyyyy -- # --> reste a analyser yyyy -- amont,aval = texte.split('=',1) -- aval = aval.strip() -- if self.pattern_commande.match(aval): -- return 1 -- else: -- return 0 -- -- def isModificationCatalogue(self,texte) : -- if self.pattern_commande.match(texte): - return 1 - return 1 -- -- def analyse(self): -- """ -- Eclate la chaine self.texte en self.l_objets une liste lignes d'instructions -- et de commentaires (parmi lesquels des instructions "commentarisees"). -- """ -- l_lignes = self.texte.split('\n') -- commentaire_courant = None -- commande_courante = None -- affectation_courante = None -- commande_commentarisee_courante = None -- self.l_objets = [] -- -- #initialisation du nombre de parentheses non fermees et de commentaires non termines -- #Attention a reinitialiser en fin de ligne logique -- #Une ligne logique peut s'etendre sur plusieurs lignes physiques avec des caracteres de continuation -- #explicites ou implicites -- hangingBraces = list(emptyHangingBraces) -- hangingComments = 0 -- -- #Masquage des commentaires et strings multilignes -- srcMasked=maskStringsAndComments('\n'.join(l_lignes)) -- masked_lines=srcMasked.split('\n') -- lineno=0 -- -- for ligne in l_lignes : -- line=masked_lines[lineno] -- lineno=lineno+1 -- #print ("ligne:",line) -- # mise a jour du nombre total de parentheses ouvertes (non fermees) -- # et du nombre de commentaires non termines -- for i in range(len(implicitContinuationChars)): -- contchar = implicitContinuationChars[i] -- numHanging = hangingBraces[i] -- hangingBraces[i] = numHanging+line.count(contchar[0]) - line.count(contchar[1]) -- -- hangingComments ^= line.count('"""') % 2 -- hangingComments ^= line.count(u"'''") % 2 -- #print (hangingComments,hangingBraces) - if hangingBraces[0] < 0 or hangingBraces[1] < 0 or hangingBraces[2] < 0: - if hangingBraces[0] < 0 or hangingBraces[1] < 0 or hangingBraces[2] < 0: -- raise parserException() -- -- if ligne.strip() == '': -- # il s'agit d'un saut de ligne -- # --> on l'ignore -- continue -- -- if pattern_2comments.match(ligne): -- #on a trouve une commande commentarisee : double commentaire sans rien devant a part des blancs -- if commentaire_courant: -- #Si un commentaire ordinaire est en cours on le termine -- commentaire_courant = None -- -- if commande_courante : -- # on a un objet commentarise a l'interieur d'une commande -- # --> non traite pour l'instant : on l'ajoute simplement a la commande courante comme -- # un commentaire ordinaire -- commande_courante.appendText(ligne) -- elif commande_commentarisee_courante : -- # commande_commentarisee en cours : on ajoute la ligne -- commande_commentarisee_courante.appendText(ligne) -- # on a 2 commandes commentarisees de suite -- if pattern_finComments.match(ligne) : - commande_commentarisee_courante = None - commande_commentarisee_courante = None -- else: -- # debut de commande commentarisee : on cree un objet commande_commentarisee_courante -- commande_commentarisee_courante = COMMANDE_COMMENTARISEE(self) -- commande_commentarisee_courante.appendText(ligne) -- -- #on passe a la ligne suivante -- continue -- -- if pattern_comment.match(ligne): -- #commentaire ordinaire avec seulement des blancs devant -- if commande_commentarisee_courante : -- # commande_commentarisee en cours : on la clot -- commande_commentarisee_courante = None -- -- if commande_courante : -- # il s'agit d'un commentaire a l'interieur d'une commande --> on ne fait rien de special - #on l'ajoute au texte de la commande - #on l'ajoute au texte de la commande -- commande_courante.appendText(ligne) -- elif commentaire_courant : -- # il s'agit de la nieme ligne d'un commentaire entre deux commandes -- # --> on ajoute cette ligne au commentaire courant -- commentaire_courant.appendText(ligne) -- else : -- # il s'agit d'un nouveau commentaire entre deux commandes -- # --> on le cree et il devient le commentaire courant -- commentaire_courant = COMMENTAIRE(self) -- commentaire_courant.appendText(ligne) -- -- #on passe a la ligne suivante -- continue -- -- # la ligne contient des donnees autre qu'un eventuel commentaire -- if commentaire_courant : -- # on clot un eventuel commentaire courant -- commentaire_courant = None -- -- if commande_commentarisee_courante : -- # on clot une eventuelle commande commentarisee courante -- commande_commentarisee_courante = None -- -- if commande_courante : -- #on a une commande en cours. On l'enrichit ou on la termine -- commande_courante.appendText(ligne) -- if not linecontinueRE.search(line) \ -- and (hangingBraces == emptyHangingBraces) \ -- and not hangingComments: - #la commande est terminee - #la commande est terminee -- self.analyseReel(commande_courante.texte) -- commande_courante = None -- -- #on passe a la ligne suivante -- continue -- -- if affectation_courante != None : -- #poursuite d'une affectation -- affectation_courante.appendText(ligne) -- if not linecontinueRE.search(line) \ -- and (hangingBraces == emptyHangingBraces) \ -- and not hangingComments: -- #L'affectation est terminee -- affectation_courante=None -- #on passe a la ligne suivante -- continue -- -- # il peut s'agir d'une commande ou d'une affectation ... -- # ou d'un EVAL !!! -- if self.isEval(ligne): -- # --> affectation de type EVAL -- if affectation_courante : affectation_courante = None -- affectation = AFFECTATION_EVAL(self) -- affectation.appendText(ligne) -- #on passe a la ligne suivante -- continue -- -- if self.isAffectation(ligne): -- #print( '--> affectation') -- text=ligne -- #traitement des commentaires en fin de ligne -- compos=line.find(u"#") -- if compos > 2: -- #commentaire en fin de ligne -- #on cree un nouveau commentaire avant le parametre -- COMMENTAIRE(self).appendText(ligne[compos:]) -- text=ligne[:compos] -- #si plusieurs instructions separees par des ; sur la meme ligne -- inspos=line.find(u";") -- if inspos > 2: -- #on garde seulement la premiere partie de la ligne -- #si on a que des blancs apres le point virgule -- if text[inspos:].strip() == ";": -- text=text[:inspos] -- else: -- raise FatalError(tr("Eficas ne peut pas traiter plusieurs instructions \ -- sur la meme ligne : %s", ligne)) -- -- affectation_courante = AFFECTATION(self) -- affectation_courante.appendText(text) -- if not linecontinueRE.search(line) \ -- and (hangingBraces == emptyHangingBraces) \ -- and not hangingComments: -- #L'affectation est terminee -- affectation_courante=None -- #on passe a la ligne suivante -- continue -- -- if self.isCommande(ligne): -- # --> nouvelle commande -- affectation_courante = None -- commande_courante = COMMANDE(self) -- commande_courante.appendText(ligne) -- #si la commande est complete, on la termine -- if not linecontinueRE.search(line) \ -- and (hangingBraces == emptyHangingBraces) \ -- and not hangingComments: - #la commande est terminee - #la commande est terminee -- self.analyseReel(commande_courante.texte) -- commande_courante = None -- #on passe a la ligne suivante -- continue -- - - -- def enleve (self,texte) : -- """Supprime de texte tous les caracteres blancs, fins de ligne, tabulations -- Le nouveau texte est retourne -- """ -- i=0 -- chaine="" -- while (i', 'exec') -- print((a.dict_reels)) diff --cc generator/generator_aplat.py index 2bbdaade,44569df3..284d4a83 --- a/generator/generator_aplat.py +++ b/generator/generator_aplat.py @@@ -54,294 -54,292 +54,292 @@@ def entryPoint() class AplatGenerator(object): - """ - Ce generateur parcourt un objet de type JDC et produit - un fichier au format aplat - - L'acquisition et le parcours sont realises par la methode - generator.gener(objet_jdc,format) - - L'ecriture du fichier au format ini par appel de la methode - generator.writefile(nom_fichier) - - Ses caracteristiques principales sont exposees dans des attributs - de classe : - - extensions : qui donne une liste d'extensions de fichier preconisees - - """ - # Les extensions de fichier preconisees - extensions=('.*',) - - def __init__(self,cr=None): - # Si l'objet compte-rendu n'est pas fourni, on utilise le compte-rendu standard - if cr : - self.cr=cr - else: - self.cr=N_CR.CR(debut='CR generateur format aplat pour eficas', - fin='fin CR format aplat pour eficas') - self.init='' - # Le separateur utiise - self.sep='//' - # Le texte au format aplat est stocke dans l'attribut text - self.text='' - - def writefile(self,filename): - fp=open(filename,'w') - fp.write(self.text) - fp.close() - - def gener(self,obj,format='brut',config=None,appli=None): - """ - Retourne une representation du JDC obj sous une forme qui est parametree par format. - Si format vaut 'brut', 'standard' ou 'beautifie', retourne le texte issu de generator - """ - liste= self.generator(obj) - if format == 'brut': - self.text=liste - elif format == 'standard': - self.text=liste - elif format == 'beautifie': - self.text=liste - else: - raise EficasException(tr("Format pas implemente : %s", format)) - return self.text - - def generator(self,obj): - """ - Cette methode joue un role d'aiguillage en fonction du type de obj - On pourrait utiliser les methodes accept et visitxxx a la - place (depend des gouts !!!) - """ - # ATTENTION a l'ordre des tests : il peut avoir de l'importance (heritage) - if isinstance(obj,PROC_ETAPE): - return self.generPROC_ETAPE(obj) - elif isinstance(obj,MACRO_ETAPE): - return self.generMACRO_ETAPE(obj) - elif isinstance(obj,FORM_ETAPE): - return self.generFORM_ETAPE(obj) - elif isinstance(obj,ETAPE): - return self.generETAPE(obj) - elif isinstance(obj,MCFACT): - return self.generMCFACT(obj) - elif isinstance(obj,MCList): - return self.generMCList(obj) - elif isinstance(obj,MCBLOC): - return self.generMCBLOC(obj) - elif isinstance(obj,MCSIMP): - return self.generMCSIMP(obj) - elif isinstance(obj,ASSD): - return self.generASSD(obj) - elif isinstance(obj,ETAPE_NIVEAU): - return self.generETAPE_NIVEAU(obj) - elif isinstance(obj,COMMENTAIRE): - return self.generCOMMENTAIRE(obj) - # Attention doit etre place avant PARAMETRE (raison : heritage) - elif isinstance(obj,PARAMETRE_EVAL): - return self.generPARAMETRE_EVAL(obj) - elif isinstance(obj,PARAMETRE): - return self.generPARAMETRE(obj) - elif isinstance(obj,EVAL): - return self.generEVAL(obj) - elif isinstance(obj,COMMANDE_COMM): - return self.generCOMMANDE_COMM(obj) - elif isinstance(obj,JDC): - return self.generJDC(obj) - elif isinstance(obj,MCNUPLET): - return self.generMCNUPLET(obj) - else: - raise EficasException(tr("Format non implemente : %s", format)) - - - def generJDC(self,obj): - """ - Cette methode convertit un objet JDC en une chaine de - caracteres a la syntaxe aplat - """ - text='' - if obj.definition.l_niveaux == (): - # Il n'y a pas de niveaux - for etape in obj.etapes: - text=text+self.generator(etape)+'\n' - else: - # Il y a des niveaux - for etape_niveau in obj.etapes_niveaux: - text=text+self.generator(etape_niveau)+'\n' - return text - - def generCOMMANDE_COMM(self,obj): - """ - Cette methode convertit un COMMANDE_COMM - en une chaine de caracteres a la syntaxe aplat - """ - l_lignes = obj.valeur.split('\n') - txt='' - for ligne in l_lignes: - txt = txt + '##'+ligne+'\n' - return txt - - def generEVAL(self,obj): - """ - Cette methode convertit un EVAL - en une chaine de caracteres a la syntaxe aplat - """ - return 'EVAL("""'+ obj.valeur +'""")' - - def generCOMMENTAIRE(self,obj): - """ - Cette methode convertit un COMMENTAIRE - en une chaine de caracteres a la syntaxe aplat - """ - l_lignes = obj.valeur.split('\n') - txt='' - for ligne in l_lignes: - txt = txt + '#'+ligne+'\n' - return txt - - def generPARAMETRE_EVAL(self,obj): - """ - Cette methode convertit un PARAMETRE_EVAL - en une chaine de caracteres a la syntaxe aplat - """ - if obj.valeur == None: - return obj.nom + ' = None ;\n' - else: - return obj.nom + ' = '+ self.generator(obj.valeur) +';\n' - - def generPARAMETRE(self,obj): - """ - Cette methode convertit un PARAMETRE - en une chaine de caracteres a la syntaxe aplat - """ - if type(obj.valeur) == bytes or type(obj.valeur) == str: - # PN pour corriger le bug a='3+4' au lieu de a= 3+4 - #return obj.nom + " = '" + obj.valeur + "';\n" - return obj.nom + " = " + obj.valeur + ";\n" - else: - return obj.nom + ' = ' + str(obj.valeur) + ';\n' - - def generETAPE_NIVEAU(self,obj): - """ - Cette methode convertit une etape niveau - en une chaine de caracteres a la syntaxe aplat - """ - text='' - if obj.etapes_niveaux == []: - for etape in obj.etapes: - text=text+self.generator(etape)+'\n' - else: - for etape_niveau in obj.etapes_niveaux: - text=text+self.generator(etape_niveau)+'\n' - return text - - def gener_etape(self,obj): - """ - Cette methode est utilise pour convertir les objets etape - en une chaine de caracteres a la syntaxe aplat - """ - text='' - for v in obj.mcListe: - text=text + self.generator(v) - if text=='': - return self.init+'\n' - else: - return text - - def generETAPE(self,obj): - """ - Cette methode convertit une etape - en une chaine de caracteres a la syntaxe aplat - """ - try: - sdname= self.generator(obj.sd) - except: - sdname='sansnom' - self.init = sdname + self.sep + obj.nom - return self.gener_etape(obj) - - def generMACRO_ETAPE(self,obj): - """ - Cette methode convertit une macro-etape - en une chaine de caracteres a la syntaxe aplat - """ - try: - if obj.sd == None: - self.init = obj.nom - else: - sdname= self.generator(obj.sd) - self.init = sdname + self.sep + obj.nom - except: - self.init = 'sansnom' + self.sep + obj.nom - - return self.gener_etape(obj) - - generPROC_ETAPE = generMACRO_ETAPE - - generFORM_ETAPE = generMACRO_ETAPE - - def generASSD(self,obj): - """ - Convertit un objet derive d'ASSD en une chaine de caracteres a la - syntaxe aplat - """ - return obj.getName() - - def generMCList(self,obj): - """ - Convertit un objet MCList en une chaine de caracteres a la - syntaxe aplat - """ - i=0 - text = '' - init = self.init + self.sep + obj.nom - old_init=self.init - for data in obj.data : - i=i+1 - self.init = init + self.sep + "occurrence n"+repr(i) - text = text + self.generator(data) - self.init=old_init - return text - - def generMCSIMP(self,obj) : - """ - Convertit un objet MCSIMP en une chaine de caracteres a la - syntaxe aplat - """ - if type(obj.valeur) in (tuple,list) : - # On est en presence d'une liste de valeur - rep = '(' - for val in obj.valeur: - #if type(val) == types.InstanceType : - if isinstance(val,object): - rep = rep + self.generator(val) +',' - else: - rep = rep + repr(val)+',' - rep = rep + ')' - #elif type(obj.valeur) == types.InstanceType : - elif type(obj.valeur) == object : - # On est en presence d'une valeur unique de type instance - rep = self.generator(obj.valeur) - else : - # On est en presence d'une valeur unique - rep = repr(obj.valeur) - return self.init + self.sep + obj.nom + ' :' + rep + '\n' - - def generMCCOMPO(self,obj): - """ - Convertit un objet MCCOMPO en une chaine de caracteres a la - syntaxe aplat - """ - text = '' - old_init=self.init - self.init = self.init + self.sep + obj.nom - for mocle in obj.mcListe : - text = text + self.generator(mocle) - self.init=old_init - return text - - generMCFACT=generMCCOMPO - - generMCBLOC=generMCCOMPO - - generMCNUPLET=generMCCOMPO + """ + Ce generateur parcourt un objet de type JDC et produit + un fichier au format aplat + + L'acquisition et le parcours sont realises par la methode + generator.gener(objet_jdc,format) + + L'ecriture du fichier au format ini par appel de la methode - generator.writefile(nom_fichier) ++ generator.writeFile(nom_fichier) + Ses caracteristiques principales sont exposees dans des attributs + de classe : + - extensions : qui donne une liste d'extensions de fichier preconisees + """ + # Les extensions de fichier preconisees + extensions=('.*',) + + def __init__(self,cr=None): + # Si l'objet compte-rendu n'est pas fourni, on utilise le compte-rendu standard + if cr : + self.cr=cr + else: + self.cr=N_CR.CR(debut='CR generateur format aplat pour eficas', + fin='fin CR format aplat pour eficas') + self.init='' + # Le separateur utiise + self.sep='//' + # Le texte au format aplat est stocke dans l'attribut text + self.text='' + - def writefile(self,filename): ++ def writeFile(self,filename): + fp=open(filename,'w') + fp.write(self.text) + fp.close() + + def gener(self,obj,format='brut',config=None,appliEficas=None): + """ + Retourne une representation du JDC obj sous une forme qui est parametree par format. + Si format vaut 'brut', 'standard' ou 'beautifie', retourne le texte issu de generator + """ + liste= self.generator(obj) + if format == 'brut': + self.text=liste + elif format == 'standard': + self.text=liste + elif format == 'beautifie': + self.text=liste + else: + raise EficasException(tr("Format pas implemente : %s", format)) + return self.text + + def generator(self,obj): + """ + Cette methode joue un role d'aiguillage en fonction du type de obj + On pourrait utiliser les methodes accept et visitxxx a la + place (depend des gouts !!!) + """ + # ATTENTION a l'ordre des tests : il peut avoir de l'importance (heritage) + if isinstance(obj,PROC_ETAPE): + return self.generPROC_ETAPE(obj) + elif isinstance(obj,MACRO_ETAPE): + return self.generMACRO_ETAPE(obj) + elif isinstance(obj,FORM_ETAPE): + return self.generFORM_ETAPE(obj) + elif isinstance(obj,ETAPE): + return self.generETAPE(obj) + elif isinstance(obj,MCFACT): + return self.generMCFACT(obj) + elif isinstance(obj,MCList): + return self.generMCList(obj) + elif isinstance(obj,MCBLOC): + return self.generMCBLOC(obj) + elif isinstance(obj,MCSIMP): + return self.generMCSIMP(obj) + elif isinstance(obj,ASSD): + return self.generASSD(obj) + elif isinstance(obj,ETAPE_NIVEAU): + return self.generETAPE_NIVEAU(obj) + elif isinstance(obj,COMMENTAIRE): + return self.generCOMMENTAIRE(obj) + # Attention doit etre place avant PARAMETRE (raison : heritage) + elif isinstance(obj,PARAMETRE_EVAL): + return self.generPARAMETRE_EVAL(obj) + elif isinstance(obj,PARAMETRE): + return self.generPARAMETRE(obj) + elif isinstance(obj,EVAL): + return self.generEVAL(obj) + elif isinstance(obj,COMMANDE_COMM): + return self.generCOMMANDE_COMM(obj) + elif isinstance(obj,JDC): + return self.generJDC(obj) + elif isinstance(obj,MCNUPLET): + return self.generMCNUPLET(obj) + else: + raise EficasException(tr("Format non implemente : %s", format)) + + + def generJDC(self,obj): + """ + Cette methode convertit un objet JDC en une chaine de + caracteres a la syntaxe aplat + """ + text='' + if obj.definition.l_niveaux == (): + # Il n'y a pas de niveaux + for etape in obj.etapes: + text=text+self.generator(etape)+'\n' + else: + # Il y a des niveaux + for etape_niveau in obj.etapes_niveaux: + text=text+self.generator(etape_niveau)+'\n' + return text + + def generCOMMANDE_COMM(self,obj): + """ + Cette methode convertit un COMMANDE_COMM + en une chaine de caracteres a la syntaxe aplat + """ + l_lignes = obj.valeur.split('\n') + txt='' + for ligne in l_lignes: + txt = txt + '##'+ligne+'\n' + return txt + + def generEVAL(self,obj): + """ + Cette methode convertit un EVAL + en une chaine de caracteres a la syntaxe aplat + """ + return 'EVAL("""'+ obj.valeur +'""")' + + def generCOMMENTAIRE(self,obj): + """ + Cette methode convertit un COMMENTAIRE + en une chaine de caracteres a la syntaxe aplat + """ + l_lignes = obj.valeur.split('\n') + txt='' + for ligne in l_lignes: + txt = txt + '#'+ligne+'\n' + return txt + + def generPARAMETRE_EVAL(self,obj): + """ + Cette methode convertit un PARAMETRE_EVAL + en une chaine de caracteres a la syntaxe aplat + """ + if obj.valeur == None: + return obj.nom + ' = None ;\n' + else: + return obj.nom + ' = '+ self.generator(obj.valeur) +';\n' + + def generPARAMETRE(self,obj): + """ + Cette methode convertit un PARAMETRE + en une chaine de caracteres a la syntaxe aplat + """ + if type(obj.valeur) == bytes or type(obj.valeur) == str: + # PN pour corriger le bug a='3+4' au lieu de a= 3+4 + #return obj.nom + " = '" + obj.valeur + "';\n" + return obj.nom + " = " + obj.valeur + ";\n" + else: + return obj.nom + ' = ' + str(obj.valeur) + ';\n' + + def generETAPE_NIVEAU(self,obj): + """ + Cette methode convertit une etape niveau + en une chaine de caracteres a la syntaxe aplat + """ + text='' + if obj.etapes_niveaux == []: + for etape in obj.etapes: + text=text+self.generator(etape)+'\n' + else: + for etape_niveau in obj.etapes_niveaux: + text=text+self.generator(etape_niveau)+'\n' + return text + + def gener_etape(self,obj): + """ + Cette methode est utilise pour convertir les objets etape + en une chaine de caracteres a la syntaxe aplat + """ + text='' + for v in obj.mcListe: + text=text + self.generator(v) + if text=='': + return self.init+'\n' + else: + return text + + def generETAPE(self,obj): + """ + Cette methode convertit une etape + en une chaine de caracteres a la syntaxe aplat + """ + try: + sdname= self.generator(obj.sd) + except: + sdname='sansnom' + self.init = sdname + self.sep + obj.nom + return self.gener_etape(obj) + + def generMACRO_ETAPE(self,obj): + """ + Cette methode convertit une macro-etape + en une chaine de caracteres a la syntaxe aplat + """ + try: + if obj.sd == None: + self.init = obj.nom + else: + sdname= self.generator(obj.sd) + self.init = sdname + self.sep + obj.nom + except: + self.init = 'sansnom' + self.sep + obj.nom + + return self.gener_etape(obj) + + generPROC_ETAPE = generMACRO_ETAPE + + generFORM_ETAPE = generMACRO_ETAPE + + def generASSD(self,obj): + """ + Convertit un objet derive d'ASSD en une chaine de caracteres a la + syntaxe aplat + """ + return obj.getName() + + def generMCList(self,obj): + """ + Convertit un objet MCList en une chaine de caracteres a la + syntaxe aplat + """ + i=0 + text = '' + init = self.init + self.sep + obj.nom + old_init=self.init + for data in obj.data : + i=i+1 + self.init = init + self.sep + "occurrence n"+repr(i) + text = text + self.generator(data) + self.init=old_init + return text + + def generMCSIMP(self,obj) : + """ + Convertit un objet MCSIMP en une chaine de caracteres a la + syntaxe aplat + """ + if type(obj.valeur) in (tuple,list) : + # On est en presence d'une liste de valeur + rep = '(' + for val in obj.valeur: + #if type(val) == types.InstanceType : + if isinstance(val,object): + rep = rep + self.generator(val) +',' + else: + rep = rep + repr(val)+',' + rep = rep + ')' + #elif type(obj.valeur) == types.InstanceType : + elif type(obj.valeur) == object : + # On est en presence d'une valeur unique de type instance + rep = self.generator(obj.valeur) + else : + # On est en presence d'une valeur unique + rep = repr(obj.valeur) + return self.init + self.sep + obj.nom + ' :' + rep + '\n' + + def generMCCOMPO(self,obj): + """ + Convertit un objet MCCOMPO en une chaine de caracteres a la + syntaxe aplat + """ + text = '' + old_init=self.init + self.init = self.init + self.sep + obj.nom + for mocle in obj.mcListe : + text = text + self.generator(mocle) + self.init=old_init + return text + + generMCFACT=generMCCOMPO + + generMCBLOC=generMCCOMPO + + generMCNUPLET=generMCCOMPO diff --cc generator/generator_python.py index 479c472a,d8623e91..b75de107 --- a/generator/generator_python.py +++ b/generator/generator_python.py @@@ -59,282 -59,292 +59,292 @@@ def entryPoint() class PythonGenerator(object): - """ - Ce generateur parcourt un objet de type JDC et produit - un fichier au format python - - L'acquisition et le parcours sont realises par la methode - generator.gener(objet_jdc,format) - - L'ecriture du fichier au format ini par appel de la methode - generator.writefile(nom_fichier) - - Ses caracteristiques principales sont exposees dans des attributs - de classe : - - extensions : qui donne une liste d'extensions de fichier preconisees - - """ - # Les extensions de fichier preconisees - extensions=('.comm',) - - def __init__(self,cr=None): - # Si l'objet compte-rendu n'est pas fourni, on utilise le compte-rendu standard - if cr : - self.cr=cr - else: - self.cr=N_CR.CR(debut='CR generateur format python pour python', - fin='fin CR format python pour python') - # Le texte au format python est stocke dans l'attribut text - self.text='' - self.appli=None - - def writefile(self,filename): - fp=open(filename,'w') - fp.write(self.text) - fp.close() - - def gener(self,obj,format='brut',config=None,appli=None): - """ - Retourne une representation du JDC obj sous une - forme qui est parametree par format. - Si format vaut 'brut', retourne une liste de listes de ... - Si format vaut 'standard', retourne un texte obtenu par concatenation de la liste - Si format vaut 'beautifie', retourne le meme texte beautifie - """ - import logging - if obj == None : - print ('appel a gener avec None') - return - self.appli=obj.getJdcRoot().appli - #self.appli=obj.appli - liste= self.generator(obj) - #format='standard' - if format == 'brut': - self.text=liste - elif format == 'standard': - self.text=''.join(liste) - elif format == 'beautifie': - jdc_formate = Formatage(liste,mode='.py') - #import cProfile, pstats, StringIO - #pr = cProfile.Profile() - #pr.enable() - self.text=jdc_formate.formateJdc() - #pr.disable() - #s = StringIO.StringIO() - #sortby = 'cumulative' - #ps = pstats.Stats(pr, stream=s).sort_stats(sortby) - #ps.print_stats() - #print (s.getValue()) - - elif format == 'Ligne': - jdc_formate = FormatageLigne(liste,mode='.py') - self.text=jdc_formate.formateJdc() - else: - raise EficasException(tr("Format non implemente ") +format) - return self.text - - def generator(self,obj): - """ - Cette methode joue un role d'aiguillage en fonction du type de obj - On pourrait utiliser les methodes accept et visitxxx a la - place (depend des gouts !!!) - """ - # ATTENTION a l'ordre des tests : il peut avoir de l'importance (heritage) - if isinstance(obj,Accas.PROC_ETAPE): - return self.generPROC_ETAPE(obj) - # Attention doit etre place avant MACRO (raison : heritage) - elif isinstance(obj,Accas.FORM_ETAPE): - return self.generFORM_ETAPE(obj) - elif isinstance(obj,Accas.MACRO_ETAPE): - return self.generMACRO_ETAPE(obj) - elif isinstance(obj,Accas.ETAPE): - return self.generETAPE(obj) - elif isinstance(obj,Accas.MCFACT): - return self.generMCFACT(obj) - elif isinstance(obj,Accas.MCList): - return self.generMCList(obj) - elif isinstance(obj,Accas.MCBLOC): - return self.generMCBLOC(obj) - elif isinstance(obj,Accas.MCSIMP): - return self.generMCSIMP(obj) - elif isinstance(obj,Accas.ASSD): - return self.generASSD(obj) - elif isinstance(obj,Accas.ETAPE_NIVEAU): - return self.generETAPE_NIVEAU(obj) - elif isinstance(obj,Accas.COMMENTAIRE): - return self.generCOMMENTAIRE(obj) - # Attention doit etre place avant PARAMETRE (raison : heritage) - elif isinstance(obj,Accas.PARAMETRE_EVAL): - return self.generPARAMETRE_EVAL(obj) - elif isinstance(obj,Accas.PARAMETRE): - return self.generPARAMETRE(obj) - elif isinstance(obj,Accas.EVAL): - return self.generEVAL(obj) - elif isinstance(obj,Accas.COMMANDE_COMM): - return self.generCOMMANDE_COMM(obj) - elif isinstance(obj,Accas.JDC): - return self.generJDC(obj) - elif isinstance(obj,Accas.MCNUPLET): - return self.generMCNUPLET(obj) - elif isinstance(obj,ITEM_PARAMETRE): - return self.generITEM_PARAMETRE(obj) - elif isinstance(obj,Formula): - return self.generFormula(obj) - else: - raise EficasException(tr("Type d'objet non prevu") +obj) - - def generJDC(self,obj): - """ - Cette methode convertit un objet JDC en une liste de chaines de - caracteres a la syntaxe python - """ - l=[] - if obj.definition.l_niveaux == (): - # Il n'y a pas de niveaux - for etape in obj.etapes: - l.append(self.generator(etape)) - else: - # Il y a des niveaux - for etape_niveau in obj.etapes_niveaux: - l.extend(self.generator(etape_niveau)) - if l != [] : - # Si au moins une etape, on ajoute le retour chariot sur la derniere etape - if type(l[-1])==list: - l[-1][-1] = l[-1][-1]+'\n' - elif type(l[-1])==bytes or type(l[-1])==str: - l[-1] = l[-1]+'\n' - return l - - def generMCNUPLET(self,obj): - """ - Methode generant une representation de self permettant son ecriture - dans le format python - """ - l=[] - l.append('(') - for v in obj.mcListe: - text = re.sub(".*=","",self.generator(v)) - l.append(text) - l.append('),') - return l - - def generCOMMANDE_COMM(self,obj): - """ - Cette methode convertit un COMMANDE_COMM - en une liste de chaines de caracteres a la syntaxe python - """ - l_lignes = obj.valeur.split('\n') - txt='' - for ligne in l_lignes: - txt = txt + '##'+ligne+'\n' - return txt - - def generEVAL(self,obj): - """ - Cette methode convertit un EVAL - en une liste de chaines de caracteres a la syntaxe python - """ - return 'EVAL("""'+ obj.valeur +'""")' - - def generCOMMENTAIRE(self,obj): - """ - Cette methode convertit un COMMENTAIRE - en une liste de chaines de caracteres a la syntaxe python - """ - # modification pour repondre a la demande de C. Durand, d'eviter - # l'ajout systematique d'un diese, a la suite du commentaire - # Dans la chaine de caracteres obj.valeur, on supprime le dernier - # saut de ligne - sans_saut = re.sub("\n$","",obj.valeur) - l_lignes = sans_saut.split('\n') - txt='' - i=1 - for ligne in l_lignes: - txt = txt + '#'+ligne+'\n' - - # suppression du dernier saut de ligne - #txt = re.sub("\n$","",txt) - # on ajoute un saut de ligne avant - pattern=re.compile(" ?\#") - m=pattern.match(txt) - if m: - txt="\n"+txt - return txt - - def generPARAMETRE_EVAL(self,obj): - """ - Cette methode convertit un PARAMETRE_EVAL - en une liste de chaines de caracteres a la syntaxe python - """ - if obj.valeur == None: - return obj.nom + ' = None ;\n' - else: - return obj.nom + ' = '+ self.generator(obj.valeur) +';\n' - - def generITEM_PARAMETRE(self,obj): - return repr(obj) - - def generFormula(self,obj): - #return repr(obj) - return str(obj) - - def generPARAMETRE(self,obj): - """ - Cette methode convertit un PARAMETRE - en une liste de chaines de caracteres a la syntaxe python - """ - return repr(obj) + ";\n" - - def generETAPE_NIVEAU(self,obj): - """ - Cette methode convertit une etape niveau - en une liste de chaines de caracteres a la syntaxe python - """ - l=[] - if obj.etapes_niveaux == []: - for etape in obj.etapes: - l.append(self.generator(etape)) - else: - for etape_niveau in obj.etapes_niveaux: - l.extend(self.generator(etape_niveau)) - return l - - def generETAPE(self,obj): - """ - Cette methode convertit une etape - en une liste de chaines de caracteres a la syntaxe python - """ - try: - sdname= self.generator(obj.sd) - if sdname.find('SD_') != -1: sdname='sansnom' - except: - sdname='sansnom' - l=[] - label=sdname + '='+obj.definition.nom+'(' - l.append(label) - if obj.reuse != None : - str = 'reuse ='+ self.generator(obj.reuse) + ',' - l.append(str) - for v in obj.mcListe: - if isinstance(v,Accas.MCBLOC) : - liste=self.generator(v) - for mocle in liste : - l.append(mocle) - elif isinstance(v,Accas.MCSIMP) : - text=self.generator(v) - l.append(v.nom+'='+text) + """ + Ce generateur parcourt un objet de type JDC et produit + un fichier au format python + + L'acquisition et le parcours sont realises par la methode + generator.gener(objet_jdc,format) + + L'ecriture du fichier au format ini par appel de la methode - generator.writefile(nom_fichier) ++ generator.writeFile(nom_fichier) + + Ses caracteristiques principales sont exposees dans des attributs + de classe : + - extensions : qui donne une liste d'extensions de fichier preconisees + + """ + # Les extensions de fichier preconisees + extensions=('.comm',) + + def __init__(self,cr=None): + # Si l'objet compte-rendu n'est pas fourni, on utilise le compte-rendu standard + if cr : + self.cr=cr else: - # MCFACT ou MCList - liste=self.generator(v) - liste[0]=v.nom+'='+liste[0] - l.append(liste) - if len(l) == 1: - l[0]=label+');' - else : - l.append(');') - return l + self.cr=N_CR.CR(debut='CR generateur format python pour python', + fin='fin CR format python pour python') + # Le texte au format python est stocke dans l'attribut text + self.text='' + self.appliEficas=None + - def writefile(self,filename): ++ def writeFile(self,filename): + fp=open(filename,'w') + fp.write(self.text) + fp.close() + + def gener(self,obj,format='brut',config=None,appliEficas=None): + """ + Retourne une representation du JDC obj sous une + forme qui est parametree par format. + Si format vaut 'brut', retourne une liste de listes de ... + Si format vaut 'standard', retourne un texte obtenu par concatenation de la liste + Si format vaut 'beautifie', retourne le meme texte beautifie + """ + import logging + if obj == None : + print ('appel a gener avec None') + return + self.appliEficas=appliEficas + liste= self.generator(obj) + #format='standard' + if format == 'brut': + self.text=liste + elif format == 'standard': + self.text=''.join(liste) + elif format == 'beautifie': + jdc_formate = Formatage(liste,mode='.py') + #import cProfile, pstats, StringIO + #pr = cProfile.Profile() + #pr.enable() + self.text=jdc_formate.formateJdc() + #pr.disable() + #s = StringIO.StringIO() + #sortby = 'cumulative' + #ps = pstats.Stats(pr, stream=s).sort_stats(sortby) + #ps.print_stats() + #print (s.getValue()) + + elif format == 'Ligne': + jdc_formate = FormatageLigne(liste,mode='.py') + self.text=jdc_formate.formateJdc() + else: + raise EficasException(tr("Format non implemente ") +format) + return self.text + + def generator(self,obj): + """ + Cette methode joue un role d'aiguillage en fonction du type de obj + On pourrait utiliser les methodes accept et visitxxx a la + place (depend des gouts !!!) + """ + # ATTENTION a l'ordre des tests : il peut avoir de l'importance (heritage) + if isinstance(obj,Accas.PROC_ETAPE): + return self.generPROC_ETAPE(obj) + # Attention doit etre place avant MACRO (raison : heritage) + elif isinstance(obj,Accas.FORM_ETAPE): + return self.generFORM_ETAPE(obj) + elif isinstance(obj,Accas.MACRO_ETAPE): + return self.generMACRO_ETAPE(obj) + elif isinstance(obj,Accas.ETAPE): + return self.generETAPE(obj) + elif isinstance(obj,Accas.MCFACT): + return self.generMCFACT(obj) + elif isinstance(obj,Accas.MCList): + return self.generMCList(obj) + elif isinstance(obj,Accas.MCBLOC): + return self.generMCBLOC(obj) + elif isinstance(obj,Accas.MCSIMP): + return self.generMCSIMP(obj) + elif isinstance(obj,Accas.ASSD): + return self.generASSD(obj) + elif isinstance(obj,Accas.ETAPE_NIVEAU): + return self.generETAPE_NIVEAU(obj) + elif isinstance(obj,Accas.COMMENTAIRE): + return self.generCOMMENTAIRE(obj) + # Attention doit etre place avant PARAMETRE (raison : heritage) + elif isinstance(obj,Accas.PARAMETRE_EVAL): + return self.generPARAMETRE_EVAL(obj) + elif isinstance(obj,Accas.PARAMETRE): + return self.generPARAMETRE(obj) + elif isinstance(obj,Accas.EVAL): + return self.generEVAL(obj) + elif isinstance(obj,Accas.COMMANDE_COMM): + return self.generCOMMANDE_COMM(obj) + elif isinstance(obj,Accas.JDC): + return self.generJDC(obj) + elif isinstance(obj,Accas.MCNUPLET): + return self.generMCNUPLET(obj) + elif isinstance(obj,ITEM_PARAMETRE): + return self.generITEM_PARAMETRE(obj) + elif isinstance(obj,Formula): + return self.generFormula(obj) + else: + raise EficasException(tr("Type d'objet non prevu") +obj) + + def generJDC(self,obj): + """ + Cette methode convertit un objet JDC en une liste de chaines de + caracteres a la syntaxe python + """ + l=[] + + #print ('generJDC', obj.sdsDict) + for objRef in obj.sdsDict : + if (isinstance(obj.sdsDict[objRef],Accas.UserASSD)) or (isinstance(obj.sdsDict[objRef],Accas.UserASSDMultiple)): + l.append(self.generUserASSD(obj.sdsDict[objRef])) + if obj.definition.l_niveaux == (): + # Il n'y a pas de niveaux + for etape in obj.etapes: + l.append(self.generator(etape)) + else: + # Il y a des niveaux + for etape_niveau in obj.etapes_niveaux: + l.extend(self.generator(etape_niveau)) + if l != [] : + # Si au moins une etape, on ajoute le retour chariot sur la derniere etape + if type(l[-1])==list: + l[-1][-1] = l[-1][-1]+'\n' + elif type(l[-1])==bytes or type(l[-1])==str: + l[-1] = l[-1]+'\n' + return l + + def generUserASSD(self,obj): + classeName = obj.__class__.__name__ + if obj.valeur == None : + texte = obj.nom + '=' + classeName + '()' + return texte + + def generMCNUPLET(self,obj): + """ + Methode generant une representation de self permettant son ecriture + dans le format python + """ + l=[] + l.append('(') + for v in obj.mcListe: + text = re.sub(".*=","",self.generator(v)) + l.append(text) + l.append('),') + return l + + def generCOMMANDE_COMM(self,obj): + """ + Cette methode convertit un COMMANDE_COMM + en une liste de chaines de caracteres a la syntaxe python + """ + l_lignes = obj.valeur.split('\n') + txt='' + for ligne in l_lignes: + txt = txt + '##'+ligne+'\n' + return txt + + def generEVAL(self,obj): + """ + Cette methode convertit un EVAL + en une liste de chaines de caracteres a la syntaxe python + """ + return 'EVAL("""'+ obj.valeur +'""")' + + def generCOMMENTAIRE(self,obj): + """ + Cette methode convertit un COMMENTAIRE + en une liste de chaines de caracteres a la syntaxe python + """ + # modification pour repondre a la demande de C. Durand, d'eviter + # l'ajout systematique d'un diese, a la suite du commentaire + # Dans la chaine de caracteres obj.valeur, on supprime le dernier + # saut de ligne + sans_saut = re.sub("\n$","",obj.valeur) + l_lignes = sans_saut.split('\n') + txt='' + i=1 + for ligne in l_lignes: + txt = txt + '#'+ligne+'\n' + + # suppression du dernier saut de ligne + #txt = re.sub("\n$","",txt) + # on ajoute un saut de ligne avant + pattern=re.compile(" ?\#") + m=pattern.match(txt) + if m: + txt="\n"+txt + return txt + + def generPARAMETRE_EVAL(self,obj): + """ + Cette methode convertit un PARAMETRE_EVAL + en une liste de chaines de caracteres a la syntaxe python + """ + if obj.valeur == None: + return obj.nom + ' = None ;\n' + else: + return obj.nom + ' = '+ self.generator(obj.valeur) +';\n' + + def generITEM_PARAMETRE(self,obj): + return repr(obj) + + def generFormula(self,obj): + #return repr(obj) + return str(obj) + + def generPARAMETRE(self,obj): + """ + Cette methode convertit un PARAMETRE + en une liste de chaines de caracteres a la syntaxe python + """ + return repr(obj) + ";\n" + + def generETAPE_NIVEAU(self,obj): + """ + Cette methode convertit une etape niveau + en une liste de chaines de caracteres a la syntaxe python + """ + l=[] + if obj.etapes_niveaux == []: + for etape in obj.etapes: + l.append(self.generator(etape)) + else: + for etape_niveau in obj.etapes_niveaux: + l.extend(self.generator(etape_niveau)) + return l + + def generETAPE(self,obj): + """ + Cette methode convertit une etape + en une liste de chaines de caracteres a la syntaxe python + """ + try: + sdname= self.generator(obj.sd) + if sdname.find('SD_') != -1: sdname='sansnom' + except: + sdname='sansnom' + l=[] + label=sdname + '='+obj.definition.nom+'(' + l.append(label) + if obj.reuse != None : + str = 'reuse ='+ self.generator(obj.reuse) + ',' + l.append(str) + for v in obj.mcListe: + if isinstance(v,Accas.MCBLOC) : + liste=self.generator(v) + for mocle in liste : + l.append(mocle) + elif isinstance(v,Accas.MCSIMP) : + text=self.generator(v) + l.append(v.nom+'='+text) + else: + # MCFACT ou MCList + liste=self.generator(v) + liste[0]=v.nom+'='+liste[0] + l.append(liste) + if len(l) == 1: + l[0]=label+');' + else : + l.append(');') + return l - def generFORM_ETAPE(self,obj): + def generFORM_ETAPE(self,obj): """ Methode particuliere pour les objets de type FORMULE """