Merge remote-tracking branch 'origin/win-support' into win-support

Krande · Dec 13, 2024 · 6b79a93 · 6b79a93
2 parents 5520416 + 2b78492
commit 6b79a93
Show file tree

Hide file tree

Showing 41 changed files with 270 additions and 130 deletions.
diff --git a/.gitlabci/gitlab-ci-pleiade.yml b/.gitlabci/gitlab-ci-pleiade.yml
@@ -25,6 +25,8 @@ workflow:
     - if: $CI_COMMIT_REF_NAME =~ $reg_debugging
       variables:
         BUILD: debug
+  auto_cancel:
+    on_new_commit: interruptible
 
 stages:
   - setup
@@ -35,6 +37,7 @@ image:
   name: ${IMAGE_URL}
 
 prepare:
+  interruptible: true
   stage: setup
   script:
     - .gitlabci/prepare.sh
@@ -45,6 +48,7 @@ prepare:
     expire_in: 6 hours
 
 compile:
+  interruptible: true
   stage: build
   needs: ["prepare"]
   script:
@@ -64,6 +68,7 @@ compile:
     expire_in: 3 days
 
 doc_html:
+  interruptible: true
   stage: build
   needs: ["prepare", "compile"]
   script:
@@ -76,6 +81,7 @@ doc_html:
     - if: $CI_MERGE_REQUEST_IID
 
 minimal_build:
+  interruptible: true
   stage: test
   needs: ["prepare", "compile", "check_source"]
   script:
@@ -84,6 +90,7 @@ minimal_build:
     - if: $CI_MERGE_REQUEST_IID
 
 check_source:
+  interruptible: true
   stage: test
   needs: ["prepare", "compile"]
   script:
@@ -96,6 +103,7 @@ check_source:
     - if: $CI_MERGE_REQUEST_IID
 
 check_issues:
+  interruptible: true
   stage: test
   needs: ["prepare", "check_source"]
   script:
@@ -104,6 +112,7 @@ check_issues:
     - if: $CI_MERGE_REQUEST_IID
 
 minimal_test:
+  interruptible: true
   stage: test
   needs: ["prepare", "compile"]
   script:
@@ -123,6 +132,7 @@ minimal_test:
     - if: $CI_MERGE_REQUEST_IID
 
 verification_test:
+  interruptible: true
   stage: test
   tags:
     - hulk
@@ -153,6 +163,7 @@ verification_test:
     - if: $CI_COMMIT_REF_NAME !~ $reg_debugging
 
 known_failures_test:
+  interruptible: true
   stage: test
   needs: ["prepare", "compile", "minimal_test"]
   script:
@@ -173,6 +184,7 @@ known_failures_test:
     - if: $CI_MERGE_REQUEST_IID
 
 debugging_test:
+  interruptible: true
   stage: test
   needs: ["prepare", "compile"]
   script:

diff --git a/astest/erreu11a.export b/astest/erreu11a.export
@@ -3,7 +3,7 @@ P memory_limit 1000
 P ncpus 1
 P mpi_nbcpu 1
 P mpi_nbnoeud 1
-P testlist submit verification sequential
+P testlist submit verification parallel
 
 F comm erreu11a.comm D 1
 F mmed erreu11a.mmed D 20
diff --git a/astest/ssll04a.comm b/astest/ssll04a.comm
@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------
-# Copyright (C) 1991 - 2023 - EDF R&D - www.code-aster.org
+# Copyright (C) 1991 - 2024 - EDF R&D - www.code-aster.org
 # This file is part of code_aster.
 #
 # code_aster is free software: you can redistribute it and/or modify
@@ -243,7 +243,7 @@ TEST_RESU(
             VALE_REFE=-2.9762e-02,
             REFERENCE="SOURCE_EXTERNE",
             CRITERE="RELATIF",
-            PRECISION=3.791801e-01 / 100.0,
+            PRECISION=0.005,
         ),
         _F(
             NUME_ORDRE=1,
@@ -255,7 +255,7 @@ TEST_RESU(
             VALE_REFE=1.6071e-01,
             REFERENCE="SOURCE_EXTERNE",
             CRITERE="RELATIF",
-            PRECISION=4.050915e-01 / 100.0,
+            PRECISION=0.005,
         ),
         _F(
             NUME_ORDRE=1,
@@ -267,7 +267,7 @@ TEST_RESU(
             VALE_REFE=-3.7004e-01,
             REFERENCE="SOURCE_EXTERNE",
             CRITERE="RELATIF",
-            PRECISION=3.877914e-01 / 100.0,
+            PRECISION=0.005,
         ),
     )
 )
