Skip to content

Commit 681d24c

Browse files
rvignolorvignolo
committed
+ reference burnup
1 parent eff0193 commit 681d24c

File tree

15 files changed

+1154
-18
lines changed

15 files changed

+1154
-18
lines changed

‎.hgignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
syntax: glob
22

3+
*WLUP
34
*.result
45
*.ps
56
*.m

‎1.materials/1.macroscopic/clean.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22

33
# si falló
44
rm -f _*
5+
rm -f *.o2m *.l2m
6+
rm -f *.ps
7+
rm -f Lines
8+
rm -f *.m
9+
rm -f *.sur
510
# y el resultado no lo elimino
611
# rm -f *.result

‎1.materials/1.macroscopic/run.sh

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,24 @@
66
# Grupo Argentino de Cálculo y Análisis de Reactores
77
# III Reunión Anual
88
#
9-
# File desc.: run macroscopic XS reading with DRAGON
9+
# File desc.: Macroscopic XS reading with DRAGON
1010
# Ramiro Vignolo <[email protected]>
1111
# <[email protected]>
1212
#------------+--------------+-------+------+-----++----+++---++++--+++++
1313

1414
# clean directory
1515
./clean.sh
1616

17+
# add any option
18+
plot=0
19+
for opt in $*; do
20+
case $opt in
21+
-g)
22+
plot=1
23+
;;
24+
esac
25+
done
26+
1727
# lets find the dragon input
1828
input=`ls -la | grep *.x2m | awk '{print $9}'`
1929

@@ -24,6 +34,14 @@ output=${output}.result
2434
# if dragon is seen globally
2535
dragon <${input} > ${output}
2636

27-
# y te imprimo un poquito asi ves
37+
# te imprimo un poquito asi ves
2838
tail -5 ${output}; tput setaf 3; echo " check out the ${output} file"; tput sgr0
2939
echo
40+
41+
# en este caso, dibujamos
42+
if [ $plot = 1 ]; then
43+
tput setaf 4; echo "GhostView Graphics are on"; tput sgr0
44+
for i in *.ps; do
45+
gv $i &
46+
done
47+
fi

‎3.CalcFlux/1.flux-dist/clean.sh renamed to ‎3.flux-calculation/1.flux-dist/clean.sh

File renamed without changes.

‎3.CalcFlux/1.flux-dist/pins_flux.x2m renamed to ‎3.flux-calculation/1.flux-dist/pins_flux.x2m

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Grupo Argentino de Cálculo y Análisis de Reactores
55
* III Reunión Anual
66
*
7-
* File desc.: Geometry definition and Ray tracing
7+
* File desc.: Flux calculation
88
* Ramiro Vignolo <[email protected]>
99
* <[email protected]>
1010
*------------+--------------+-------+------+-----++----+++---++++--+++++
@@ -163,27 +163,16 @@ Geom_G3 := GEO: :: CAR2D 4 4
163163
NPIN 1 RPIN 0.0 APIN 0.785398163397 ;
164164
;
165165
;
166+
*------------+--------------+-------+------+-----++----+++---++++--+++++
167+
*
168+
*------------+--------------+-------+------+-----++----+++---++++--+++++
169+
* TRACKING (uncomment in order to plot the ray tracing tracks)
166170
*
167-
*----
168-
* Geometries representations
169-
*----
170171
Surfil GeoMix_G1 := G2S: Geom_G1 ::
171172
DRAWMIX
172173
! DRAWNOD
173174
;
174175
*
175-
GeoMix_G2 := PSP: Geom_G2 ::
176-
TYPE MIXTURE
177-
;
178-
*
179-
GeoMix_G3 := PSP: Geom_G3 ::
180-
TYPE MIXTURE
181-
;
182-
*------------+--------------+-------+------+-----++----+++---++++--+++++
183-
*
184-
*------------+--------------+-------+------+-----++----+++---++++--+++++
185-
* TRACKING (uncomment in order to plot the ray tracing tracks)
186-
*
187176
Track Lines := SALT: Surfil ::
188177
EDIT 2
189178
TSPC 8 10.0
@@ -236,6 +225,10 @@ Lines Track := NXT: Geom_G2 ::
236225
TISO 24 40.0
237226
LONG
238227
;
228+
*
229+
GeoMix_G2 := PSP: Track ::
230+
TYPE MIXTURE
231+
;
239232
*------------+--------------+-------+------+-----++----+++---++++--+++++
240233
*
241234
*------------+--------------+-------+------+-----++----+++---++++--+++++
@@ -272,6 +265,10 @@ Lines Track := NXT: Geom_G3 ::
272265
TISO 24 40.0
273266
LONG
274267
;
268+
*
269+
GeoMix_G3 := PSP: Track ::
270+
TYPE MIXTURE
271+
;
275272
*------------+--------------+-------+------+-----++----+++---++++--+++++
276273
*
277274
*------------+--------------+-------+------+-----++----+++---++++--+++++

