Commit e8318623 authored by sfritschi's avatar sfritschi
Browse files

Updated thesis and improved correctness check

parent 08385948
......@@ -937,8 +937,8 @@ def generate_dendrogram(basenet: Network, targetsize: List[int], \
for throat in throats: network.connect_pores(pore1=throat[0],
pore2=throat[1], label=throat[2], r=throat[3])
# DEBUG
"""
# DEBUG
# Check for correctness of generated network
checkUnrealized = 0
for pore in network.pores:
......@@ -951,8 +951,10 @@ def generate_dendrogram(basenet: Network, targetsize: List[int], \
nborInd = set()
for throat in pore.throats:
assert(pore.index == throat.pore1.index or pore.index == throat.pore2.index)
nborIdx = throat.pore2.index if (throat.pore1.index == pore.index) else throat.pore1.index
nborInd.add(nborIdx)
nbor = throat.pore2 if (throat.pore1.index == pore.index) else throat.pore1
if (nbor.label != LABELS[0]):
nbor = pores[int(j)]
nborInd.add(nbor.index)
# Make sure pore isn't connected to the same nbor twice
assert(len(nborInd) == nthroats)
......
......@@ -46,8 +46,8 @@
\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {3}Parallel Network Generation}{4}{section.3}\protected@file@percent }
\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {3.1}Cell Lists}{4}{subsection.3.1}\protected@file@percent }
\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {3.2}Iterative Algorithm}{5}{subsection.3.2}\protected@file@percent }
\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\contentsline {table}{\numberline {1}{\ignorespaces Sample run of parallel pore-connecting algorithm using 4 threads. The generated network is 3 times as large as the base network in all directions. The maximal feasible number of throats is 103464, of which 961 were not realized due to falling below the threshold of 1\%.\relax }}{5}{table.caption.2}\protected@file@percent }
\newlabel{table:iter}{{1}{5}{Sample run of parallel pore-connecting algorithm using 4 threads. The generated network is 3 times as large as the base network in all directions. The maximal feasible number of throats is 103464, of which 961 were not realized due to falling below the threshold of 1\%.\relax }{table.caption.2}{}}
\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\contentsline {table}{\numberline {1}{\ignorespaces Sample run of parallel pore-connecting algorithm using 4 threads. The generated network is 3 times as large as the base network in all directions. The maximal feasible number of throats is 103464, of which 1015 were not realized due to falling below the threshold of 1\%.\relax }}{5}{table.caption.2}\protected@file@percent }
\newlabel{table:iter}{{1}{5}{Sample run of parallel pore-connecting algorithm using 4 threads. The generated network is 3 times as large as the base network in all directions. The maximal feasible number of throats is 103464, of which 1015 were not realized due to falling below the threshold of 1\%.\relax }{table.caption.2}{}}
\@writefile{loa}{\defcounter {refsection}{0}\relax }\@writefile{loa}{\contentsline {algorithm}{\numberline {1}{\ignorespaces Connect pores in parallel\relax }}{6}{algorithm.1}\protected@file@percent }
\newlabel{alg:connect}{{1}{6}{Connect pores in parallel\relax }{algorithm.1}{}}
\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {A}PETSc Installation}{6}{appendix.A}\protected@file@percent }
......
This is pdfTeX, Version 3.14159265-2.6-1.40.20 (TeX Live 2019/Debian) (preloaded format=pdflatex 2021.4.27) 29 NOV 2021 23:00
This is pdfTeX, Version 3.14159265-2.6-1.40.20 (TeX Live 2019/Debian) (preloaded format=pdflatex 2021.4.27) 30 NOV 2021 15:18
entering extended mode
restricted \write18 enabled.
%&-line parsing enabled.
......@@ -999,17 +999,17 @@ Underfull \hbox (badness 10000) in paragraph at lines 78--78
[4 <./plots/flux_PETSC.png>]
Package hyperref Info: bookmark level for unknown algorithm defaults to 0 on in
put line 110.
put line 111.
LaTeX Warning: `h' float specifier changed to `ht'.
[5] [6] [7]
Package atveryend Info: Empty hook `BeforeClearDocument' on input line 162.
Package atveryend Info: Empty hook `AfterLastShipout' on input line 162.
Package atveryend Info: Empty hook `BeforeClearDocument' on input line 163.
Package atveryend Info: Empty hook `AfterLastShipout' on input line 163.
(./thesis.aux)
Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 162.
Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 162.
Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 163.
Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 163.
Package rerunfilecheck Info: File `thesis.out' has not changed.
(rerunfilecheck) Checksum: AA3CBB7EB769D633AAD438AE1872089A;581.
Package logreq Info: Writing requests to 'thesis.run.xml'.
......@@ -1019,7 +1019,7 @@ Package logreq Info: Writing requests to 'thesis.run.xml'.
Here is how much of TeX's memory you used:
26070 strings out of 483107
488688 string characters out of 5964630
1117582 words of memory out of 5000000
1117583 words of memory out of 5000000
40667 multiletter control sequences out of 15000+600000
540150 words of font info for 51 fonts, out of 8000000 for 9000
59 hyphenation exceptions out of 8191
......@@ -1038,7 +1038,7 @@ s/cm/cmsl10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/c
msy10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy7.p
fb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmti10.pfb></u
sr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmtt10.pfb>
Output written on thesis.pdf (7 pages, 221300 bytes).
Output written on thesis.pdf (7 pages, 221338 bytes).
PDF statistics:
186 PDF objects out of 1000 (max. 8388607)
158 compressed objects within 2 object streams
......
No preview for this file type
No preview for this file type
......@@ -92,15 +92,16 @@
\begin{table}[h]
\centering
\caption{Sample run of parallel pore-connecting algorithm using 4 threads. The generated network is 3 times as large as the base network in all directions. The maximal feasible number of throats is 103464, of which 961 were not realized due to falling below the threshold of 1\%.}
\caption{Sample run of parallel pore-connecting algorithm using 4 threads. The generated network is 3 times as large as the base network in all directions. The maximal feasible number of throats is 103464, of which 1015 were not realized due to falling below the threshold of 1\%.}
\begin{tabular}{|c|c|c|}
\hline
\textbf{Iteration} & \textbf{Throats left} & \textbf{Rel. percentage} \\
\hline
0 & 103464 & 100.0\% \\
1 & 18444 & 17.8\% \\
2 & 4094 & 4.0\% \\
3 & 961 & 0.9\% \\
0 & 103464 & 100.00\% \\
1 & 18676 & 18.1\% \\
2 & 5191 & 5.0\% \\
3 & 1996 & 1.9\% \\
4 & 1015 & 0.98\% \\
\hline
\end{tabular}
\label{table:iter}
......@@ -121,7 +122,7 @@
\For{$pore$ \textbf{in} $poresRemain$}
\For{$throat$ \textbf{in} $pore.throats$}
\State Fetch $match$ pore from $poreMatchTable$
\If{$throat$ is not already realized \textbf{and} $match$ is valid}
\If{$throat$ is not already realized \textbf{and} $match$ is found}
\State Realize $throat$
\EndIf
\EndFor
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment