diff --git a/geometry/estia_inbunker.i b/geometry/estia_inbunker.i index 201aebc..ed54101 100644 --- a/geometry/estia_inbunker.i +++ b/geometry/estia_inbunker.i @@ -119,19 +119,19 @@ c NFGA beam bottom 203016 0 203105 -203106 -203302 -203326 -203501 -203502 203017 0 203106 -203107 -203302 -203327 -203501 -203502 c NFGA outside -203021 5 0.0582256 203100 -203101 -203503 -203504 203201 #(-203301 +203021 603 -2.71 203100 -203101 -203503 -203504 203201 #(-203301 #(203311 203321) -203501 -203502) -203022 5 0.0582256 203101 -203102 -203503 -203504 203202 #(-203302 +203022 603 -2.71 203101 -203102 -203503 -203504 203202 #(-203302 #(203312 203322) -203501 -203502) -203023 5 0.0582256 203102 -203103 -203503 -203504 203202 #(-203302 +203023 603 -2.71 203102 -203103 -203503 -203504 203202 #(-203302 #(203313 203323) -203501 -203502) -203024 5 0.0582256 203103 -203104 -203503 -203504 203202 #(-203302 +203024 603 -2.71 203103 -203104 -203503 -203504 203202 #(-203302 #(203314 203324) -203501 -203502) -203025 5 0.0582256 203104 -203105 -203503 -203504 203202 #(-203302 +203025 603 -2.71 203104 -203105 -203503 -203504 203202 #(-203302 #(203315 203325) -203501 -203502) -203026 5 0.0582256 203105 -203106 -203503 -203504 203202 #(-203302 +203026 603 -2.71 203105 -203106 -203503 -203504 203202 #(-203302 #(203316 203326) -203501 -203502) -203027 5 0.0582256 203106 -203107 -203503 -203504 203202 #(-203302 +203027 603 -2.71 203106 -203107 -203503 -203504 203202 #(-203302 #(203317 203327) -203501 -203502) c NFSA Vaccum tank and connection to collimator 203122 0 ((((203112 -203131 -203522) :(203131 -204805 @@ -139,21 +139,21 @@ c NFSA Vaccum tank and connection to collimator -203107 203202 -203504 -203503))) :(-203434 -203404 -203541) :(-203435 -203326 -203541) :(-203436 -203326 -203541)) #203611 #100702 #203151 100003 -203123 5 0.0582256 ((203110 -203111 203522 -203521) :(203110 -203112 +203123 603 -2.71 ((203110 -203111 203522 -203521) :(203110 -203112 -203521) :(203113 -203111 203532 -203521) :(203111 -203601 203532 -203531)) 100003 #(-203431 -203326) #(-203432 -203326) #(-203433 -203326) 203124 0 203446 203541 203437 -203440 -203326 #203131 #203134 203125 0 203446 203541 203438 -203441 -203326 #203132 #203135 203126 0 203446 203541 203439 -203442 -203326 #203133 #203136 -203131 5 0.0582256 203434 -203431 203522 203443 -203326 -203132 5 0.0582256 203435 -203432 203522 203443 -203326 -203133 5 0.0582256 203436 -203433 203522 203443 -203326 -203134 71 0.0843223 ((-203431 203446 -203443) :(-203440 203444 -203443) +203131 603 -2.71 203434 -203431 203522 203443 -203326 +203132 603 -2.71 203435 -203432 203522 203443 -203326 +203133 603 -2.71 203436 -203433 203522 203443 -203326 +203134 604 -7.90 ((-203431 203446 -203443) :(-203440 203444 -203443) :(-203440 203446 -203445)) 203434 -203135 71 0.0843223 ((-203432 203446 -203443) :(-203441 203444 -203443) +203135 604 -7.90 ((-203432 203446 -203443) :(-203441 203444 -203443) :(-203441 203446 -203445)) 203435 -203136 71 0.0843223 ((-203433 203446 -203443) :(-203442 203444 -203443) +203136 604 -7.90 ((-203433 203446 -203443) :(-203442 203444 -203443) :(-203442 203446 -203445)) 203436 203137 49 0.074981 203421 203422 -203423 203424 203425 203426 c B-Al plate @@ -162,38 +162,29 @@ c MirroBor outside vessel 203142 17 -1.36 203110 -203111 203521 -203541 100003 #(-203431 -203326) #(-203432 -203326) #(-203433 -203326) c NFSA Guide support -203151 5 0.0582256 (203120 -203121 (203401 203402 203403 203404 100003) +203151 603 -2.71 (203120 -203121 (203401 203402 203403 203404 100003) #(203411 203412 -203413 203414)) :(203446 -203404 -203437) :(203446 -201000 -203438) :(203446 -201000 -203439) c remote handling flange, aluminum plates and stainless steel bellow 203601 603 -2.710 203601 -203602 203611 -203612 203613 -203614 203621 -c imp:n,p=1 VOL=719.96 + VOL=719.96 203602 4 -1.2E-3 203602 -203603 203611 -203612 203613 -203614 203621 - 203631 203632 203633 203634 $ imp:n,p=1 + 203631 203632 203633 203634 203603 603 -2.710 203603 -203604 203611 -203612 203613 -203614 203621 -c imp:n,p=1 VOL=1439.93 + VOL=1439.93 203604 4 -1.2E-3 203604 -203605 203611 -203612 203613 -203614 203621 - 203631 203632 203633 203634 $ imp:n,p=1 + 203631 203632 203633 203634 203605 603 -2.710 203605 -203606 203611 -203612 203613 -203614 203621 -c imp:n,p=1 VOL=719.96 -203611 604 -7.9 203601 -204805 203622 -203621 -c imp:n,p=1 VOL=3328.5 -203621 603 -2.710 203602 -203603 -203631 -c imp:n,p=1 VOL=17.92 -203622 603 -2.710 203602 -203603 -203632 -c imp:n,p=1 VOL=17.92 -203623 603 -2.710 203602 -203603 -203633 -c imp:n,p=1 VOL=17.92 -203624 603 -2.710 203602 -203603 -203634 -c imp:n,p=1 VOL=17.92 -203625 603 -2.710 203604 -203605 -203631 -c imp:n,p=1 VOL=51.05 -203626 603 -2.710 203604 -203605 -203632 -c imp:n,p=1 VOL=51.05 -203627 603 -2.710 203604 -203605 -203633 -c imp:n,p=1 VOL=51.05 -203628 603 -2.710 203604 -203605 -203634 -c imp:n,p=1 VOL=51.05 + VOL=719.96 +203611 604 -7.9 203601 -204805 203622 -203621 VOL=3328.5 +203621 603 -2.710 203602 -203603 -203631 VOL=17.92 +203622 603 -2.710 203602 -203603 -203632 VOL=17.92 +203623 603 -2.710 203602 -203603 -203633 VOL=17.92 +203624 603 -2.710 203602 -203603 -203634 VOL=17.92 +203625 603 -2.710 203604 -203605 -203631 VOL=51.05 +203626 603 -2.710 203604 -203605 -203632 VOL=51.05 +203627 603 -2.710 203604 -203605 -203633 VOL=51.05 +203628 603 -2.710 203604 -203605 -203634 VOL=51.05 c Chopper Virtual Source Collimation System (CVCS) 204001 4 -1.2E-3 (100066 -204615 222001 -100068 223001 -100353) #204542 204002 4 -1.2E-3 (100066 -204615 222001 -100068 100342 -223107) #204502 @@ -262,32 +253,32 @@ c Concrete base (5% B4C) 204107 16 -2.4 221003 -221005 222001 -222004 -223006 223002 204108 16 -2.4 221003 -221005 222004 -222005 -223007 223002 c Vaccum Tank (aluminum) -204201 5 0.0582256 222001 -222101 226101 -226102 -204202 5 0.0582256 222101 -222102 226103 -226102 -204203 5 0.0582256 222102 -222104 226103 -226104 -204204 5 0.0582256 225106 222106 -222107 226105 -226106 -204205 5 0.0582256 222107 -222108 226105 -226108 -204206 5 0.0582256 222108 -206305 226107 -226108 -204207 5 0.0582256 221002 -221101 -225001 -204208 5 0.0582256 221101 -221003 225101 -225001 -204209 5 0.0582256 221003 -221102 222005 -222105 -223003 223106 225101 -204210 5 0.0582256 221003 -221102 222105 -225107 -223003 223106 225101 -204211 5 0.0582256 221102 -221107 222005 -222104 -223003 223106 226104 -204212 5 0.0582256 221102 -221107 222104 -222105 -223003 223102 -204213 5 0.0582256 221102 -221107 222104 -222105 -223105 223106 -204214 5 0.0582256 221102 -221107 222105 225106 -225107 226106 -204215 5 0.0582256 221107 -221105 222103 -222104 -223101 223107 226104 -204216 5 0.0582256 221107 -221105 222104 -222105 -223101 223102 -204217 5 0.0582256 221107 -221105 222104 -222105 -223105 223107 -204218 5 0.0582256 221107 -221105 222105 225106 -225108 226106 -204219 5 0.0582256 221105 -221106 222103 -222105 -223101 223107 225103 +204201 603 -2.71 222001 -222101 226101 -226102 +204202 603 -2.71 222101 -222102 226103 -226102 +204203 603 -2.71 222102 -222104 226103 -226104 +204204 603 -2.71 225106 222106 -222107 226105 -226106 +204205 603 -2.71 222107 -222108 226105 -226108 +204206 603 -2.71 222108 -206305 226107 -226108 +204207 603 -2.71 221002 -221101 -225001 +204208 603 -2.71 221101 -221003 225101 -225001 +204209 603 -2.71 221003 -221102 222005 -222105 -223003 223106 225101 +204210 603 -2.71 221003 -221102 222105 -225107 -223003 223106 225101 +204211 603 -2.71 221102 -221107 222005 -222104 -223003 223106 226104 +204212 603 -2.71 221102 -221107 222104 -222105 -223003 223102 +204213 603 -2.71 221102 -221107 222104 -222105 -223105 223106 +204214 603 -2.71 221102 -221107 222105 225106 -225107 226106 +204215 603 -2.71 221107 -221105 222103 -222104 -223101 223107 226104 +204216 603 -2.71 221107 -221105 222104 -222105 -223101 223102 +204217 603 -2.71 221107 -221105 222104 -222105 -223105 223107 +204218 603 -2.71 221107 -221105 222105 225106 -225108 226106 +204219 603 -2.71 221105 -221106 222103 -222105 -223101 223107 225103 #(222110 -223108 223109) -204220 5 0.0582256 221105 -221106 222105 222105 -225108 #(-222111 +204220 603 -2.71 221105 -221106 222105 222105 -225108 #(-222111 -223108 223109) -204221 5 0.0582256 221106 -221109 -225102 225105 -204222 5 0.0582256 221302 -221106 -225104 225105 -204223 5 0.0582256 221110 -221302 -225104 -204224 5 0.0582256 221106 -221108 224101 -222113 -223110 223111 +204221 603 -2.71 221106 -221109 -225102 225105 +204222 603 -2.71 221302 -221106 -225104 225105 +204223 603 -2.71 221110 -221302 -225104 +204224 603 -2.71 221106 -221108 224101 -222113 -223110 223111 #(-221111 224102 -222112 -223112 223113) c CPC1 204301 14 -8.92 222202 -222207 -226103 #(224201 224202 224203 224204) @@ -317,16 +308,16 @@ c Absorbers 204404 17 -1.36 221303 -221304 -225105 225303 c Additional components c Guiding rods for chopper -204501 5 0.0582256 221003 -221411 -225411 -204502 5 0.0582256 221003 -221412 -225412 +204501 603 -2.71 221003 -221411 -225411 +204502 603 -2.71 221003 -221412 -225412 c VS carry rods -204511 5 0.0582256 205601 -221105 -225421 -204512 5 0.0582256 205601 -221105 -225422 -204513 5 0.0582256 205601 -221105 -225423 -c chopper disk (aluminum 5 0.0582256) -204521 5 0.0582256 -204621 204622 -204623 VOL=3848.5 +204511 603 -2.71 205601 -221105 -225421 +204512 603 -2.71 205601 -221105 -225422 +204513 603 -2.71 205601 -221105 -225423 +c chopper disk (aluminum 5083) +204521 602 -2.66 -204621 204622 -204623 VOL=3848.5 c chopper spindle -204531 3 0.0876276 222106 204631 -204632 -204604 VOL=10104 +204531 607 -7.5 222106 204631 -204632 -204604 VOL=10104 c Steel support and lifting structure 204541 54 0.0833854 221003 -221402 -225401 204542 54 0.0833854 221401 -221402 222401 -222402 -223401 223001 @@ -340,24 +331,24 @@ c boral part top and bottom 204602 10 -2.7 205604 -205603 (205612:(205613 205616):(205614 205615) :(205614 205616):(-205614 -205618):(-205616 205617)) -205611 c lead part -204603 13 -11.34 205603 -205602 (205612 :(205613 205616):(205614 205615) +204603 606 -11.342 205603 -205602 (205612 :(205613 205616):(205614 205615) :(205614 205616) :(-205614 -205618):(-205616 205617)) -205611 c VS holder stands -204701 5 0.0582256 -205701 205704 -221514 -204702 5 0.0582256 -205702 205704 -221503 +204701 603 -2.71 -205701 205704 -221514 +204702 603 -2.71 -205702 205704 -221503 c simplified model of stages (hollow cylinders) c x-stages -204711 5 0.0582256 205732 -205731 -205711 #(205742 -205741 -205721) +204711 608 -3.207 205732 -205731 -205711 #(205742 -205741 -205721) VOL=479.5 -204712 5 0.0582256 205732 -205731 -205712 #(205742 -205741 -205722) +204712 608 -3.207 205732 -205731 -205712 #(205742 -205741 -205722) VOL=479.5 c z-stages -204721 5 0.0582256 205733 -205732 -205713 #(205744 -205743 -205723) +204721 608 -3.207 205733 -205732 -205713 #(205744 -205743 -205723) VOL=913 -204722 5 0.0582256 205733 -205732 -205714 #(205744 -205743 -205724) +204722 608 -3.207 205733 -205732 -205714 #(205744 -205743 -205724) VOL=913 c omega-stage -204731 5 0.0582256 205734 -205733 -205715 #(205746 -205745 -205725) +204731 608 -3.207 205734 -205733 -205715 #(205746 -205745 -205725) VOL=1734 c B4C blades and GGG absorbers 204751 20 -2.3 ((-224501 -221501 221502) :(-224502 -221502 221503)) diff --git a/geometry/estia_universes.i b/geometry/estia_universes.i index 694bcfb..32b40b7 100644 --- a/geometry/estia_universes.i +++ b/geometry/estia_universes.i @@ -111,13 +111,13 @@ c Remote handling flange with local coordinate system, c has to be moved and rotated when filling universe and includes c surrounding air and internal vacuum tube. 500000 0 -500011 U=50 $ in vacuum -500001 5 0.0582256 500011 -500012 U=50 $ vacuum tube +500001 604 -7.90 500011 -500012 U=50 $ vacuum tube 500002 4 -1.2E-3 -500001 500012 500021 -500022 500023 -500024 U=50 -500003 54 0.0833854 500001 -500002 500012 500021 -500022 500023 -500024 U=50 +500003 603 -2.71 500001 -500002 500012 500021 -500022 500023 -500024 U=50 500004 4 -1.2E-3 500002 -500003 500013 500021 -500022 500023 -500024 U=50 -500005 54 0.0833854 500003 -500004 500012 500021 -500022 500023 -500024 U=50 +500005 603 -2.71 500003 -500004 500012 500021 -500022 500023 -500024 U=50 500006 4 -1.2E-3 500004 -500005 500012 500021 -500022 500023 -500024 U=50 -500007 54 0.0833854 500005 -500006 500012 500021 -500022 500023 -500024 U=50 +500007 603 -2.71 500005 -500006 500012 500021 -500022 500023 -500024 U=50 500008 4 -1.2E-3 500006 500012 500021 -500022 500023 -500024 U=50 -500009 54 0.0833854 500002 -500003 500012 -500013 U=50 +500009 603 -2.71 500002 -500003 500012 -500013 U=50 500010 4 -1.2E-3 (-500021:500022:-500023:500024) U=50