‎3.CalcFlux/1.flux-dist/run.sh renamed to ‎3.flux-calculation/1.flux-dist/run.sh

File renamed without changes.

‎4.burnup/1.reference-burnup/CalcFlux.c2m

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
*------------+--------------+-------+------+-----++----+++---++++--+++++
2+
* DECK CalcFlux
3+
*
4+
* Name : CalcFlux.c2m
5+
* Type : DRAGON procedure
6+
* Use : Flux calculation
7+
* Authors : R. Vignolo
8+
*
9+
* Procedure called as:
10+
*
11+
* MicLib_S Flux := CalcFlux MicLib ExcTrack_S Lines_S
12+
* ExcTrack_T Lines_T ::
13+
* <<burn_step>>
14+
* <<bu_f>> <<next_bu_SS>>
15+
* <<grmin>> <<grmax>>
16+
* >>Kinf<<
17+
* ;
18+
*
19+
* Input data :
20+
* MicLib_S :
21+
* Flux :
22+
* MicLib :
23+
* ExcTrack_S:
24+
* Lines_S :
25+
* ExcTrack_T:
26+
* Lines_T :
27+
* burn_step :
28+
* bu_f :
29+
* next_bu_SS:
30+
* grmin :
31+
* grmax :
32+
*
33+
* Output data:
34+
* MicLib_S:
35+
* Flux :
36+
* Kinf :
37+
*------------+--------------+-------+------+-----++----+++---++++--+++++
38+
*
39+
PARAMETER MicLib_S Flux MicLib ExcTrack_S Lines_S ExcTrack_T Lines_T ::
40+
EDIT 0
41+
::: LINKED_LIST MicLib_S Flux MicLib ExcTrack_S ExcTrack_T ;
42+
::: SEQ_BINARY Lines_S Lines_T ;
43+
;
44+
*
45+
* Modules used in this procedure
46+
MODULE
47+
USS: ASM: FLU: GREP: DELETE: END: ;
48+
*
49+
LINKED_LIST Pij ;
50+
*
51+
*------------+--------------+-------+------+-----++----+++---++++--+++++
52+
* INPUT DATA RECOVERY
53+
*
54+
INTEGER burn_step ;
55+
:: >>burn_step<< ;
56+
REAL bu_f next_bu_SS ;
57+
:: >>bu_f<< >>next_bu_SS<< ;
58+
INTEGER grmin grmax ;
59+
:: >>grmin<< >>grmax<< ;
60+
*
61+
*------------+--------------+-------+------+-----++----+++---++++--+++++
62+
* OUTPUT DATA
63+
REAL Kinf ;
64+
*
65+
*------------+--------------+-------+------+-----++----+++---++++--+++++
66+
* FLUX CALCULATION
67+
*
68+
IF bu_f next_bu_SS - ABS 1E-5 < THEN
69+
*----
70+
* Self-Shielding
71+
*----
72+
ECHO 'Self-shielding calculation at burnup =' bu_f ;
73+
IF burn_step 1 = THEN
74+
MicLib_S := USS: MicLib ExcTrack_S Lines_S ::
75+
EDIT 0
76+
GRMIN <<grmin>>
77+
GRMAX <<grmax>>
78+
PASS 2 (*default*)
79+
TRAN (*default*)
80+
;
81+
ELSE
82+
MicLib_S := USS: MicLib MicLib_S ExcTrack_S Lines_S ::
83+
EDIT 0
84+
GRMIN <<grmin>>
85+
GRMAX <<grmax>>
86+
PASS 2 (*default*)
87+
TRAN (*default*)
88+
;
89+
ENDIF ;
90+
ELSE
91+
ECHO 'No self-shielding calculation at burnup =' bu_f ;
92+
ENDIF ;
93+
*
94+
Pij := ASM: MicLib_S ExcTrack_T Lines_T ::
95+
EDIT 0
96+
PIJ (*default*)
97+
PNOR HELI (*default*)
98+
;
99+
*
100+
IF burn_step 1 = THEN
101+
Flux := FLU: Pij MicLib_S ExcTrack_T ::
102+
EDIT 0
103+
TYPE B B1 BUCK 0.0
104+
;
105+
ELSE
106+
Flux := FLU: Flux Pij MicLib_S ExcTrack_T ::
107+
EDIT 0
108+
TYPE B B1 BUCK 0.0
109+
;
110+
ENDIF ;
111+
*
112+
GREP: Flux :: GETVAL 'K-INFINITY ' 1 1 1 >>Kinf<< ;
113+
*
114+
Pij := DELETE: Pij ;
115+
*
116+
*------------+--------------+-------+------+-----++----+++---++++--+++++
117+
:: <<Kinf>> ;
118+
*
119+
END: ;
120+
QUIT .

