diff --git a/geometry/estia_guides.i b/geometry/estia_guides.i index d0b87a6..6ab2263 100644 --- a/geometry/estia_guides.i +++ b/geometry/estia_guides.i @@ -53,7 +53,7 @@ c concrete floor c ceiling outside 8002 49 0.074981 ( 72 -8101 8207 8203 8201 8202) c left outer wall (E01) -8003 49 0.074981 ( 72 -8100 8201 -8205 59 -8207 3) +8003 4 -1.2E-3 ( 72 -8100 8201 -8205 59 -8207 3) c Selene 1/2 separator 8004 200 -3.9 (8100 -8101 8201 8202 59 -8207 3) #(8100 -8101 -8221 -8222 -8223 -8224) @@ -69,12 +69,13 @@ c air #(-8121 -8931) #707 #710 c B4C concrete inner layers -8011 16 -2.4 (8211 8215 -8213 -8214 72 -8100 3) +8011 4 -1.2E-3 (8211 8215 -8213 -8214 72 -8100 3) 8012 16 -2.4 (8205 8202 8213 -8218 72 -8100 3) -8013 16 -2.4 (8212 -8216 -8213 -8214 8111 -8100 3) +8013 4 -1.2E-3 ((-8216 8111 -8100):(72 -8111 18202)) + 8212 -8213 -8214 3 8014 16 -2.4 (8202 -8206 8217 -8213 -8214 8111 -8100 3) c Steel middle layers -8020 71 0.0843223 (8212 8202 -8213 -8214 72 -8111 3) +8020 71 0.0843223 (-18202 8202 -8213 -8214 72 -8111 3) 8021 71 0.0843223 (-8215 8205 -8213 -8214 72 -8100 3) 8022 71 0.0843223 (8205 8202 8218 -8207 72 -8100 3) 8023 71 0.0843223 (8216 8202 (-8217:8206) -8213 -8214 8111 -8100 3) diff --git a/geometry/estia_surfaces.i b/geometry/estia_surfaces.i index 4c695ab..3e43c47 100644 --- a/geometry/estia_surfaces.i +++ b/geometry/estia_surfaces.i @@ -505,8 +505,8 @@ c Wedge -1080.498 -3.724 769.345 -1083.823 -3.525 c ----------- Ouside Bunker -------------- c Wall radii -8100 cz 2102.01 -8101 cz 2187.17 +8100 cz 2112.01 +8101 cz 2157.17 c 8102 cz 3023.41 8103 cz 1355.64 8104 cz 2075.58 @@ -522,6 +522,7 @@ c Shielding wall geometry c first section outside 8201 p 0.813101 0.582123 0.000000 -148.964 8202 p -0.776046 -0.630676 0.000000 1.917 +18202 p -0.776046 -0.630676 0.000000 16.917 8203 p 0.000000 0.000000 -1.000000 -166.400 8204 pz -200.000 c steel/concrete interface