diff --git a/concrete-beam/calc.py b/concrete-beam/calc.py index 3aaa1fd..86a1b08 100644 --- a/concrete-beam/calc.py +++ b/concrete-beam/calc.py @@ -10,54 +10,68 @@ try: except ImportError: raise SystemExit("Install PyYAML: python -m pip install pyyaml") +try: + from pint import DimensionalityError, UndefinedUnitError, UnitRegistry +except ImportError: + raise SystemExit("Install dependencies: python -m pip install -r requirements.txt") + HERE = Path(__file__).resolve().parent +ureg = UnitRegistry() +ureg.define("kip = 1000 * force_pound") +ureg.define("ksi = kip / inch ** 2") +ureg.define("psf = force_pound / foot ** 2") +ureg.define("pcf = force_pound / foot ** 3") -def _require_positive(name: str, value: float) -> float: - if value <= 0: + +def quantity(value, unit: str, name: str) -> float: + try: + q = ureg.Quantity(value).to(unit) + except (DimensionalityError, UndefinedUnitError, TypeError, ValueError) as exc: + raise ValueError(f"{name}: expected {unit}, got {value!r}") from exc + magnitude = float(q.magnitude) + if magnitude <= 0: raise ValueError(f"{name} must be positive") - return value + return magnitude def compute(inp: dict) -> dict: - span_ft = _require_positive("span_ft", float(inp["span_ft"])) - tributary_ft = _require_positive("tributary_ft", float(inp["tributary_ft"])) - D_psf = _require_positive("D_psf", float(inp["D_psf"])) - L_psf = _require_positive("L_psf", float(inp["L_psf"])) - bw_in = _require_positive("bw_in", float(inp["bw_in"])) - h_in = _require_positive("h_in", float(inp["h_in"])) - d_in = _require_positive("d_in", float(inp["d_in"])) - fc_ksi = _require_positive("fc_ksi", float(inp["fc_ksi"])) - fy_ksi = _require_positive("fy_ksi", float(inp["fy_ksi"])) - As_in2 = _require_positive("As_in2", float(inp["As_in2"])) - concrete_pcf = _require_positive("concrete_pcf", float(inp["concrete_pcf"])) + span = quantity(inp["span"], "ft", "span") + tributary = quantity(inp["tributary"], "ft", "tributary") + D = quantity(inp["D"], "psf", "D") + L = quantity(inp["L"], "psf", "L") + bw = quantity(inp["bw"], "in", "bw") + h = quantity(inp["h"], "in", "h") + d = quantity(inp["d"], "in", "d") + fc = quantity(inp["fc"], "ksi", "fc") + fy = quantity(inp["fy"], "ksi", "fy") + As = quantity(inp["As"], "in**2", "As") + concrete_density = quantity(inp["concrete_density"], "pcf", "concrete_density") - self_weight_klf = (bw_in * h_in / 144.0) * concrete_pcf / 1000.0 - wD_klf = D_psf * tributary_ft / 1000.0 + self_weight_klf - wL_klf = L_psf * tributary_ft / 1000.0 - wu_klf = 1.2 * wD_klf + 1.6 * wL_klf - Mu_kipft = wu_klf * span_ft**2 / 8.0 - Vu_kip = wu_klf * span_ft / 2.0 + self_weight = (bw * h / 144.0) * concrete_density / 1000.0 + wD = D * tributary / 1000.0 + self_weight + wL = L * tributary / 1000.0 + wu = 1.2 * wD + 1.6 * wL + Mu = wu * span**2 / 8.0 + Vu = wu * span / 2.0 - fc_psi = fc_ksi * 1000.0 - fy_psi = fy_ksi * 1000.0 - a_in = As_in2 * fy_ksi / (0.85 * fc_ksi * bw_in) - beta1 = max(0.65, min(0.85, 0.85 - 0.05 * max(0.0, (fc_psi - 4000.0) / 1000.0))) - c_in = a_in / beta1 - et = 0.003 * (d_in - c_in) / c_in if c_in > 0 else 0.0 + a = As * fy / (0.85 * fc * bw) + beta1 = max(0.65, min(0.85, 0.85 - 0.05 * max(0.0, (fc * 1000.0 - 4000.0) / 1000.0))) + c = a / beta1 + et = 0.003 * (d - c) / c if c > 0 else 0.0 if et >= 0.005: phi = 0.90 else: phi = max(0.65, min(0.90, 0.65 + (et - 0.002) * 250.0 / 3.0)) - Mn_kipft = As_in2 * fy_ksi * (d_in - a_in / 2.0) / 12.0 - phiMn_kipft = phi * Mn_kipft + Mn = As * fy * (d - a / 2.0) / 12.0 + phiMn = phi * Mn - rho_min = max(3.0 * math.sqrt(fc_psi) / fy_psi, 200.0 / fy_psi) - As_min_in2 = rho_min * bw_in * d_in + rho_min = max(3.0 * math.sqrt(fc * 1000.0) / (fy * 1000.0), 200.0 / (fy * 1000.0)) + As_min = rho_min * bw * d - Vc_kip = 2.0 * math.sqrt(fc_psi) * bw_in * d_in / 1000.0 - phiVc_kip = 0.75 * Vc_kip + Vc = 2.0 * math.sqrt(fc * 1000.0) * bw * d / 1000.0 + phiVc = 0.75 * Vc def q(value: float) -> float: return round(value, 6) @@ -68,46 +82,46 @@ def compute(inp: dict) -> dict: "project": inp.get("project", ""), "prepared_by": inp.get("prepared_by", ""), "values": { - "span_ft": q(span_ft), - "tributary_ft": q(tributary_ft), - "D_psf": q(D_psf), - "L_psf": q(L_psf), - "self_weight_klf": q(self_weight_klf), - "wD_klf": q(wD_klf), - "wL_klf": q(wL_klf), - "wu_klf": q(wu_klf), - "Mu_kipft": q(Mu_kipft), - "Vu_kip": q(Vu_kip), - "bw_in": q(bw_in), - "h_in": q(h_in), - "d_in": q(d_in), - "fc_ksi": q(fc_ksi), - "fy_ksi": q(fy_ksi), - "As_in2": q(As_in2), - "a_in": q(a_in), + "span": q(span), + "tributary": q(tributary), + "D": q(D), + "L": q(L), + "self_weight": q(self_weight), + "wD": q(wD), + "wL": q(wL), + "wu": q(wu), + "Mu": q(Mu), + "Vu": q(Vu), + "bw": q(bw), + "h": q(h), + "d": q(d), + "fc": q(fc), + "fy": q(fy), + "As": q(As), + "a": q(a), "et": q(et), "phi": q(phi), - "Mn_kipft": q(Mn_kipft), - "phiMn_kipft": q(phiMn_kipft), - "As_min_in2": q(As_min_in2), - "Vc_kip": q(Vc_kip), - "phiVc_kip": q(phiVc_kip), + "Mn": q(Mn), + "phiMn": q(phiMn), + "As_min": q(As_min), + "Vc": q(Vc), + "phiVc": q(phiVc), }, "checks": { "flexure": { - "demand": q(Mu_kipft), - "capacity": q(phiMn_kipft), - "ok": Mu_kipft <= phiMn_kipft, + "demand": q(Mu), + "capacity": q(phiMn), + "ok": Mu <= phiMn, }, "minimum_steel": { - "demand": q(As_min_in2), - "capacity": q(As_in2), - "ok": As_in2 >= As_min_in2, + "demand": q(As_min), + "capacity": q(As), + "ok": As >= As_min, }, "shear": { - "demand": q(Vu_kip), - "capacity": q(phiVc_kip), - "ok": Vu_kip <= phiVc_kip, + "demand": q(Vu), + "capacity": q(phiVc), + "ok": Vu <= phiVc, }, }, } diff --git a/concrete-beam/concrete-beam.pdf b/concrete-beam/concrete-beam.pdf index a5ea0dd..da76c99 100644 --- a/concrete-beam/concrete-beam.pdf +++ b/concrete-beam/concrete-beam.pdf @@ -705,28 +705,25 @@ o endstream endobj 208 0 obj -<> +<> stream -xY tTչϞI&0yBd8IB"bbɋ &LB"I&f(VFiZj[\Kh0EE@]KׂZL2 뽫kݙ}&`]mh+^!?^޺V -Ёz^>&y sۺn2}@{k^{Su[M'yEצ0 $v!ol(zjH{ݍpv wqbQăABOYXA D/v.i/nzң8!Bi=4Hdֆzbܢ բ/xv܃9lnlqlՎjƣxRπͰCܢ=]5a#D/c;[#`hӱ2GV?a'tS2gCJ^6C!fAӵt#Y*:^ 7y~B9 &Z_=?m=&y}-Obحj^&k|xNb\M=z! @3qᛍ7CԧjКFj9 Єt~ n 0A\u]ҿw"Ӌ3.v{vNHv'fzn͞3o;Ē°K˼ss#keeNy+KYA~R9L;j֟Ggk'vuiXK;;=:[_O߶ BW[y?[La߄XeOI)*f?<4rghxQX\IDʑ13Cſ?kk78.0va3@Kn; -Y0!{P,=c -|8\ilM1ml?=pU$0iLJUߖ?&)yYD)aײ2 V=H6wmomÆ߾gL޺į__3W{#_}ХY,o՗‰~_5fHiD# =9[mքdZb`-vy=j1qV'p$Jǥ¼9uvm#P^.|"'cK|i}]q8SSSlS.rT:*%XLflcL6 9 9vf?bYs/Eۯ;WoVW@.O L8#ߟlBpR/( ` -n,eVa1+`;I *N 0=Pfpc0?կG9RpۄIv 2YZ"p:a -[nځRЁD ]pc*0 n#y(˰n] hD=ڐ 7*юbnԎ`U#hD'V~24c!FQv,W#ݨWnntЊ4 ?hC7NH V`Dꗞ̏̎ݤz KЁ""Fh@۩A;хQho#'`)w1Ѳ\=c85x[ZWds|n (c.{dfX7h\.ҳy -M栁ݬ5ZH%?Ӥ6X3"ld߅bخwܰ2t#,}i+R,x=Ը6t#rȤFj ΌʒL99ׯ4al@75OZ#G-.waU8ϥQMdO:݊(@FЭ$ԡV(&T45VF{G VfGEG.]A43=gw -XvKXձ? FͺQV)=ھjhR{f{C#G 4)ғbTJ܀F4(qw0Q9[ޝiwը -g^隕{lș="+JVړqGsjD6EU;g{eTZ\lQr+;5|e1W^%<Ԣ Q2LťXݑ3j - - Qbn-+ju5F[EF9j j\C*MƬF)e]Q^5jԷ?Wq1GMձ$r(G-Jqyn1JP$ijWfZ4 PdbjPeaʇ٨ R0X嘯XHK#|双\eu5Մ,ۣ(9@4xHXSWJi+SQ#ܩPW<TQY526**2*n/=ԝѓ);"$TJV*_KF9a58T^x/"zaD8Yh%#Yf'Q2 UDc2Jsc6"q\ʫodE}A`h$_ػq:Z;zJ쨽60v -5mܸ^c6άgL'W)9{\>x6~N7jHUbDVFyjO|Tv [cgX AͳP%D^$bWcXqOņ_<_>OTE[² veoY‹'DX"֪ >pC3A̦և߫fbFbf61\uOGS=̷X􉠓x }&X?DOO,>'\oA|:h ->$h(t) -Q?Kӟ]AHz{%zTIz=^? -W_I -z%^^L/ zqs1~~WDG6#EtXСZ!A ~# $$zNг}tpkAϬ=%Wn4%zlw.>}C -zB='ۭ|a?v9?T>9!A?0~`?ߟJ:{;{kh+AToοJ߲7-Cۭ~Aۭmk&hk[룾{x{,нk-wy%ŧ#}=@wywӝ.G6z&?m=AwݶoA&h;JVAko[n^otZs}MP*hywu|/]ԵO:);(CPm*o*hE> %Oj(/a9A2s^RA 8~ڧ隫5.: Z䢫-`b*_O t'EՂ2/+jL+*S+S~R'>{SfQi:4|zIq/qPIH/V/xq>_,l XX~Y<]b>_T%/9I_tT*T(~hFht/4s]/Cyi@P uiF^M$3@ "oHf=%>}>]I|Mӊ4AS'hJyJM,A [-d 1n=>enYbEPl,ļ$"N'Ic^3/N,7^Wty +xY tTչϞI&0yBt8IB"bk"@PLB"I&fS*-<b +˵S*jZժҦk-Mgf2 {W׺3+3{L$`MzǾlN +ZVtܨ| F|E[ih@[3ǽ opYkksc^M[\s=0Mu `~F^w4ѯ/pw6v46 K]`e@ +J~ ddpH=C-BKZƅ!v{Fql0z;~z,^A/Ê b^CYa܃4>Bց]Q}яOi}`sO6<bhnA}|x^>C V]Z ۄ~C*0-DZ1ZQM\'!m߭y}-v?$˛;m7wcnw̙|n>e7yv랜7>ܹC," [›;an#*deys++=iu7eM9%%^hhz+\L̵GFf~dH$GÓj1ɣoM?e$ncSd?L3&9aa?qPbyb.N<^౱7vd&籜lS+ٺ3_au;j_C_x v9s1ܟ߸j@Æ3s>$`::}Xp'%7ͼٙ ;YYn+ܺ)K'F:g"'FO؏ۏ;bYpa {lP &<2:6>a[|lG,ɞ:ˮ`WYW” 6|7y{G_uŇ{yolZ髦[?1/M{9tjm##P8 + +,Y9feiwܸ7ǾC{ |;zdo^TIU<{=;_9z՗ ]Z" 281諴ڬi->1Hs:ᴧ&!v͚jY쓬o6p؞'Y-fqj[$bIY\0abDždőZ,/d?v ݾʮ9֩I;%VR,e&flLVϊ膼켍7m*Qwհ⃒7kGR+SG?tI\'{VAû?b|8@4խ;D&g\|X!žZq0ȎaY6kgW3E0A:7x@Fp[C~nSLH S 8dp;%p:i*[nډrЅ5FV=pc0n(˱n =hF#: 7щ&RnGA4 ?`Aq p hD'Vn4*|7 7ЋhGtQݛӠP$<Љ@+HMKPGfGnQG=a磊=B x*"AЋn4YVVYޓ +Qьvӕ;JʘXiPq [ZWd|n (c.{dfX 7hD.ҳ +C堁ݪ5ZH%?Ӣ6G6IA@1TynX`9z+¾4`(sMj\9ndRZ5FgdIWІưF6 +Erӂ6xZ%繴8B7WcWȈa9z1>ނD:4 +dʁV{x(?(^anLtd[2D9Q?վVz0ª(g5p|֍yZ,DVC3;9bLR4Icb=KF"$=EDZ ³3 v/S@WfYpZ:;Oz%׶)Ϗ5C c'oꗧMdFl _129J;ûsn5^+b?]rmc.da=y.DD9 +ѨHd\Yuvc}WFe(ŖRעR٩C-(;uW7uXjT*.ꎼVVuX z*%p+lY֪F-*J,V6*ѠPPa>jPl5f-QP*UjQytbg%(ǵụ(C“9]9'̴Ti$%f9F]ޅ|ԡA)+lksPR10"a0*GcQk@Gy\k0 GYPsi/ZnPנFi+mP*QyQHT)PcOVJ yO(id.KO" $6>:ʎ%&Q0(WHFFNc N2>*aax7 cHc^( h6}(9GlYv*rI&ryQA昌X/H3j'YGqf0"GP)u2;I5Jܦ<䎭Ǫ37f]J0n؟3k';yJΝPFc6b_ӍZ0J#LdoT 4(ϗ{Aḛu6Q_q9< 5 QrIժ-K2*F5FOx*6|1Iޠ:Ee-ڦd^;|6TucBDzOUJ V0wF! +iO^6+rmSUx'Tz:"nr*^aVDx@, fQxjTl fVmU[Wz4|K AQA +:]H6_?ur ?NOO.>T{o|oA +k!w_hU|DH 3OOtOۓ;ޞLo zs%Atzm~'跂^}%*dzy^z1$- dZu ݒAeB/7:SR9AC< zv-=#g~*V~PAO [~8Âܷ?9DO yϧy APHR4p?=n'G#zD}I wl}!4zAZKMA +A?}kvtjʿ"homˣ//C|@[u{=|R{=ԿKK[\%6o~ڴ7yhtݹA&h/: Fw|~-C sltՂV IIb$R~=褠Ot.AΎi:QtBj=M+EP &Aa/FA}V7$mO7=C7ސot Db]/hBZ AP|Au.4y/M}$r|!_ϯIkBW yUJAWLAŎ2^gflAy]2AҥҹTT:x^Au4ʋOyC͝Ľ.4i6๓(Wg\3]/tO4Mł&'{*$ijeEdt.(MPjJOC)^RF.;ON`\tq rGٓAvC$["OJ$C;md3&s!ۣ'S̭z K| +O8;qV4i˵bs%؉6 j+?y endstream endobj 209 0 obj @@ -1191,12 +1188,12 @@ r endstream endobj 218 0 obj -<> +<> endobj 219 0 obj <> stream -Concrete Beam AnalysisConemco EngineeringTypst 0.15.1en2026-09-03T20:37:34-04:002026-09-03T20:37:34-04:002application/pdfLV3i1VpQNYDMq1s3457ZEQ==6OKHFztuOUXX7fYilLhfDw==proof1.7 +Concrete Beam AnalysisConemco EngineeringTypst 0.15.1en2026-09-21T12:44:08-04:002026-09-21T12:44:08-04:002application/pdfZKKY70e37OpYXWBmV77P8g==6OKHFztuOUXX7fYilLhfDw==proof1.7 endstream endobj 220 0 obj @@ -1413,20 +1410,20 @@ xref 0000034595 00000 n 0000034672 00000 n 0000035131 00000 n -0000039890 00000 n -0000039972 00000 n -0000040745 00000 n -0000050159 00000 n -0000054744 00000 n -0000056402 00000 n -0000056809 00000 n -0000057152 00000 n -0000104750 00000 n -0000171864 00000 n -0000172035 00000 n -0000173289 00000 n +0000039895 00000 n +0000039977 00000 n +0000040750 00000 n +0000050164 00000 n +0000054749 00000 n +0000056407 00000 n +0000056814 00000 n +0000057157 00000 n +0000104755 00000 n +0000171869 00000 n +0000172040 00000 n +0000173294 00000 n trailer -<> +<> startxref -173474 +173479 %%EOF \ No newline at end of file diff --git a/concrete-beam/concrete-beam.typ b/concrete-beam/concrete-beam.typ index 697813b..3092571 100644 --- a/concrete-beam/concrete-beam.typ +++ b/concrete-beam/concrete-beam.typ @@ -28,51 +28,51 @@ Simple-span rectangular beam under uniform gravity load. Numbers come from `calc polygon(fill: black, (0pt, 0pt), (8pt, 10pt), (-8pt, 10pt)), ) #v(2pt) - #text(size: 9pt)[#n.span_ft ft simple span · #n.bw_in in × #n.h_in in section] + #text(size: 9pt)[#n.span ft simple span · #n.bw in × #n.h in section] ] } #figure( beam-sketch, - caption: [#n.span_ft ft simply supported beam, #n.bw_in in × #n.h_in in rectangular section.], + caption: [#n.span ft simply supported beam, #n.bw in × #n.h in rectangular section.], ) == Loads and Beam Demand -#calcline([$L = #n.span_ft " ft"$], [Simple span]) -#calcline([$B_t = #n.tributary_ft " ft"$], [Tributary width]) -#calcline([$D = #n.D_psf " psf"$], [Dead load including superimposed dead]) -#calcline([$L_L = #n.L_psf " psf"$], [Live load]) -#calcline([$w_("sw") = #round(n.self_weight_klf, digits: 3) " kip/ft"$], [Beam self-weight]) +#calcline([$L = #n.span " ft"$], [Simple span]) +#calcline([$B_t = #n.tributary " ft"$], [Tributary width]) +#calcline([$D = #n.D " psf"$], [Dead load including superimposed dead]) +#calcline([$L_L = #n.L " psf"$], [Live load]) +#calcline([$w_("sw") = #round(n.self_weight, digits: 3) " kip/ft"$], [Beam self-weight]) #calcline( - [$w_u = 1.2 w_D + 1.6 w_L = #round(n.wu_klf, digits: 3) " kip/ft"$], + [$w_u = 1.2 w_D + 1.6 w_L = #round(n.wu, digits: 3) " kip/ft"$], [Factored uniform line load], ) #calcline( - [$M_u = w_u L^2 / 8 = #round(n.Mu_kipft) " kip·ft"$], + [$M_u = w_u L^2 / 8 = #round(n.Mu) " kip·ft"$], [Maximum positive moment], ) #calcline( - [$V_u = w_u L / 2 = #round(n.Vu_kip) " kip"$], + [$V_u = w_u L / 2 = #round(n.Vu) " kip"$], [Support shear], ) == Flexural Strength -#calcline([$b_w = #n.bw_in " in"$], [Beam width]) -#calcline([$h = #n.h_in " in"$], [Overall depth]) -#calcline([$d = #n.d_in " in"$], [Effective depth]) -#calcline([$f'_c = #n.fc_ksi " ksi"$], [Concrete compressive strength]) -#calcline([$f_y = #n.fy_ksi " ksi"$], [Steel yield strength]) -#calcline([$A_s = #n.As_in2 " in"^2$], [Provided tension steel (2 No. 5)]) +#calcline([$b_w = #n.bw " in"$], [Beam width]) +#calcline([$h = #n.h " in"$], [Overall depth]) +#calcline([$d = #n.d " in"$], [Effective depth]) +#calcline([$f'_c = #n.fc " ksi"$], [Concrete compressive strength]) +#calcline([$f_y = #n.fy " ksi"$], [Steel yield strength]) +#calcline([$A_s = #n.As " in"^2$], [Provided tension steel (2 No. 5)]) #calcline( - [$a = A_s f_y / (0.85 f'_c b_w) = #round(n.a_in, digits: 3) " in"$], + [$a = A_s f_y / (0.85 f'_c b_w) = #round(n.a, digits: 3) " in"$], [Equivalent compression-block depth], ) #calcline([$epsilon_t = #round(n.et, digits: 4)$], [Net tensile strain]) #calcline([$phi = #round(n.phi, digits: 2)$], [Strength reduction factor]) #calcline( - [$phi M_n = phi A_s f_y (d - a/2) = #round(n.phiMn_kipft) " kip·ft"$], + [$phi M_n = phi A_s f_y (d - a/2) = #round(n.phiMn) " kip·ft"$], [Design flexural strength], ) @@ -89,8 +89,8 @@ Simple-span rectangular beam under uniform gravity load. Numbers come from `calc == Minimum Steel and Concrete Shear -#calcline([$A_("s,min") = #round(n.As_min_in2, digits: 3) " in"^2$], [Minimum longitudinal steel]) -#calcline([$A_("s,prov") = #round(n.As_in2, digits: 3) " in"^2$], [Provided longitudinal steel]) +#calcline([$A_("s,min") = #round(n.As_min, digits: 3) " in"^2$], [Minimum longitudinal steel]) +#calcline([$A_("s,prov") = #round(n.As, digits: 3) " in"^2$], [Provided longitudinal steel]) #v(7pt) #check( @@ -104,8 +104,8 @@ Simple-span rectangular beam under uniform gravity load. Numbers come from `calc ) #v(10pt) -#calcline([$V_c = 2 sqrt(f'_c) b_w d = #round(n.Vc_kip) " kip"$], [Concrete shear strength]) -#calcline([$phi V_c = #round(n.phiVc_kip) " kip"$], [Design concrete shear strength]) +#calcline([$V_c = 2 sqrt(f'_c) b_w d = #round(n.Vc) " kip"$], [Concrete shear strength]) +#calcline([$phi V_c = #round(n.phiVc) " kip"$], [Design concrete shear strength]) #v(7pt) #check( diff --git a/concrete-beam/input.yaml b/concrete-beam/input.yaml index a172770..698db78 100644 --- a/concrete-beam/input.yaml +++ b/concrete-beam/input.yaml @@ -1,15 +1,15 @@ project: "Deer Creek Shoring" prepared_by: "Conemco Engineering" -span_ft: 16 -tributary_ft: 6.25 -D_psf: 55 -L_psf: 20 -bw_in: 8 -h_in: 12 -d_in: 9.5 -fc_ksi: 3.0 -fy_ksi: 60 -As_in2: 0.62 -concrete_pcf: 150 +span: "16 ft" +tributary: "6.25 ft" +D: "55 psf" +L: "20 psf" +bw: "8 in" +h: "12 in" +d: "9.5 in" +fc: "3.0 ksi" +fy: "60 ksi" +As: "0.62 in**2" +concrete_density: "150 pcf" load_combination: "1.2D + 1.6L" diff --git a/concrete-beam/results.json b/concrete-beam/results.json index c4a0513..db84d98 100644 --- a/concrete-beam/results.json +++ b/concrete-beam/results.json @@ -4,30 +4,30 @@ "project": "Deer Creek Shoring", "prepared_by": "Conemco Engineering", "values": { - "span_ft": 16.0, - "tributary_ft": 6.25, - "D_psf": 55.0, - "L_psf": 20.0, - "self_weight_klf": 0.1, - "wD_klf": 0.44375, - "wL_klf": 0.125, - "wu_klf": 0.7325, - "Mu_kipft": 23.44, - "Vu_kip": 5.86, - "bw_in": 8.0, - "h_in": 12.0, - "d_in": 9.5, - "fc_ksi": 3.0, - "fy_ksi": 60.0, - "As_in2": 0.62, - "a_in": 1.823529, + "span": 16.0, + "tributary": 6.25, + "D": 55.0, + "L": 20.0, + "self_weight": 0.1, + "wD": 0.44375, + "wL": 0.125, + "wu": 0.7325, + "Mu": 23.44, + "Vu": 5.86, + "bw": 8.0, + "h": 12.0, + "d": 9.5, + "fc": 3.0, + "fy": 60.0, + "As": 0.62, + "a": 1.823529, "et": 0.010285, "phi": 0.9, - "Mn_kipft": 26.623529, - "phiMn_kipft": 23.961176, - "As_min_in2": 0.253333, - "Vc_kip": 8.325383, - "phiVc_kip": 6.244037 + "Mn": 26.623529, + "phiMn": 23.961176, + "As_min": 0.253333, + "Vc": 8.325383, + "phiVc": 6.244037 }, "checks": { "flexure": { diff --git a/concrete-beam/test_concrete_beam.py b/concrete-beam/test_concrete_beam.py index c30b0fb..ad4ad51 100644 --- a/concrete-beam/test_concrete_beam.py +++ b/concrete-beam/test_concrete_beam.py @@ -23,24 +23,24 @@ def result(): def test_example_demands(result): v = result["values"] - assert v["self_weight_klf"] == pytest.approx(0.1) - assert v["wu_klf"] == pytest.approx(0.7325) - assert v["Mu_kipft"] == pytest.approx(23.44) - assert v["Vu_kip"] == pytest.approx(5.86) + assert v["self_weight"] == pytest.approx(0.1) + assert v["wu"] == pytest.approx(0.7325) + assert v["Mu"] == pytest.approx(23.44) + assert v["Vu"] == pytest.approx(5.86) def test_example_flexure(result): v = result["values"] - assert v["a_in"] == pytest.approx(1.823529, rel=1e-5) + assert v["a"] == pytest.approx(1.823529, rel=1e-5) assert v["et"] == pytest.approx(0.010283, rel=1e-3) assert v["phi"] == pytest.approx(0.9) - assert v["phiMn_kipft"] == pytest.approx(23.961176, rel=1e-5) + assert v["phiMn"] == pytest.approx(23.961176, rel=1e-5) assert result["checks"]["flexure"]["ok"] is True def test_example_min_steel_and_shear(result): v = result["values"] - assert v["As_min_in2"] == pytest.approx(0.253333, rel=1e-4) - assert v["phiVc_kip"] == pytest.approx(6.244016, rel=1e-4) + assert v["As_min"] == pytest.approx(0.253333, rel=1e-4) + assert v["phiVc"] == pytest.approx(6.244016, rel=1e-4) assert result["checks"]["minimum_steel"]["ok"] is True assert result["checks"]["shear"]["ok"] is True