‎4.burnup/1.reference-burnup/DefGeos.c2m

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
*------------+--------------+-------+------+-----++----+++---++++--+++++
2+
* DECK DefGeos
3+
*
4+
* Name : DefGeos.c2m
5+
* Type : DRAGON procedure
6+
* Use : Geometries definitions
7+
* Authors : R. Vignolo
8+
*
9+
* Procedure called as:
10+
*
11+
* GlobalGeo_S GlobalGeo_T := DefGeos ::
12+
* <<hex_side>> <<r_mesh1>> <<r_mesh2>> <<r_mesh3>> <<r_mesh4>>
13+
* <<r_mesh5>> <<r_mesh6>> <<r_tubo>> <<r_gap>> <<r_foil>>
14+
* <<r_mod>> <<r_in_mod>> <<r_fuel1>> <<r_fuel2>> <<r_fuel3>>
15+
* <<r_fuel4>> <<r_cladd>> <<nmix_cool>> <<nmix_tubo>> <<nmix_gap>>
16+
* <<nmix_foil>> <<nmix_mod>> <<nmix_fuel1>> <<nmix_fuel2>>
17+
* <<nmix_fuel3>> <<nmix_fuel4>> <<nmix_clad>>
18+
* ;
19+
*
20+
*------------+--------------+-------+------+-----++----+++---++++--+++++
21+
*
22+
PARAMETER GlobalGeo_S GlobalGeo_T ::
23+
EDIT 0
24+
::: LINKED_LIST GlobalGeo_S GlobalGeo_T ;
25+
;
26+
*
27+
* Modules used in this procedure
28+
MODULE
29+
GEO: END: ;
30+
*
31+
*------------+--------------+-------+------+-----++----+++---++++--+++++
32+
* INPUT DATA RECOVERY
33+
*
34+
REAL hex_side r_mesh1 r_mesh2 r_mesh3 r_mesh4
35+
r_mesh5 r_mesh6 r_tubo r_gap r_foil
36+
r_mod r_in_mod r_fuel1 r_fuel2 r_fuel3
37+
r_fuel4 r_cladd ;
38+
:: >>hex_side<< >>r_mesh1<< >>r_mesh2<< >>r_mesh3<< >>r_mesh4<<
39+
>>r_mesh5<< >>r_mesh6<< >>r_tubo<< >>r_gap<< >>r_foil<<
40+
>>r_mod<< >>r_in_mod<< >>r_fuel1<< >>r_fuel2<< >>r_fuel3<<
41+
>>r_fuel4<< >>r_cladd<< ;
42+
INTEGER nmix_cool nmix_tubo nmix_gap
43+
nmix_foil nmix_mod nmix_fuel1
44+
nmix_fuel2 nmix_fuel3 nmix_fuel4 nmix_clad ;
45+
:: >>nmix_cool<< >>nmix_tubo<< >>nmix_gap<<
46+
>>nmix_foil<< >>nmix_mod<< >>nmix_fuel1<<
47+
>>nmix_fuel2<< >>nmix_fuel3<< >>nmix_fuel4<< >>nmix_clad<< ;
48+
*
49+
*------------+--------------+-------+------+-----++----+++---++++--+++++
50+
*
51+
REAL pi := 3.14159265358979323846 ;
52+
REAL pi_12 := pi 12.0 / ;
53+
*
54+
*----
55+
* For Self-Shielding
56+
*----
57+
GlobalGeo_S := GEO: :: HEXCEL 5
58+
HBC COMPLETE REFL
59+
SIDE <<hex_side>>
60+
RADIUS 0.0000
61+
<<r_tubo>>
62+
<<r_gap>>
63+
<<r_foil>>
64+
<<r_mod>>
65+
<<r_in_mod>>
66+
MIX <<nmix_cool>> <<nmix_tubo>> <<nmix_gap>> <<nmix_foil>>
67+
<<nmix_mod>> <<nmix_mod>>
68+
CLUSTER CORONA_1 CORONA_2 CORONA_3 CORONA_4
69+
::: CORONA_1 := GEO: TUBE 5
70+
RADIUS 0.00000
71+
<<r_fuel1>>
72+
<<r_fuel2>>
73+
<<r_fuel3>>
74+
<<r_fuel4>>
75+
<<r_cladd>>
76+
MIX <<nmix_fuel1>> <<nmix_fuel2>> <<nmix_fuel3>> <<nmix_fuel4>>
77+
<<nmix_clad>>
78+
NPIN 1 RPIN 0.00000 APIN 0.000000 ;
79+
::: CORONA_2 := GEO: CORONA_1
80+
NPIN 6 RPIN <<r_mesh2>> APIN 0.000000 ;
81+
::: CORONA_3 := GEO: CORONA_1
82+
NPIN 12 RPIN <<r_mesh4>> APIN <<pi_12>> ;
83+
::: CORONA_4 := GEO: CORONA_1
84+
NPIN 18 RPIN <<r_mesh6>> APIN 0.000000 ;
85+
;
86+
*
87+
*----
88+
* For Transport
89+
*----
90+
GlobalGeo_T := GEO: :: HEXCEL 11
91+
HBC COMPLETE REFL
92+
SIDE <<hex_side>>
93+
RADIUS 0.00000
94+
<<r_mesh1>>
95+
<<r_mesh2>>
96+
<<r_mesh3>>
97+
<<r_mesh4>>
98+
<<r_mesh5>>
99+
<<r_mesh6>>
100+
<<r_tubo>>
101+
<<r_gap>>
102+
<<r_foil>>
103+
<<r_mod>>
104+
<<r_in_mod>>
105+
MIX <<nmix_cool>> <<nmix_cool>> <<nmix_cool>> <<nmix_cool>>
106+
<<nmix_cool>> <<nmix_cool>> <<nmix_cool>> <<nmix_tubo>>
107+
<<nmix_gap>> <<nmix_foil>> <<nmix_mod>> <<nmix_mod>>
108+
SPLITR 1 1 1 1 1 1 1 1 1 1 20
109+
CLUSTER CORONA_1 CORONA_2 CORONA_3 CORONA_4
110+
::: CORONA_1 := GEO: TUBE 5
111+
RADIUS 0.00000
112+
<<r_fuel1>>
113+
<<r_fuel2>>
114+
<<r_fuel3>>
115+
<<r_fuel4>>
116+
<<r_cladd>>
117+
MIX <<nmix_fuel1>> <<nmix_fuel2>> <<nmix_fuel3>> <<nmix_fuel4>>
118+
<<nmix_clad>>
119+
NPIN 1 RPIN 0.00000 APIN 0.000000 ;
120+
::: CORONA_2 := GEO: CORONA_1
121+
NPIN 6 RPIN <<r_mesh2>> APIN 0.000000 ;
122+
::: CORONA_3 := GEO: CORONA_1
123+
NPIN 12 RPIN <<r_mesh4>> APIN <<pi_12>> ;
124+
::: CORONA_4 := GEO: CORONA_1
125+
NPIN 18 RPIN <<r_mesh6>> APIN 0.000000 ;
126+
;
127+
*
128+
*------------+--------------+-------+------+-----++----+++---++++--+++++
129+
130+
END: ;
131+
QUIT .

0 commit comments

Comments
 (0)