Skip to content

Commit 0724167

Browse files
grospelliergillesgrospelliergilles
authored
Merge pull request #1183 from arcaneframework/dev/gg-remove-nb-environment-and-nb-material-variable
Always use incremental material connectivities and remove cell variable containing number of materials and environments
2 parents ebb8608 + fc90067 commit 0724167

27 files changed

+90
-731
lines changed

‎arcane/ceapart/tests/testMaterial-1.arc

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<variable>Density</variable>
2020
<variable>Density_ENV1_MAT1</variable>
2121
<variable>Pressure</variable>
22-
<variable>StdMat_CellNbEnvironment</variable>
2322
<groupe>StdMat_ENV1</groupe>
2423
<groupe>StdMat_ENV1_MAT1</groupe>
2524
<groupe>AllCells</groupe>

‎arcane/ceapart/tests/testMaterial-2-opt1.arc

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV2_MAT2</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
26-
<variable>StdMat_CellNbMaterial_ENV2</variable>
27-
<variable>StdMat_CellNbMaterial_ENV3</variable>
2824
<groupe>StdMat_ENV1</groupe>
2925
<groupe>StdMat_ENV2</groupe>
3026
<groupe>StdMat_ENV3</groupe>

‎arcane/ceapart/tests/testMaterial-2-opt3.arc

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV2_MAT2</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
26-
<variable>StdMat_CellNbMaterial_ENV2</variable>
27-
<variable>StdMat_CellNbMaterial_ENV3</variable>
2824
<groupe>StdMat_ENV1</groupe>
2925
<groupe>StdMat_ENV2</groupe>
3026
<groupe>StdMat_ENV3</groupe>

‎arcane/ceapart/tests/testMaterial-2-opt5.arc

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV2_MAT2</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
26-
<variable>StdMat_CellNbMaterial_ENV2</variable>
27-
<variable>StdMat_CellNbMaterial_ENV3</variable>
2824
<groupe>StdMat_ENV1</groupe>
2925
<groupe>StdMat_ENV2</groupe>
3026
<groupe>StdMat_ENV3</groupe>

‎arcane/ceapart/tests/testMaterial-2-opt7-cs.arc

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV2_MAT2</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
26-
<variable>StdMat_CellNbMaterial_ENV2</variable>
27-
<variable>StdMat_CellNbMaterial_ENV3</variable>
2824
<groupe>StdMat_ENV1</groupe>
2925
<groupe>StdMat_ENV2</groupe>
3026
<groupe>StdMat_ENV3</groupe>

‎arcane/ceapart/tests/testMaterial-2-opt7.arc

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV2_MAT2</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
26-
<variable>StdMat_CellNbMaterial_ENV2</variable>
27-
<variable>StdMat_CellNbMaterial_ENV3</variable>
2824
<groupe>StdMat_ENV1</groupe>
2925
<groupe>StdMat_ENV2</groupe>
3026
<groupe>StdMat_ENV3</groupe>

‎arcane/ceapart/tests/testMaterial-2.arc

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV2_MAT2</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
26-
<variable>StdMat_CellNbMaterial_ENV2</variable>
27-
<variable>StdMat_CellNbMaterial_ENV3</variable>
2824
<groupe>StdMat_ENV1</groupe>
2925
<groupe>StdMat_ENV2</groupe>
3026
<groupe>StdMat_ENV3</groupe>

‎arcane/ceapart/tests/testMaterial-3-opt1.arc

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV1_MAT3</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
2624
<groupe>StdMat_ENV1</groupe>
2725
<groupe>StdMat_ENV1_MAT1</groupe>
2826
<groupe>StdMat_ENV1_MAT2</groupe>

‎arcane/ceapart/tests/testMaterial-3-opt3.arc

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV1_MAT3</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
2624
<groupe>StdMat_ENV1</groupe>
2725
<groupe>StdMat_ENV1_MAT1</groupe>
2826
<groupe>StdMat_ENV1_MAT2</groupe>

‎arcane/ceapart/tests/testMaterial-3-opt5.arc

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV1_MAT3</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
2624
<groupe>StdMat_ENV1</groupe>
2725
<groupe>StdMat_ENV1_MAT1</groupe>
2826
<groupe>StdMat_ENV1_MAT2</groupe>

‎arcane/ceapart/tests/testMaterial-3-opt7-lb.arc

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV1_MAT3</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
2624
<groupe>StdMat_ENV1</groupe>
2725
<groupe>StdMat_ENV1_MAT1</groupe>
2826
<groupe>StdMat_ENV1_MAT2</groupe>

‎arcane/ceapart/tests/testMaterial-3-opt7.arc

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV1_MAT3</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
2624
<groupe>StdMat_ENV1</groupe>
2725
<groupe>StdMat_ENV1_MAT1</groupe>
2826
<groupe>StdMat_ENV1_MAT2</groupe>

‎arcane/ceapart/tests/testMaterial-3.arc

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV1_MAT3</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
2624
<groupe>StdMat_ENV1</groupe>
2725
<groupe>StdMat_ENV1_MAT1</groupe>
2826
<groupe>StdMat_ENV1_MAT2</groupe>

‎arcane/ceapart/tests/testMaterial-checkpoint-recreate.arc

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
<variable>Density_ENV1_MAT2</variable>
2323
<variable>Density_ENV2_MAT2</variable>
2424
<variable>Pressure</variable>
25-
<variable>StdMat_CellNbEnvironment</variable>
26-
<variable>StdMat_CellNbMaterial_ENV1</variable>
27-
<variable>StdMat_CellNbMaterial_ENV2</variable>
28-
<variable>StdMat_CellNbMaterial_ENV3</variable>
2925
<groupe>StdMat_ENV1</groupe>
3026
<groupe>StdMat_ENV2</groupe>
3127
<groupe>StdMat_ENV3</groupe>

‎arcane/ceapart/tests/testMaterial-checkpoint.arc

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
<variable>Density_ENV1_MAT2</variable>
2323
<variable>Density_ENV2_MAT2</variable>
2424
<variable>Pressure</variable>
25-
<variable>StdMat_CellNbEnvironment</variable>
26-
<variable>StdMat_CellNbMaterial_ENV1</variable>
27-
<variable>StdMat_CellNbMaterial_ENV2</variable>
28-
<variable>StdMat_CellNbMaterial_ENV3</variable>
2925
<groupe>StdMat_ENV1</groupe>
3026
<groupe>StdMat_ENV2</groupe>
3127
<groupe>StdMat_ENV3</groupe>

‎arcane/ceapart/tests/testMaterial-eos-cs.arc

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<variable>Density_ENV1_MAT2</variable>
2222
<variable>Density_ENV2_MAT2</variable>
2323
<variable>Pressure</variable>
24-
<variable>StdMat_CellNbEnvironment</variable>
25-
<variable>StdMat_CellNbMaterial_ENV1</variable>
26-
<variable>StdMat_CellNbMaterial_ENV2</variable>
27-
<variable>StdMat_CellNbMaterial_ENV3</variable>
2824
<groupe>StdMat_ENV1</groupe>
2925
<groupe>StdMat_ENV2</groupe>
3026
<groupe>StdMat_ENV3</groupe>

0 commit comments

Comments
 (0)