-
Notifications
You must be signed in to change notification settings - Fork 57
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Costing Unification: reorganize classes and consistent calculation of capital annualization #1299
Conversation
… / factor_capital_annualization consistency check
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1299 +/- ##
=======================================
Coverage 94.24% 94.25%
=======================================
Files 371 370 -1
Lines 37943 37952 +9
=======================================
+ Hits 35761 35770 +9
Misses 2182 2182 ☔ View full report in Codecov by Sentry. |
Per discussion, maybe we should rename |
… adding docstring for add_cost_factor
…costing package documentationt
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Fixes: #1134 (part 3 of 3)
Summary/Motivation:
This PR completes the reorganization of WaterTAP's costing framework.
Changes proposed in this PR:
WaterTAPCosting
andZeroOrderCosting
packages to base classfactor_capital_annualization
to standardize the namecapital_recovery_factor
in both packages. Also renamesfactor_maintenance_labor_chemical
andfactor_total_investment
tomaintenance_labor_chemical_factor
andtotal_investment_factor
, respectively, for consistency withcapital_recovery_factor
,utilization_factor
, etc.wacc
/plant_lifetime
are fixed andcapital_recovery_factor
is calculated. A warning is raised during initialization of the costing package if exactly two of these three variables is not fixed.factor_capital_annualization
(nowcapital_recovery_factor
) on theWaterTAPCosting
package.WaterTAPCostingDetailed
, which has the same variables / parameters as theZeroOrderCosting
package, but the same assumptions as theWaterTAPCosting
package. TheZeroOrderCosting
package now inherits fromWaterTAPCostingDetailed
.WaterTAPCostingDetailed
and the new handling of capital annualization factor.Legal Acknowledgement
By contributing to this software project, I agree to the following terms and conditions for my contribution: