Commit de9be7c4 authored by COULAUD Olivier's avatar COULAUD Olivier

Fix pb git following the modification of FComplexe in FComplex

parents fafa16dc 40f46768
# PerSize DOMAIN_SIZE ENERGY
-1 64 0.0288 4.35095270585633e+00
0 128 0.143855 2.95927632466761e+00
1 256 0.545394 4.29096123695206e+00
2 512 3.92982 4.62535195665754e+00
3 1024 28.8061 4.70904628870072e+00
4 2048 228.941 4.72997598521508e+00
5 4096 1314.65 4.73521031144200e+00
6 8192 14236.2 4.73650962794840e+00
7 16384 113172 4.73674022925353e+00
8 4
150 1 1 1 1
0.9590166326 0.6927990733 0.5182360346 -1
0.7161198397 0.2607128784 1.640176076 -0.9980292107
0.9854938091 0.7967025056 0.07305877421 -0.9167379968
0.02084676764 0.09200942821 1.357407891 -0.6467147149
0.1740285373 0.9821962177 0.7644510424 -0.2707955032
0.05829212567 0.9365569718 1.303283388 -0.8173387758
0.9801136065 0.6012162276 1.962671582 -0.8154047046
0.603373644 0.2572177202 0.5305557125 -0.02556555211
0.5089192192 0.1642761557 1.651094132 0.05350055952
0.8375839076 0.3045286116 0.5536019749 -0.09113315252
0.8470038557 0.3122012184 1.128834283 -0.5336431329
0.8763448565 0.4183177897 0.02547417716 0.662583576
0.666186643 0.8398242508 0.1144637199 0.863462964
0.05007303915 0.992619726 1.922753614 0.1361192256
0.7756336392 0.6661458305 1.367980411 0.1121886649
0.5877578516 0.0161473061 1.518177717 -0.8983361715
0.7319809375 0.422896607 1.88242924 0.5341023195
0.8126326527 0.175403127 0.0534107641 -0.962170393
0.4918432369 0.1034543619 1.356265752 -0.4952804761
0.891698348 0.02405845949 0.7296538424 -0.4036056533
0.4054420119 0.9020008297 1.269710065 0.7519617343
0.6147380691 0.6367088503 1.896533913 0.06311372925
0.9094292793 0.0735416368 1.617966709 0.8405218837
0.4898496041 0.3641239993 1.205415171 0.03086230268
0.853807936 0.6888833512 0.7688188868 0.6208589071
0.8855172052 0.5239427337 0.3439505561 -0.6231594991
0.7270486745 0.2763947709 0.9804408182 0.7726288878
0.5518013532 0.3861749875 0.7847816616 0.1412280387
0.9827931259 0.1265545138 1.466576303 -0.8464508702
0.7731742535 0.6447912455 1.997971711 0.6305477645
0.7032253406 0.3504142399 1.25454438 0.9697820352
0.5634492076 0.4871770474 1.479857545 -0.7632965813
0.1778067016 0.5092533117 1.476236728 0.7878118013
0.08735650069 0.5347611903 0.6154428965 0.5689672879
0.9250570411 0.08791390132 1.274093589 -0.7981674532
0.4802571714 0.8748320458 1.962385539 -0.4933787488
0.3747010388 0.6926434484 0.2030504614 -0.960316676
0.5517237602 0.04715431956 0.1192249113 -0.2432450516
0.5846945009 0.09459385796 1.299087484 0.3577548211
0.6618911676 0.7625448626 1.445596786 0.3618460767
0.18722885 0.6295552193 1.303788483 0.5054133223
0.4798955718 0.6171203632 1.400673826 -0.9875410932
0.8935593031 0.299202545 0.5041239606 0.24881343
0.6548842182 0.8029029897 1.26228169 -0.7470751313
0.6399394077 0.7138327604 0.0743908695 0.235099602
0.3959446384 0.4691878843 1.741067312 0.5418565249
0.583713624 0.05295174427 1.923624738 -0.6269283568
0.2606032065 0.4378379708 1.787787622 -0.006556603845
0.3269310738 0.3329774535 1.089232315 0.01900078347
0.9404024877 0.07333596819 1.200684043 -0.3681219944
0.4893014941 0.9703919373 1.115782108 0.4034051223
0.6887670352 0.6643049606 1.03945737 -0.2655067361
0.8951434464 0.8718348347 1.074044682 0.75262473
0.1509466203 0.9178113858 0.2477124167 -0.2580106703
0.4734307579 0.6866220633 1.962940145 0.05050479677
0.3359055523 0.8176377595 0.8978604091 -0.1443308837
0.1015384788 0.8489682508 1.044562458 0.08548635686
0.1970240119 0.826460846 0.05542251959 0.3359571794
0.2065150894 0.4189989186 1.691566493 -0.6577163408
0.6491119038 0.6780943722 1.629490672 0.6615582705
0.1417811874 0.3508868354 0.9754780323 0.7238107982
0.2399853229 0.3826565731 1.958909039 0.5384422783
0.2345790886 0.5009036752 1.332948433 -0.8948410806
0.1157670539 0.06126027295 0.5286125965 0.9334592821
0.9284573542 0.3251121772 1.939075528 -0.3314321717
0.9420841073 0.6686410369 0.5497810578 -0.8358069228
0.3583544684 0.8234678749 1.637899353 -0.4593707404
0.05901814605 0.09605593479 0.9145850212 -0.8514752594
0.803403256 0.1412163999 1.498470073 0.3524515254
0.4630372622 0.2353735279 1.659765268 0.6203171015
0.5185444426 0.5981853354 0.8054795567 -0.07157753564
0.1879612361 0.3956096133 0.3909830075 0.1383700961
0.2046912349 0.5913583232 1.853979567 0.02440604216
0.5627234837 0.5901727284 1.24738038 0.1730206639
0.3261644636 0.8056412437 1.406159262 0.4775170767
0.7438777595 0.04108868462 1.758624135 0.7433776286
0.8369101687 0.8122729964 1.988813765 0.1559346383
0.7208671534 0.2434357852 1.004460437 0.9294071729
0.7505132398 0.6866518763 1.41187218 -0.3329414058
0.2645419731 0.7159908236 0.9343912587 -0.2143440611
0.2856719236 0.5247972425 1.97674652 -0.6461445377
0.3339424421 0.5666709676 0.7339314981 -0.7762619539
0.6765963042 0.2722794369 0.3456659746 0.7053616755
0.0444675957 0.9220127965 1.913481328 0.6223436684
0.0052089825 0.2323789969 1.303256922 0.9097745637
0.9476380355 0.06657809198 0.4532079128 0.8085664049
0.4485981167 0.1456930039 1.007541659 -0.722169487
0.05878502016 0.1854474349 1.570102768 0.3723746875
0.5323249586 0.2460352199 0.08504943309 -0.7460251007
0.8185233352 0.7178938361 0.3289492026 -0.9918196017
0.7405355811 0.8357900896 0.01472839922 -0.9989944309
0.6228998525 0.7174912728 1.860145178 -0.6140961658
0.3410139339 0.4311810817 0.4919076203 0.1735602977
0.6064038188 0.3745081595 1.3725346 -0.2500816927
0.2381587465 0.7108504008 0.2269536782 -0.9464281178
0.231718207 0.5496341791 1.80215793 -0.07046941409
0.2593468178 0.6448160128 1.489266328 0.5706860802
0.7114730243 0.006648603485 0.08904766682 -0.1155303518
0.5105011651 0.2681156129 0.9418821577 -0.4241922308
0.6354482155 0.6375809121 0.097051693 0.7067059026
0.9926785186 0.8647591526 1.708218729 0.05194393898
0.2668629185 0.2137915804 0.587146225 0.4568334335
0.9126056997 0.8968028924 0.1932003224 -0.4673714101
0.2100896573 0.4594306746 1.122982144 0.5669680465
0.313178971 0.8428917772 0.2591732928 -0.06391163797
0.4535397759 0.6198391852 1.978001258 -0.6060052919
0.4446193289 0.6692670847 1.432958828 -0.1056460652
0.4378685438 0.8559972756 0.6243412316 0.4568795566
0.5228292753 0.7504764951 0.5520569259 0.9321860003
0.04354069762 0.9598168927 1.01735055 0.5136815613
0.7327954989 0.4263034948 1.918640982 -0.06788623248
0.8660999621 0.1374472104 0.1108715417 0.7379328855
0.1224216962 0.1562464486 0.554589985 -0.731921487
0.6190231052 0.8660970423 0.01820679537 0.6921051605
0.9654726325 0.3532815806 0.0606445836 -0.9638246755
0.2241845602 0.159498678 1.796586574 0.881709598
0.3292043505 0.8896314923 1.7642522 0.3401642362
0.02510750813 0.1165055852 1.069213825 0.5999430805
0.9666953338 0.6761462248 0.3428361183 -0.713566426
0.5814507981 0.2372690628 1.934127342 0.2209206229
0.3964383958 0.9166264115 0.8113813491 0.8165651148
0.3575091328 0.8355704757 1.865136605 0.5488294346
0.1110684448 0.8694191054 0.9517015608 -0.267870614
0.07901056689 0.4828645486 1.327866648 0.8885759601
0.1744827326 0.4906977565 1.841414458 0.76964335
0.271828178 0.371939652 0.1653288777 -0.1096578148
0.4493162176 0.4881546155 0.4012675463 -0.6739431086
0.09423904293 0.7257310933 0.4216899151 -0.1503654007
0.1996589551 0.1539348553 0.4033599845 -0.04029224027
0.03732808645 0.1973300774 1.560824856 -0.937743367
0.932867288 0.08520435027 0.9030409353 0.2168604379
0.8463347702 0.3887638127 1.031888548 0.5845223362
0.8480228557 0.9444161046 0.7276944762 -0.6350064308
0.4981778578 0.6823371164 0.2122764097 0.0502425945
0.6899836743 0.6238479432 0.4031045062 0.7975177021
0.7469520025 0.06870968819 0.002701764005 -0.3824202107
0.8995985015 0.6263977743 1.207274222 0.885251844
0.7004446424 0.3584809161 1.224382779 -0.2239507054
0.8422565008 0.8604575632 1.711352282 0.861024528
0.9842883615 0.6113792631 0.8661886103 0.8227683664
0.7373120885 0.2842283696 0.2655570885 -0.3245632988
0.1914482005 0.739813756 0.8965641375 0.06562464667
0.7698353631 0.6658552347 1.31854043 0.4041545412
0.3172959288 0.9198644125 0.1475067302 0.9420213151
0.4758657353 0.01451113373 1.242207595 0.5361703839
0.9941558597 0.7764548445 0.1269915055 0.5038825026
0.182050034 0.5377478816 1.89200944 -0.8182718265
0.185777063 0.8109742001 1.023271435 0.7079334481
0.5605614326 0.1915195988 1.550525077 -0.650711091
0.6447069123 0.9811270744 0.484031595 -0.9604592572
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
\documentclass{minimal}
\usepackage{tikz}
\usetikzlibrary{trees}
\begin{document}
% grow=down,
% every node/.style={draw, circle, thin},
% edge from parent/.style={-latex, thick, draw}
\begin{tikzpicture}
[level distance=4cm,
level 1/.style={sibling distance=5cm},
level 2/.style={sibling distance=1.4cm},
level 3/.style={sibling distance=0.4cm},
every node/.style={draw, circle, thin}
]
\node (P) {Root}
child {node (C1) {Q}
child {node (C1A) {T}
child {node (C1A1) {T}}
child {node (C1A2) {U}}
child {node (C1A2) {T}}
child {node (C1A4) {U}}
}
child {node (C1B) {U}
child {node (C1B1) {T}}
child {node (C1B2) {U}}
child {node (C1B2) {T}}
child {node (C1B4) {U}}
}
child {node (C1C) {T}}
child {node (C1D) {U}}
}
child {node (C2) {R}
child {node (C2A) {T}}
child {node (C2B) {U}}
child {node (C2C) {T}}
child {node (C2D) {U}}
}
child {node (C3) {S}}
% child {node (C4) {$C^1_4$}
child {node (C4) {$C^1_4$}
child {node (T) {}
child {node (TT) {}
child {node (TTT) {}
}
}
}
child {node (U) {}}
};
\path (P) -- coordinate[midway] (PQ) (C1);
\path (P) -- coordinate[midway] (PR) (C2);
\draw (PQ) to[bend right=22] (PR);
\end{tikzpicture}
%sibling distance=2cm,
\begin{tikzpicture}[level distance=1.5cm, grow=down,
every node/.style={draw, circle, thin},
edge from parent/.style={-latex, thick, draw},
level 1/.style={sibling distance=5cm},
level 2/.style={sibling distance=2cm},
level 3/.style={sibling distance=1.cm}
]
\node (P) {Root}
child {node [fill=blue] (C1) {}
child {node (T) {}
child { node (TTT) {}
child {node (TTTT) {}
child {node (TTTTT) {}
}
}
}
}
child {node (U) {}
child { node [fill=blue] (TTT) {}
child {node (TTTT) {}
child {node (TTTTT) {}
}
}
child {node [fill=blue] (TTTTU) {}
child {node (TTTTU1) {}}
child {node (TTTTU2) {}}
}
}
}
}
% child {node (C2) {}}
% child {node (C3) {}}
child {node [fill=blue, text=white] (C4) {$j$}
child {node (T) {}
child {node (TT) {}
child { node [fill=blue] (TTT) {}
child {node (TTTT) {}}
child {node (TTTU) {}}
}
}
}
child {node (U) {}}
};
\path (P) -- coordinate[midway] (PQ) (C1);
\path (P) -- coordinate[midway] (PR) (C2);
%\draw (PQ) to[bend right=22] (PR);
\end{tikzpicture}
\end{document}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg
width="600" height="480"
viewBox="0 0 600 480"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
>
<title>Gnuplot</title>
<desc>Produced by GNUPLOT 4.6 patchlevel 5 </desc>
<g id="gnuplot_canvas">
<rect x="0" y="0" width="600" height="480" fill="none"/>
<defs>
<circle id='gpDot' r='0.5' stroke-width='0.5'/>
<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
</defs>
<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
</g>
<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
<path stroke='black' d='M80.2,422.4 L89.2,422.4 M575.0,422.4 L566.0,422.4 '/> <g transform="translate(71.9,426.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
<text> 0</text>
</g>
<path stroke='black' d='M80.2,354.8 L89.2,354.8 M575.0,354.8 L566.0,354.8 '/> <g transform="translate(71.9,359.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
<text> 1000</text>
</g>
<path stroke='black' d='M80.2,287.2 L89.2,287.2 M575.0,287.2 L566.0,287.2 '/> <g transform="translate(71.9,291.7)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
<text> 2000</text>
</g>
<path stroke='black' d='M80.2,219.5 L89.2,219.5 M575.0,219.5 L566.0,219.5 '/> <g transform="translate(71.9,224.0)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
<text> 3000</text>
</g>
<path stroke='black' d='M80.2,151.9 L89.2,151.9 M575.0,151.9 L566.0,151.9 '/> <g transform="translate(71.9,156.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
<text> 4000</text>
</g>
<path stroke='black' d='M80.2,84.3 L89.2,84.3 M575.0,84.3 L566.0,84.3 '/> <g transform="translate(71.9,88.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
<text> 5000</text>
</g>
<path stroke='black' d='M80.2,16.7 L89.2,16.7 M575.0,16.7 L566.0,16.7 '/> <g transform="translate(71.9,21.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
<text> 6000</text>
</g>
<path stroke='black' d='M80.2,422.4 L80.2,413.4 M80.2,16.7 L80.2,25.7 '/> <g transform="translate(80.2,444.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
<text>-5</text>
</g>
<path stroke='black' d='M162.7,422.4 L162.7,413.4 M162.7,16.7 L162.7,25.7 '/> <g transform="translate(162.7,444.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
<text> 0</text>
</g>
<path stroke='black' d='M245.1,422.4 L245.1,413.4 M245.1,16.7 L245.1,25.7 '/> <g transform="translate(245.1,444.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
<text> 5</text>
</g>
<path stroke='black' d='M327.6,422.4 L327.6,413.4 M327.6,16.7 L327.6,25.7 '/> <g transform="translate(327.6,444.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
<text> 10</text>
</g>
<path stroke='black' d='M410.1,422.4 L410.1,413.4 M410.1,16.7 L410.1,25.7 '/> <g transform="translate(410.1,444.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
<text> 15</text>
</g>
<path stroke='black' d='M492.5,422.4 L492.5,413.4 M492.5,16.7 L492.5,25.7 '/> <g transform="translate(492.5,444.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
<text> 20</text>
</g>
<path stroke='black' d='M575.0,422.4 L575.0,413.4 M575.0,16.7 L575.0,25.7 '/> <g transform="translate(575.0,444.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
<text> 25</text>
</g>
</g>
<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
<path stroke='gray' stroke-dasharray=' 2,4' d='M162.7,422.4 L162.7,16.7 '/></g>
<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
<path stroke='black' d='M80.2,16.7 L80.2,422.4 L575.0,422.4 M575.0,16.7 M80.2,16.7 '/> <g transform="translate(17.6,219.6) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
<text>Number of leaves</text>
</g>
<g transform="translate(327.6,471.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
<text>Number of Particles</text>
</g>
</g>
<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
<g style = 'stroke:none; shape-rendering:crispEdges'>
<polygon fill = 'red' points = '179.6,422.4 180.5,422.4 180.5,391.3 179.6,391.3 '/>
<polygon fill = 'red' points = '196.1,422.4 197.0,422.4 197.0,329.7 196.1,329.7 '/>
<polygon fill = 'red' points = '212.6,422.4 213.5,422.4 213.5,235.2 212.6,235.2 '/>
<polygon fill = 'red' points = '229.1,422.4 230.0,422.4 230.0,132.2 229.1,132.2 '/>
<polygon fill = 'red' points = '245.5,422.4 246.5,422.4 246.5,69.5 245.5,69.5 '/>
<polygon fill = 'red' points = '262.0,422.4 263.0,422.4 263.0,71.6 262.0,71.6 '/>
<polygon fill = 'red' points = '278.5,422.4 279.5,422.4 279.5,117.4 278.5,117.4 '/>
<polygon fill = 'red' points = '295.0,422.4 296.0,422.4 296.0,189.2 295.0,189.2 '/>
<polygon fill = 'red' points = '311.5,422.4 312.4,422.4 312.4,260.2 311.5,260.2 '/>
<polygon fill = 'red' points = '328.0,422.4 328.9,422.4 328.9,320.8 328.0,320.8 '/>
<polygon fill = 'red' points = '344.5,422.4 345.4,422.4 345.4,368.5 344.5,368.5 '/>
<polygon fill = 'red' points = '361.0,422.4 361.9,422.4 361.9,395.3 361.0,395.3 '/>
<polygon fill = 'red' points = '377.5,422.4 378.4,422.4 378.4,408.0 377.5,408.0 '/>
<polygon fill = 'red' points = '394.0,422.4 394.9,422.4 394.9,416.1 394.0,416.1 '/>
<polygon fill = 'red' points = '410.5,422.4 411.4,422.4 411.4,420.1 410.5,420.1 '/>
<polygon fill = 'red' points = '427.0,422.4 427.9,422.4 427.9,421.3 427.0,421.3 '/>
<polygon fill = 'red' points = '443.5,422.4 444.4,422.4 444.4,422.1 443.5,422.1 '/>
<polygon fill = 'red' points = '476.5,422.4 477.4,422.4 477.4,422.2 476.5,422.2 '/>
<polygon fill = 'red' points = '492.9,422.4 493.9,422.4 493.9,422.2 492.9,422.2 '/>
</g>
</g>
</g>
<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
<path stroke='black' d='M80.2,16.7 L80.2,422.4 L575.0,422.4 M575.0,16.7 M80.2,16.7 '/></g>
</g>
</svg>
#!/bin/sh
rm *.pdf_tex
rm *.pdf
This diff is collapsed.
......@@ -24,7 +24,7 @@
#include "../../Components/FBasicCell.hpp"
#include "../../Extensions/FExtendCellType.hpp"
#include "../../Utils/FComplexe.hpp"
#include "../../Utils/FComplex.hpp"
/**
* @author Pierre Blanchard (pierre.blanchard@inria.fr)
......@@ -51,17 +51,17 @@ class FInterpCell : public FBasicCell
FReal multipole_exp[NRHS * NVALS * VectorSize]; //< Multipole expansion
FReal local_exp[NLHS * NVALS * VectorSize]; //< Local expansion
// PB: Store multipole and local expansion in Fourier space
FComplexe transformed_multipole_exp[NRHS * NVALS * TransformedVectorSize];
FComplexe transformed_local_exp[NLHS * NVALS * TransformedVectorSize];
FComplex transformed_multipole_exp[NRHS * NVALS * TransformedVectorSize];
FComplex transformed_local_exp[NLHS * NVALS * TransformedVectorSize];
public:
FInterpCell(){
memset(multipole_exp, 0, sizeof(FReal) * NRHS * NVALS * VectorSize);
memset(local_exp, 0, sizeof(FReal) * NLHS * NVALS * VectorSize);
memset(transformed_multipole_exp, 0,
sizeof(FComplexe) * NRHS * NVALS * TransformedVectorSize);
sizeof(FComplex) * NRHS * NVALS * TransformedVectorSize);
memset(transformed_local_exp, 0,
sizeof(FComplexe) * NLHS * NVALS * TransformedVectorSize);
sizeof(FComplex) * NLHS * NVALS * TransformedVectorSize);
}
~FInterpCell() {}
......@@ -90,20 +90,20 @@ public:
}
/** Get Transformed Multipole */
const FComplexe* getTransformedMultipole(const int inRhs) const{
const FComplex* getTransformedMultipole(const int inRhs) const{
return this->transformed_multipole_exp + inRhs*TransformedVectorSize;
}
/** Get Transformed Local */
const FComplexe* getTransformedLocal(const int inRhs) const{
const FComplex* getTransformedLocal(const int inRhs) const{
return this->transformed_local_exp + inRhs*TransformedVectorSize;
}
/** Get Transformed Multipole */
FComplexe* getTransformedMultipole(const int inRhs){
FComplex* getTransformedMultipole(const int inRhs){
return this->transformed_multipole_exp + inRhs*TransformedVectorSize;
}
/** Get Transformed Local */
FComplexe* getTransformedLocal(const int inRhs){
FComplex* getTransformedLocal(const int inRhs){
return this->transformed_local_exp + inRhs*TransformedVectorSize;
}
......@@ -117,9 +117,9 @@ public:
memset(multipole_exp, 0, sizeof(FReal) * NRHS * NVALS * VectorSize);
memset(local_exp, 0, sizeof(FReal) * NLHS * NVALS * VectorSize);
memset(transformed_multipole_exp, 0,
sizeof(FComplexe) * NRHS * NVALS * TransformedVectorSize);
sizeof(FComplex) * NRHS * NVALS * TransformedVectorSize);
memset(transformed_local_exp, 0,
sizeof(FComplexe) * NLHS * NVALS * TransformedVectorSize);
sizeof(FComplex) * NLHS * NVALS * TransformedVectorSize);
}
///////////////////////////////////////////////////////
......@@ -171,7 +171,7 @@ public:
}
static constexpr int GetSize(){
return (NRHS+NLHS)*NVALS*VectorSize * (int) sizeof(FReal) + (NRHS+NLHS)*NVALS*TransformedVectorSize * (int) sizeof(FComplexe);
return (NRHS+NLHS)*NVALS*VectorSize * (int) sizeof(FReal) + (NRHS+NLHS)*NVALS*TransformedVectorSize * (int) sizeof(FComplex);
}
......
This diff is collapsed.
......@@ -16,7 +16,7 @@
#ifndef FROTATIONCELL_HPP
#define FROTATIONCELL_HPP
#include "../../Utils/FComplexe.hpp"
#include "../../Utils/FComplex.hpp"
#include "../../Utils/FMemUtils.hpp"
#include "../../Extensions/FExtendCellType.hpp"
......@@ -43,9 +43,9 @@ protected:
static const int LocalSize = ((P+2)*(P+1))/2; // Artimethique suite (n+1)*n/2
//< Multipole vector (static memory)
FComplexe multipole_exp[MultipoleSize]; //< For multipole extenssion
FComplex multipole_exp[MultipoleSize]; //< For multipole extenssion
//< Local vector (static memory)
FComplexe local_exp[LocalSize]; //< For local extenssion
FComplex local_exp[LocalSize]; //< For local extenssion
public:
/** Default constructor
......@@ -75,20 +75,20 @@ public:
}
/** Get Multipole array */
const FComplexe* getMultipole() const {
const FComplex* getMultipole() const {
return multipole_exp;
}
/** Get Local array */
const FComplexe* getLocal() const {
const FComplex* getLocal() const {
return local_exp;
}
/** Get Multipole array */
FComplexe* getMultipole() {
FComplex* getMultipole() {
return multipole_exp;
}
/** Get Local array */
FComplexe* getLocal() {
FComplex* getLocal() {
return local_exp;
}
......@@ -145,7 +145,7 @@ public:
buffer.fillArray(local_exp, LocalSize);
}
static constexpr int GetSize(){
return ((int) sizeof(FComplexe)) * (MultipoleSize + LocalSize);
return ((int) sizeof(FComplex)) * (MultipoleSize + LocalSize);
}
};
......
This diff is collapsed.
......@@ -18,7 +18,7 @@
#include "../../Components/FAbstractKernels.hpp"
#include "../../Utils/FSmartPointer.hpp"
#include "../../Utils/FComplexe.hpp"
#include "../../Utils/FComplex.hpp"
#include "../../Utils/FMemUtils.hpp"
#include "../../Utils/FSpherical.hpp"
......@@ -192,12 +192,12 @@ class FRotationOriginalKernel : public FAbstractKernels<CellClass,ContainerClass
* The computation is simply a multiplication per a complex number \f$ e^{-i \phi m} \f$
* Phi should be in [0,2pi]
*/
void rotateMultipoleAroundZ(FComplexe vec[], const FReal phi){
FComplexe cell_rotate[SizeArray];
void rotateMultipoleAroundZ(FComplex vec[], const FReal phi){
FComplex cell_rotate[SizeArray];
for(int l = 0 ; l <= P ; ++l){
for(int m = 0 ; m <= l ; ++m ){
// O_{l,m}( \alpha, \beta + \phi ) = e^{-i \phi m} O_{l,m}( \alpha, \beta )
const FComplexe exp_minus_imphi(FMath::Cos(-phi * FReal(m)), FMath::Sin(-phi * FReal(m)));
const FComplex exp_minus_imphi(FMath::Cos(-phi * FReal(m)), FMath::Sin(-phi * FReal(m)));
cell_rotate[atLm(l,m)].equalMul(exp_minus_imphi , vec[atLm(l,m)]);
}
}
......@@ -214,12 +214,12 @@ class FRotationOriginalKernel : public FAbstractKernels<CellClass,ContainerClass
* The computation is simply a multiplication per a complex number \f$ e^{i \phi m} \f$
* Phi should be in [0,2pi]
*/
void rotateTaylorAroundZ(FComplexe vec[], const FReal phi){
FComplexe cell_rotate[SizeArray];
void rotateTaylorAroundZ(FComplex vec[], const FReal phi){
FComplex cell_rotate[SizeArray];
for(int l = 0 ; l <= P ; ++l){
for(int m = 0 ; m <= l ; ++m ){
// M_{l,m}( \alpha, \beta + \phi ) = e^{i \phi m} M_{l,m}( \alpha, \beta )
const FComplexe exp_imphi(FMath::Cos(phi * FReal(m)), FMath::Sin(phi * FReal(m)));
const FComplex exp_imphi(FMath::Cos(phi * FReal(m)), FMath::Sin(phi * FReal(m)));
cell_rotate[atLm(l,m)].equalMul(exp_imphi , vec[atLm(l,m)]);
}
}
......@@ -238,8 +238,8 @@ class FRotationOriginalKernel : public FAbstractKernels<CellClass,ContainerClass
* \f$ O_{l,-m} = \bar{ O_{l,m} } (-1)^m \f$
* Theta should be in [0,pi]
*/
void rotateMultipoleAroundY(FComplexe vec[], const FReal theta){
FComplexe cell_rotate[SizeArray];
void rotateMultipoleAroundY(FComplex vec[], const FReal theta){
FComplex cell_rotate[SizeArray];
for(int l = 0 ; l <= P ; ++l){
for(int m = 0 ; m <= l ; ++m ){
FReal w_lkm_real = 0.0;
......@@ -278,8 +278,8 @@ class FRotationOriginalKernel : public FAbstractKernels<CellClass,ContainerClass
* \f$ M_{l,-m} = \bar{ M_{l,m} } (-1)^m \f$
* Theta should be in [0,pi]
*/
void rotateTaylorAroundY(FComplexe vec[], const FReal theta){
FComplexe cell_rotate[SizeArray];
void rotateTaylorAroundY(FComplex vec[], const FReal theta){
FComplex cell_rotate[SizeArray];
for(int l = 0 ; l <= P ; ++l){
for(int m = 0 ; m <= l ; ++m ){
FReal w_lkm_real = 0.0;
......@@ -313,7 +313,7 @@ class FRotationOriginalKernel : public FAbstractKernels<CellClass,ContainerClass
*
* Rotation are not commutative so we have to do it in the right order
*/
void rotateMultipole(FComplexe vec[], const FReal azimuth, const FReal inclination){
void rotateMultipole(FComplex vec[], const FReal azimuth, const FReal inclination){
rotateMultipoleAroundZ(vec,(FMath::FPiDiv2 + azimuth));
rotateMultipoleAroundY(vec,inclination);
}
......@@ -324,7 +324,7 @@ class FRotationOriginalKernel : public FAbstractKernels<CellClass,ContainerClass
*
* Rotation are not commutative so we have to do it in the right order
*/
void deRotateMultipole(FComplexe vec[], const FReal azimuth, const FReal inclination){
void deRotateMultipole(FComplex vec[], const FReal azimuth, const FReal inclination){
rotateMultipoleAroundY(vec,-inclination);
rotateMultipoleAroundZ(vec,-(FMath::FPiDiv2 + azimuth));
}
......@@ -336,7 +336,7 @@ class FRotationOriginalKernel : public FAbstractKernels<CellClass,ContainerClass
*
* Rotation are not commutative so we have to do it in the right order
*/
void rotateTaylor(FComplexe vec[], const FReal azimuth, const FReal inclination){
void rotateTaylor(FComplex vec[], const FReal azimuth, const FReal inclination){
rotateTaylorAroundZ(vec,(FMath::FPiDiv2 + azimuth));
rotateTaylorAroundY(vec,inclination);
}
......@@ -347,7 +347,7 @@ class FRotationOriginalKernel : public FAbstractKernels<CellClass,ContainerClass
*
* Rotation are not commutative so we have to do it in the right order
*/
void deRotateTaylor(FComplexe vec[], const FReal azimuth, const FReal inclination){
void deRotateTaylor(FComplex vec[], const FReal azimuth, const FReal inclination){
rotateTaylorAroundY(vec,-inclination);
rotateTaylorAroundZ(vec,-(FMath::FPiDiv2 + azimuth));
}
......@@ -446,7 +446,7 @@ public:
void P2M(CellClass* const inPole, const ContainerClass* const inParticles ) {
const FReal i_pow_m[4] = {0, FMath::FPiDiv2, FMath::FPi, -FMath::FPiDiv2};
// w is the multipole moment
FComplexe* FRestrict const w = inPole->getMultipole();
FComplex* FRestrict const w = inPole->getMultipole();
// Copying the position is faster than using cell position
const FPoint cellPosition = getLeafCenter(inPole->getCoordinate());
......@@ -498,7 +498,7 @@ public:
*/
void M2M(CellClass* const FRestrict inPole, const CellClass*const FRestrict *const FRestrict inChildren, const int inLevel) {
// A buffer to copy the source w allocated once
FComplexe source_w[SizeArray];
FComplex source_w[SizeArray];
// For all children
for(int idxChild = 0 ; idxChild < 8 ; ++idxChild){
// if child exists
......@@ -512,7 +512,7 @@ public:
const FReal b = -sph.getR();
// Translate it
FComplexe target_w[SizeArray];
FComplex target_w[SizeArray];
for(int l = 0 ; l <= P ; ++l ){
for(int m = 0 ; m <= l ; ++m ){
// w{l,m}(a+b) = sum(j=m:l, b^(l-j)/(l-j)! w{j,m}(a)
......@@ -549,7 +549,7 @@ public:
*/
void M2L(CellClass* const FRestrict inLocal, const CellClass* inInteractions[], const int /*inSize*/, const int inLevel) {
// To copy the multipole data allocated once
FComplexe source_w[SizeArray];
FComplex source_w[SizeArray];
// For all children
for(int idxNeigh = 0 ; idxNeigh < 343 ; ++idxNeigh){
// if interaction exits
......@@ -563,7 +563,7 @@ public:
const FReal b = sph.getR();
// Transfer to u