Skip to content

Commit

Permalink
really make sure token is invalid
Browse files Browse the repository at this point in the history
  • Loading branch information
womullan committed Apr 18, 2023
1 parent 39f2ec1 commit 68db5cd
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 20 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -182,3 +182,5 @@ TSWLatexianTemp*

# KBibTeX
*~[0-9]*
token.pickle
client_secret.json
6 changes: 3 additions & 3 deletions opsChileR.tex
Expand Up @@ -11,7 +11,7 @@
\textbf{Total (2020 pricing)}&\textbf{\$0.88}&\textbf{\$0.66}&\textbf{\$0.64}&\textbf{\$0.50}&\textbf{\$0.49}&\textbf{\$1.33}&\textbf{\$1.11}&\textbf{\$1.09}&\textbf{\$0.91}&\textbf{\$0.90} \\ \hline
{Applying price factor (CPU)}&{\$0.03}&{\$0.02}&{\$0.02}&{\$0.04}&{\$0.03}&{\$0.03}&{\$0.02}&{\$0.02}&{\$0.02}&{\$0.02} \\ \hline
{Applying price factor (Storage)}&{\$0.69}&{\$0.48}&{\$0.44}&{\$0.30}&{\$0.27}&{\$0.79}&{\$0.62}&{\$0.58}&{\$0.45}&{\$0.42} \\ \hline
{Overhead hosting Chile}&{\$0.25}&{\$0.31}&{\$0.28}&{\$0.29}&{\$0.32}&{\$0.55}&{\$0.40}&{\$0.37}&{\$0.35}&{\$0.44} \\ \hline
\textbf{Total budget (using price factors)}&\textbf{\$0.96}&\textbf{\$0.82}&\textbf{\$0.74}&\textbf{\$0.63}&\textbf{\$0.62}&\textbf{\$1.37}&\textbf{\$1.04}&\textbf{\$0.97}&\textbf{\$0.82}&\textbf{\$0.88} \\ \hline
\textbf{Total Chile hardware to 2033}&\textbf{\$8.85}&\textbf{million}&\textbf{to 2035}&\textbf{\$9.64}&&&&&& \\ \hline
{Overhead hosting Chile}&{\$0.25}&{\$0.36}&{\$0.37}&{\$0.37}&{\$0.44}&{\$0.60}&{\$0.50}&{\$0.53}&{\$0.53}&{\$0.61} \\ \hline
\textbf{Total budget (using price factors)}&\textbf{\$0.96}&\textbf{\$0.87}&\textbf{\$0.84}&\textbf{\$0.70}&\textbf{\$0.75}&\textbf{\$1.41}&\textbf{\$1.15}&\textbf{\$1.13}&\textbf{\$1.00}&\textbf{\$1.05} \\ \hline
\textbf{Total Chile hardware to 2033}&\textbf{\$9.86}&\textbf{million}&\textbf{to 2035}&\textbf{\$10.66}&&&&&& \\ \hline
\end{longtable} \normalsize
14 changes: 7 additions & 7 deletions opsOverheadChile.tex
Expand Up @@ -8,13 +8,13 @@
{Qserv nodes}&{95}&{216}&{309}&{348}&{364}&{451}&{436}&{408}&{367}&{418} \\ \hline
\textbf{Total Nodes}&\textbf{99}&\textbf{222}&\textbf{318}&\textbf{360}&\textbf{379}&\textbf{469}&\textbf{457}&\textbf{432}&\textbf{394}&\textbf{448} \\ \hline
\textbf{Total Compute Racks}&\textbf{3}&\textbf{7}&\textbf{9}&\textbf{10}&\textbf{11}&\textbf{14}&\textbf{13}&\textbf{12}&\textbf{11}&\textbf{13} \\ \hline
\textbf{Total Storage}&\textbf{10,595}&\textbf{8,107}&\textbf{7,868}&\textbf{5,405}&\textbf{5,420}&\textbf{16,008}&\textbf{13,384}&\textbf{13,024}&\textbf{10,481}&\textbf{10,531} \\ \hline
\textbf{Total Storage Racks}&\textbf{2}&\textbf{2}&\textbf{1}&\textbf{1}&\textbf{1}&\textbf{3}&\textbf{2}&\textbf{2}&\textbf{2}&\textbf{2} \\ \hline
{Cooling Power Kw}&{10.00}&{18.00}&{20.00}&{22.00}&{24.00}&{34.00}&{30.00}&{28.00}&{26.00}&{30.00} \\ \hline
\textbf{Total Storage}&\textbf{10,767}&\textbf{18,826}&\textbf{26,572}&\textbf{31,802}&\textbf{37,000}&\textbf{42,200}&\textbf{47,399}&\textbf{52,598}&\textbf{57,798}&\textbf{62,997} \\ \hline
\textbf{Total Storage Racks}&\textbf{2}&\textbf{3}&\textbf{4}&\textbf{4}&\textbf{5}&\textbf{6}&\textbf{6}&\textbf{7}&\textbf{8}&\textbf{8} \\ \hline
{Cooling Power Kw}&{10.00}&{20.00}&{26.00}&{28.00}&{32.00}&{40.00}&{38.00}&{38.00}&{38.00}&{42.00} \\ \hline
{Computing Power kW
}&{73}&{131.4}&{146}&{160.6}&{175.2}&{248.2}&{219}&{204.4}&{189.8}&{219} \\ \hline
{Power Cost}&{\$109,790}&{\$197,622}&{\$219,580}&{\$265,692}&{\$289,846}&{\$410,615}&{\$398,538}&{\$371,969}&{\$345,400}&{\$438,392} \\ \hline
}&{73}&{146}&{189.8}&{204.4}&{233.6}&{292}&{277.4}&{277.4}&{277.4}&{306.6} \\ \hline
{Power Cost}&{\$109,790}&{\$219,580}&{\$285,454}&{\$338,153}&{\$386,461}&{\$483,076}&{\$504,815}&{\$504,815}&{\$504,815}&{\$613,748} \\ \hline
{Compute rack install costs}&{\$85,902.00}&{\$114,536.00}&{\$57,268.00}&{\$28,634.00}&{\$28,634.00}&{\$85,902.00}&{\$0.00}&{\$0.00}&{\$0.00}&{\$0.00} \\ \hline
{Storage rack install costs}&{\$57,268.00}&{\$0.00}&{\$0.00}&{\$0.00}&{\$0.00}&{\$57,268.00}&{\$0.00}&{\$0.00}&{\$0.00}&{\$0.00} \\ \hline
\textbf{Total Ops Overhead Chile (USD)}&\textbf{\$252,960}&\textbf{\$312,158}&\textbf{\$276,848}&\textbf{\$294,326}&\textbf{\$318,480}&\textbf{\$553,785}&\textbf{\$398,538}&\textbf{\$371,969}&\textbf{\$345,400}&\textbf{\$438,392} \\ \hline
{Storage rack install costs}&{\$57,268.00}&{\$28,634.00}&{\$28,634.00}&{\$0.00}&{\$28,634.00}&{\$28,634.00}&{\$0.00}&{\$28,634.00}&{\$28,634.00}&{\$0.00} \\ \hline
\textbf{Total Ops Overhead Chile (USD)}&\textbf{\$252,960}&\textbf{\$362,750}&\textbf{\$371,356}&\textbf{\$366,787}&\textbf{\$443,729}&\textbf{\$597,612}&\textbf{\$504,815}&\textbf{\$533,449}&\textbf{\$533,449}&\textbf{\$613,748} \\ \hline
\end{longtable} \normalsize
6 changes: 3 additions & 3 deletions opsSumChile.tex
Expand Up @@ -10,7 +10,7 @@
{Applying price factor (CPU)}&{\$0.03}&{\$0.02}&{\$0.02}&{\$0.04}&{\$0.03}&{\$0.03}&{\$0.02}&{\$0.02}&{\$0.02}&{\$0.02} \\ \hline
{Qserv (applying factor)}&{\$1.39}&{\$1.64}&{\$1.17}&{\$1.55}&{\$1.47}&{\$1.78}&{\$1.09}&{\$0.92}&{\$1.09}&{\$1.23} \\ \hline
{Applying price factor (Storage)}&{\$0.69}&{\$0.48}&{\$0.44}&{\$0.30}&{\$0.27}&{\$0.79}&{\$0.62}&{\$0.58}&{\$0.45}&{\$0.42} \\ \hline
{Overhead hosting Chile}&{\$0.25}&{\$0.31}&{\$0.28}&{\$0.29}&{\$0.32}&{\$0.55}&{\$0.40}&{\$0.37}&{\$0.35}&{\$0.44} \\ \hline
\textbf{Total budget (using price factors)}&\textbf{\$2.36}&\textbf{\$2.45}&\textbf{\$1.91}&\textbf{\$2.18}&\textbf{\$2.09}&\textbf{\$3.16}&\textbf{\$2.13}&\textbf{\$1.90}&\textbf{\$1.91}&\textbf{\$2.11} \\ \hline
\textbf{Total Operations hardware to 2033}&\textbf{\$22.19}&\textbf{million}&\textbf{to 2035}&\textbf{\$23.49}&&&&&& \\ \hline
{Overhead hosting Chile}&{\$0.25}&{\$0.36}&{\$0.37}&{\$0.37}&{\$0.44}&{\$0.60}&{\$0.50}&{\$0.53}&{\$0.53}&{\$0.61} \\ \hline
\textbf{Total budget (using price factors)}&\textbf{\$2.36}&\textbf{\$2.50}&\textbf{\$2.00}&\textbf{\$2.25}&\textbf{\$2.21}&\textbf{\$3.20}&\textbf{\$2.24}&\textbf{\$2.06}&\textbf{\$2.09}&\textbf{\$2.29} \\ \hline
\textbf{Total Operations hardware to 2033}&\textbf{\$23.21}&\textbf{million}&\textbf{to 2035}&\textbf{\$24.51}&&&&&& \\ \hline
\end{longtable} \normalsize
6 changes: 3 additions & 3 deletions opsSumUSDF.tex
Expand Up @@ -17,7 +17,7 @@
{Qserv (applying factor)}&{\$1.19}&{\$1.64}&{\$1.17}&{\$1.39}&{\$1.47}&{\$1.78}&{\$0.96}&{\$0.92}&{\$1.09}&{\$1.13} \\ \hline
{Applying price factor (Storage)}&{\$2.15}&{\$2.40}&{\$2.72}&{\$2.64}&{\$2.91}&{\$4.05}&{\$4.15}&{\$4.29}&{\$4.11}&{\$4.02} \\ \hline
{Hosting Overhead SLAC
}&{1.7}&{1.8}&{1.8}&{1.8}&{1.9}&{2.0}&{1.9}&{1.9}&{1.9}&{1.9} \\ \hline
\textbf{Total budget (using price factors)}&\textbf{\$5.22}&\textbf{\$6.00}&\textbf{\$5.98}&\textbf{\$6.10}&\textbf{\$6.47}&\textbf{\$8.15}&\textbf{\$7.25}&\textbf{\$7.35}&\textbf{\$7.36}&\textbf{\$7.24} \\ \hline
\textbf{Total Operations hardware to 2033}&\textbf{\$67.11}&\textbf{million}&\textbf{to 2035}&\textbf{\$74.17}&&&&&& \\ \hline
}&{0.6}&{0.7}&{0.7}&{0.8}&{0.8}&{1.0}&{0.9}&{0.9}&{0.9}&{0.9} \\ \hline
\textbf{Total budget (using price factors)}&\textbf{\$4.14}&\textbf{\$4.93}&\textbf{\$4.91}&\textbf{\$5.04}&\textbf{\$5.42}&\textbf{\$7.12}&\textbf{\$6.21}&\textbf{\$6.30}&\textbf{\$6.32}&\textbf{\$6.19} \\ \hline
\textbf{Total Operations hardware to 2033}&\textbf{\$56.58}&\textbf{million}&\textbf{to 2035}&\textbf{\$61.41}&&&&&& \\ \hline
\end{longtable} \normalsize
8 changes: 4 additions & 4 deletions opsSummary.tex
Expand Up @@ -2,8 +2,8 @@
\caption{This table adds the USDF (see \tabref{tab:opsSumUSDF}) and \tabref{tab:opsChileR} to give total operations hardware costs. \label{tab:opsSummary}}\\
\hline
\textbf{Year (all prices Million\$)}&\textbf{2024}&\textbf{2025}&\textbf{2026}&\textbf{2027}&\textbf{2028}&\textbf{2029}&\textbf{2030}&\textbf{2031}&\textbf{2032}&\textbf{2033} \\ \hline
{USDF hardware}&{\$5.22}&{\$6.00}&{\$5.98}&{\$6.10}&{\$6.47}&{\$8.15}&{\$7.25}&{\$7.35}&{\$7.36}&{\$7.24} \\ \hline
{Chile hardware}&{\$0.96}&{\$0.82}&{\$0.74}&{\$0.63}&{\$0.62}&{\$1.37}&{\$1.04}&{\$0.97}&{\$0.82}&{\$0.88} \\ \hline
\textbf{Total budget (using price factors)}&\textbf{\$6.18}&\textbf{\$6.81}&\textbf{\$6.72}&\textbf{\$6.73}&\textbf{\$7.10}&\textbf{\$9.52}&\textbf{\$8.29}&\textbf{\$8.32}&\textbf{\$8.18}&\textbf{\$8.12} \\ \hline
\textbf{Total Operations hardware to 2033}&\textbf{\$75.96}&\textbf{million}&\textbf{to 2035}&\textbf{\$83.81}&&&&&& \\ \hline
{USDF hardware}&{\$4.14}&{\$4.93}&{\$4.91}&{\$5.04}&{\$5.42}&{\$7.12}&{\$6.21}&{\$6.30}&{\$6.32}&{\$6.19} \\ \hline
{Chile hardware}&{\$0.96}&{\$0.87}&{\$0.84}&{\$0.70}&{\$0.75}&{\$1.41}&{\$1.15}&{\$1.13}&{\$1.00}&{\$1.05} \\ \hline
\textbf{Total budget (using price factors)}&\textbf{\$5.10}&\textbf{\$5.79}&\textbf{\$5.75}&\textbf{\$5.74}&\textbf{\$6.16}&\textbf{\$8.54}&\textbf{\$7.36}&\textbf{\$7.44}&\textbf{\$7.32}&\textbf{\$7.25} \\ \hline
\textbf{Total Operations hardware to 2033}&\textbf{\$66.45}&\textbf{million}&\textbf{to 2035}&\textbf{\$72.08}&&&&&& \\ \hline
\end{longtable} \normalsize
Binary file modified token.pickle.gpg
Binary file not shown.

0 comments on commit 68db5cd

Please sign in to comment.