@@ -284,7 +284,7 @@ TEST_RESU(
             VALE_REFE=8437.5,
             REFERENCE="SOURCE_EXTERNE",
             CRITERE="RELATIF",
-            PRECISION=4.024140e-01 / 100,
+            PRECISION=0.005,
         ),
         _F(
             NUME_ORDRE=1,
@@ -296,7 +296,7 @@ TEST_RESU(
             VALE_REFE=-1562.5,
             REFERENCE="SOURCE_EXTERNE",
             CRITERE="RELATIF",
-            PRECISION=3.666341e-01 / 100,
+            PRECISION=0.005,
         ),
         _F(
             NUME_ORDRE=1,
@@ -308,7 +308,7 @@ TEST_RESU(
             VALE_REFE=-3125,
             REFERENCE="SOURCE_EXTERNE",
             CRITERE="RELATIF",
-            PRECISION=3.795008e-01 / 100,
+            PRECISION=0.005,
         ),
         _F(
             NUME_ORDRE=1,
@@ -320,7 +320,7 @@ TEST_RESU(
             VALE_REFE=1562.5,
             REFERENCE="SOURCE_EXTERNE",
             CRITERE="RELATIF",
-            PRECISION=3.795008e-01 / 100,
+            PRECISION=0.005,
         ),
         _F(
             NUME_ORDRE=1,
@@ -332,7 +332,7 @@ TEST_RESU(
             VALE_REFE=8437.5,
             REFERENCE="SOURCE_EXTERNE",
             CRITERE="RELATIF",
-            PRECISION=3.895462e-01 / 100,
+            PRECISION=0.005,
         ),
         _F(
             NUME_ORDRE=1,
@@ -344,7 +344,7 @@ TEST_RESU(
             VALE_REFE=3125,
             REFERENCE="SOURCE_EXTERNE",
             CRITERE="RELATIF",
-            PRECISION=3.795010e-01 / 100,
+            PRECISION=0.005,
         ),
     )
 )

diff --git a/astest/ssll501b.comm b/astest/ssll501b.comm
@@ -245,7 +245,7 @@ TEST_RESU(
         RESULTAT=RESU,
         REFERENCE="SOURCE_EXTERNE",
         PRECISION=0.03,
-        VALE_CALC=-364953.18753,
+        VALE_CALC=-364952.84948,
         VALE_REFE=-3.55000e5,
         NOM_CHAM="EFGE_NOEU",
         NOM_CMP="MT",

diff --git a/astest/ssna102g.comm b/astest/ssna102g.comm
@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------
-# Copyright (C) 1991 - 2023 - EDF R&D - www.code-aster.org
+# Copyright (C) 1991 - 2024 - EDF R&D - www.code-aster.org
 # This file is part of code_aster.
 #
 # code_aster is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 # along with code_aster.  If not, see <http://www.gnu.org/licenses/>.
 # --------------------------------------------------------------------
 
-DEBUT(CODE=_F(NIV_PUB_WEB="INTERNET"), ERREUR=_F(ALARME="EXCEPTION"), DEBUG=_F(SDVERI="OUI"))
+DEBUT(CODE=_F(NIV_PUB_WEB="INTERNET"), ERREUR=_F(ALARME="ALARME"), DEBUG=_F(SDVERI="OUI"))
 
 # --------------------------------------------------------------------
 #       LECTURE DU MAILLAGE ET CREATION DE GROUPES DE NOEUDS

diff --git a/astest/ssnp158b.comm b/astest/ssnp158b.comm
@@ -17,7 +17,7 @@
 # along with code_aster.  If not, see <http://www.gnu.org/licenses/>.
 # --------------------------------------------------------------------
 
-DEBUT(CODE=_F(NIV_PUB_WEB="INTERNET"), ERREUR=_F(ALARME="EXCEPTION"))
+DEBUT(CODE=_F(NIV_PUB_WEB="INTERNET"), ERREUR=_F(ALARME="ALARME"))
 
 NbIncr = 20
 DT = 10.0 / NbIncr

diff --git a/astest/ssnv232a.comm b/astest/ssnv232a.comm
@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------
-# Copyright (C) 1991 - 2023 - EDF R&D - www.code-aster.org
+# Copyright (C) 1991 - 2024 - EDF R&D - www.code-aster.org
 # This file is part of code_aster.
 #
 # code_aster is free software: you can redistribute it and/or modify
@@ -60,7 +60,7 @@ TEMPS1 = DEFI_LIST_REEL(
 #    ESSAI TRIAXIAL NON DRAINE CYCLIQUE
 # ***********************************************************************
 SOL = DEFI_MATERIAU(
-    ELAS=_F(E=YOUNG, NU=POISSON, ALPHA=0.0), MOHR_COULOMB=_F(PHI=33.0, ANGDIL=27.0, COHESION=1.0e3)
+    ELAS=_F(E=YOUNG, NU=POISSON), MOHR_COULOMB=_F(PHI=33.0, ANGDIL=27.0, COHESION=1.0e3)
 )
 
 COEF1 = DEFI_FONCTION(NOM_PARA="INST", PROL_DROITE="CONSTANT", VALE=(0.0, 0.0, temps_max, 0.0))

diff --git a/astest/ttlp100b.comm b/astest/ttlp100b.comm
@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------
-# Copyright (C) 1991 - 2023 - EDF R&D - www.code-aster.org
+# Copyright (C) 1991 - 2024 - EDF R&D - www.code-aster.org
 # This file is part of code_aster.
 #
 # code_aster is free software: you can redistribute it and/or modify
@@ -137,7 +137,7 @@ RESUTHER = THER_NON_LINE(
     EXCIT=(_F(CHARGE=CHATHER), _F(CHARGE=CHATIMP)),
     INCREMENT=_F(LIST_INST=LINST, NUME_INST_FIN=15),
     ETAT_INIT=_F(CHAM_NO=TEMPINIT),
-    ARCHIVAGE=_F(PAS_ARCH=10),
+    ARCHIVAGE=_F(PAS_ARCH=10, CHAM_EXCLU=("FLUX_ELGA")),
 )
 
 RESUTHER = THER_NON_LINE(

diff --git a/astest/zzzz142a.comm b/astest/zzzz142a.comm
@@ -46,7 +46,7 @@ for VARFIELD, PHENOM in (("DEPL", "MECANIQUE"), ("TEMP", "THERMIQUE")):
 
             ZERO = DEFI_CONSTANTE(VALE=0.0)
             FCONST = DEFI_FONCTION(
-                NOM_PARA=VARC, VALE=(vale_varc, 1), PROL_GAUCHE="CONSTANT", PROL_DROITE="CONSTANT"
+                NOM_PARA=VARC, VALE=(vale_varc, 1), PROL_GAUCHE="EXCLU", PROL_DROITE="EXCLU"
             )
 
             MATE = DEFI_MATERIAU(
@@ -70,6 +70,12 @@ for VARFIELD, PHENOM in (("DEPL", "MECANIQUE"), ("TEMP", "THERMIQUE")):
                 AFFE=_F(GROUP_MA=group_ma[MODELISATION], NOM_CMP=VARC, VALE=vale_varc),
             )
 
+            RESUVARC = CREA_RESU(
+                OPERATION="AFFE",
+                TYPE_RESU="EVOL_VARC",
+                AFFE=_F(NOM_CHAM=VARC, CHAM_GD=FIELDVARC, INST=vale_varc),
+            )
+
             FIELD = CREA_CHAMP(
                 TYPE_CHAM="NOEU_%s_R" % VARFIELD,
                 OPERATION="AFFE",
@@ -81,7 +87,7 @@ for VARFIELD, PHENOM in (("DEPL", "MECANIQUE"), ("TEMP", "THERMIQUE")):
                 ),
             )
 
-            affevarckw = {"TOUT": "OUI", "NOM_VARC": VARC, "CHAM_GD": FIELDVARC}
+            affevarckw = {"TOUT": "OUI", "NOM_VARC": VARC, "EVOL": RESUVARC}
 
             if VARC == "TEMP":
                 affevarckw["VALE_REF"] = 20
@@ -94,6 +100,7 @@ for VARFIELD, PHENOM in (("DEPL", "MECANIQUE"), ("TEMP", "THERMIQUE")):
 
             EPOT = POST_ELEM(
                 CHAM_GD=FIELD,
+                INST=vale_varc,
                 MODELE=MOD,
                 CHAM_MATER=CHMAT,
                 ENER_POT=_F(GROUP_MA=group_ma[MODELISATION]),

diff --git a/astest/zzzz155a.py b/astest/zzzz155a.py
@@ -30,7 +30,7 @@
 
 
 def checkJoints(mesh):
-    comm = MPI.COMM_WORLD
+    comm = MPI.ASTER_COMM_WORLD
     l2G = mesh.getLocalToGlobalNodeIds()
 
     j = 0

diff --git a/astest/zzzz155i.py b/astest/zzzz155i.py
@@ -30,7 +30,7 @@
 
 
 def checkJoints(mesh):
-    comm = MPI.COMM_WORLD
+    comm = MPI.ASTER_COMM_WORLD
     l2G = mesh.getLocalToGlobalNodeIds()
 
     j = 0

diff --git a/astest/zzzz239a.comm b/astest/zzzz239a.comm
@@ -156,12 +156,10 @@ U1 = STAT_NON_LINE(
 # Test des itérations
 iterations = RECU_TABLE(CO=U1, NOM_PARA="ITER_GLOB")
 
-tab_iter = iterations.EXTR_TABLE().dict_CREA_TABLE()
-val_itermax = max(tab_iter["LISTE"][1]["LISTE_I"])
-print("Nombre iteration max", val_itermax)
+tab_iter = iterations.EXTR_TABLE()
+val_itermax = max(tab_iter.ITER_GLOB.values())
 
 test = CA.TestCase()
-test.assertLessEqual(val_itermax, 8)
-
+test.assertLessEqual(val_itermax, 10)
 
 FIN()
diff --git a/astest/zzzz253a.comm b/astest/zzzz253a.comm
@@ -1,6 +1,6 @@
 # coding=utf-8
 # --------------------------------------------------------------------
-# Copyright (C) 1991 - 2023 - EDF R&D - www.code-aster.org
+# Copyright (C) 1991 - 2024 - EDF R&D - www.code-aster.org
 # This file is part of code_aster.
 #
 # code_aster is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 # along with code_aster.  If not, see <http://www.gnu.org/licenses/>.
 # --------------------------------------------------------------------
 
-DEBUT(CODE=_F(NIV_PUB_WEB="INTERNET"), ERREUR=_F(ALARME="EXCEPTION"), DEBUG=_F(SDVERI="OUI"))
+DEBUT(CODE=_F(NIV_PUB_WEB="INTERNET"), ERREUR=_F(ALARME="ALARME"), DEBUG=_F(SDVERI="OUI"))
 # ===============================================================================================================
 #
 # La structure est un barreau de longueur 10.

diff --git a/astest/zzzz503o.py b/astest/zzzz503o.py
@@ -44,7 +44,7 @@
 
 
 def checkJoints(mesh):
-    comm = MPI.COMM_WORLD
+    comm = MPI.ASTER_COMM_WORLD
     l2G = mesh.getLocalToGlobalNodeIds()
 
     j = 0

diff --git a/astest/zzzz505b.py b/astest/zzzz505b.py
@@ -22,9 +22,7 @@
 from code_aster import CA
 from code_aster.Utilities import haveMPI
 
-DEBUT(
-    CODE=_F(NIV_PUB_WEB="INTERNET"), ERREUR=_F(ALARME="EXCEPTION"), DEBUG=_F(SDVERI="OUI"), INFO=1
-)
+DEBUT(CODE=_F(NIV_PUB_WEB="INTERNET"), ERREUR=_F(ALARME="ALARME"), DEBUG=_F(SDVERI="OUI"), INFO=1)
 
 test = CA.TestCase()