Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into win-support
Browse files Browse the repository at this point in the history 
# Conflicts:
#	bibc/supervis/python.c
#	bibfor/mumps/amumpi.F90
#	bibfor/nonlinear/nmdoch.F90
  • Loading branch information
@Krande
Krande committed Dec 13, 2024
2 parents 6b79a93 + 4ddfbf8 commit 664cc97
Show file tree
Hide file tree
Showing 19 changed files with 180 additions and 156 deletions.
2 changes: 1 addition & 1 deletion .gitlabci/gitlab-ci-pleiade.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ variables:
BUILD: mpi
REFREV: ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
GIT_SSL_NO_VERIFY: "true"
NPROC_MAX: 16
NPROC_MAX: 12
reg_debugging: '/^debugci.*/'
FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: "true"

Expand Down
19 changes: 10 additions & 9 deletions astest/hsnv101d.comm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -643,14 +643,14 @@ TEST_RESU(
),
_F(
GROUP_NO="N13",
CRITERE="ABSOLU",
NOM_CMP="V43",
GROUP_MA="M1",
CHAM_GD=CHVAR47,
VALE_CALC=0.0e00,
VALE_CALC=0.0,
VALE_REFE=0.0,
REFERENCE="NON_DEFINI",
ORDRE_GRANDEUR=1e-6,
CRITERE="ABSOLU",
ORDRE_GRANDEUR=1.0e-6,
),
_F(
GROUP_NO="N13",
Expand Down Expand Up @@ -716,13 +716,13 @@ TEST_RESU(
),
_F(
GROUP_NO="N13",
CRITERE="RELATIF",
NOM_CMP="V43",
GROUP_MA="M1",
CHAM_GD=CHVAR48,
VALE_CALC=1.0,
VALE_REFE=1.0,
REFERENCE="NON_DEFINI",
CRITERE="RELATIF",
PRECISION=1.0e-3,
),
_F(
Expand Down Expand Up @@ -799,13 +799,13 @@ TEST_RESU(
),
_F(
GROUP_NO="N13",
CRITERE="ABSOLU",
NOM_CMP="V43",
GROUP_MA="M1",
CHAM_GD=CHVAR64,
VALE_CALC=0.0e00,
VALE_CALC=0.0,
VALE_REFE=0.0,
REFERENCE="NON_DEFINI",
CRITERE="ABSOLU",
ORDRE_GRANDEUR=1.0e-6,
),
_F(
Expand Down Expand Up @@ -872,13 +872,14 @@ TEST_RESU(
),
_F(
GROUP_NO="N13",
CRITERE="RELATIF",
NOM_CMP="V43",
GROUP_MA="M1",
CHAM_GD=CHVA114,
VALE_CALC=1.0,
VALE_REFE=1.0,
REFERENCE="NON_DEFINI",
CRITERE="RELATIF",
PRECISION=1.0e-3,
),
_F(
GROUP_NO="N13",
Expand Down Expand Up @@ -1082,13 +1083,13 @@ TEST_RESU(
),
_F(
GROUP_NO="N13",
CRITERE="RELATIF",
NOM_CMP="V43",
GROUP_MA="M1",
CHAM_GD=CHVA296,
VALE_CALC=1.0,
VALE_REFE=1.0,
REFERENCE="NON_DEFINI",
CRITERE="RELATIF",
PRECISION=1.0e-3,
),
_F(
Expand Down
135 changes: 68 additions & 67 deletions astest/ssls146a.comm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -351,6 +351,7 @@ reslin = COMBINAISON_FERRAILLAGE(
CODIFICATION="EC2",
UNITE_CONTRAINTE="Pa",
UNITE_DIMENSION="m",
PAS_EPAI=0.001,
COMBINAISON=(
_F(TYPE="ELU_FONDAMENTAL", NOM_CAS=("elu1", "elu2")),
_F(TYPE="ELU_ACCIDENTEL", NOM_CAS=("elu_acc")),
Expand All @@ -370,10 +371,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="DNSXI",
GROUP_MA="Centre",
VALE_CALC=0.002507804860513445,
VALE_REFE=0.002507804860513445,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.002507804860512707,
VALE_REFE=0.002507804860512707,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -382,10 +383,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="DNSXI",
GROUP_MA="Centre",
VALE_CALC=0.0017342333909456612,
VALE_REFE=0.0017342333909456612,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.0017342333909453804,
VALE_REFE=0.0017342333909453804,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -394,10 +395,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="DNSXI",
GROUP_MA="Centre",
VALE_CALC=0.001352688427299791,
VALE_REFE=0.001352688427299791,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.0013526884273015248,
VALE_REFE=0.0013526884273015248,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -406,10 +407,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="DNSXI",
GROUP_MA="Centre",
VALE_CALC=0.0019383747460609256,
VALE_REFE=0.0019383747460609256,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.001938374746058527,
VALE_REFE=0.001938374746058527,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -418,10 +419,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="DNSXI",
GROUP_MA="Centre",
VALE_CALC=0.0013658555484377744,
VALE_REFE=0.0013658555484377744,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.001365855548444022,
VALE_REFE=0.001365855548444022,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -430,10 +431,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="DNSXI",
GROUP_MA="Centre",
VALE_CALC=0.002601182393405061,
VALE_REFE=0.002601182393405061,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.0026129281790207093,
VALE_REFE=0.0026129281790207093,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -442,10 +443,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="DNSXI",
GROUP_MA="Centre",
VALE_CALC=0.0010346715817815114,
VALE_REFE=0.0010346715817815114,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.0010346715817879178,
VALE_REFE=0.0010346715817879178,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -454,10 +455,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="DNSXI",
GROUP_MA="Centre",
VALE_CALC=0.002601182393405061,
VALE_REFE=0.002601182393405061,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.0026129281790207093,
VALE_REFE=0.0026129281790207093,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -468,8 +469,8 @@ TEST_RESU(
GROUP_MA="Centre",
VALE_CALC=6.0,
VALE_REFE=6.0,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
)
)
Expand All @@ -484,10 +485,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="AZS",
GROUP_MA="Base",
VALE_CALC=0.0004192286652714539,
VALE_REFE=0.0004192286652714539,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.00041922866524667026,
VALE_REFE=0.00041922866524667026,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -496,10 +497,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="AZS",
GROUP_MA="Base",
VALE_CALC=0.0010210387795773711,
VALE_REFE=0.0010210387795773711,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.0010210387795471286,
VALE_REFE=0.0010210387795471286,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -508,10 +509,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="AZS",
GROUP_MA="Base",
VALE_CALC=0.0005573458916023079,
VALE_REFE=0.0005573458916023079,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.0005573458915864485,
VALE_REFE=0.0005573458915864485,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -520,10 +521,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="AZS",
GROUP_MA="Base",
VALE_CALC=0.00029628845335525543,
VALE_REFE=0.00029628845335525543,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.00029628845335525,
VALE_REFE=0.00029628845335525,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -532,10 +533,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="AZS",
GROUP_MA="Base",
VALE_CALC=0.000801481356630922,
VALE_REFE=0.000801481356630922,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.0007133544561062694,
VALE_REFE=0.0007133544561062694,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -546,8 +547,8 @@ TEST_RESU(
GROUP_MA="Base",
VALE_CALC=0.0,
VALE_REFE=0.0,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -556,10 +557,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="AZS",
GROUP_MA="Base",
VALE_CALC=0.0006096682330196204,
VALE_REFE=0.0006096682330196204,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.0006155252148797529,
VALE_REFE=0.0006155252148797529,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -568,10 +569,10 @@ TEST_RESU(
CRITERE="RELATIF",
NOM_CMP="AZS",
GROUP_MA="Base",
VALE_CALC=0.0010210387795773711,
VALE_REFE=0.0010210387795773711,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
VALE_CALC=0.0010210387795471286,
VALE_REFE=0.0010210387795471286,
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
_F(
RESULTAT=reslin,
Expand All @@ -582,8 +583,8 @@ TEST_RESU(
GROUP_MA="Base",
VALE_CALC=2.0,
VALE_REFE=2.0,
PRECISION=4.0e-2,
REFERENCE="ANALYTIQUE",
PRECISION=1.0e-6,
REFERENCE="AUTRE_ASTER",
),
)
)
Expand Down
8 changes: 4 additions & 4 deletions bibc/supervis/python.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* -------------------------------------------------------------------- */
/* 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 */
Expand Down Expand Up @@ -47,15 +47,15 @@

void initAsterModules() {
// Python 3.12 raises an error if PyImport_AppendInittab is called after Py_Initialize
if (!Py_IsInitialized()) {
if ( !Py_IsInitialized() ) {
PyImport_AppendInittab( "aster_core", PyInit_aster_core );
PyImport_AppendInittab( "aster", PyInit_aster );

/* Module définissant des opérations sur les objets fonction_sdaster */
PyImport_AppendInittab( "aster_fonctions", PyInit_aster_fonctions );
#ifdef ASTER_HAVE_MED
#ifdef ASTER_HAVE_MED
PyImport_AppendInittab( "med_aster", PyInit_med_aster );
#endif
#endif
}
}

Expand Down
Loading

0 comments on commit 664cc97

Please sign in to comment.