diff --git a/API/Classes/Case/DataFileClass.py b/API/Classes/Case/DataFileClass.py index b3fc9319..7841feab 100644 --- a/API/Classes/Case/DataFileClass.py +++ b/API/Classes/Case/DataFileClass.py @@ -1584,7 +1584,7 @@ def validateInputs(self, caserunname): tech_current = row['t'] if not merge102: - df_merge102 = pd.DataFrame(columns=['r', 't', 'y', 'Sum']) + df_merge102 = pd.DataFrame(columns=['r', 't', 'y', 'Sum'], dtype='object') else: df_merge102 = pd.DataFrame(merge102) diff --git a/WebAPP/Classes/Const.Class.js b/WebAPP/Classes/Const.Class.js index 7da88859..07bf1f5e 100644 --- a/WebAPP/Classes/Const.Class.js +++ b/WebAPP/Classes/Const.Class.js @@ -68,7 +68,7 @@ export const VAR_TECH_GROUPS = ['RT', 'RYT', 'RYTM', 'RYTC', 'RYTE', 'RYTEM', 'R //export const VAR_TECH_GROUPS = ['RT', 'RYT', 'RYTM', 'RYTMTs'] //export const VAR_TECH_COM_GROUPS = ['RYTC','RYTCMTs'] -export const VAR_COMM_GROUPS = ['RYTC','RYCTs','RYTCMTs'] +export const VAR_COMM_GROUPS = ['RYC', 'RYTC','RYCTs','RYTCMTs'] //export const VAR_COMM_GROUPS = ['RYCTs'] export const VAR_EMIS_GROUPS = ['RYE', 'RYTE', 'RYTEM'] diff --git a/WebAPP/DataStorage/Variables.json b/WebAPP/DataStorage/Variables.json index b489cf21..7a8312d7 100644 --- a/WebAPP/DataStorage/Variables.json +++ b/WebAPP/DataStorage/Variables.json @@ -1 +1 @@ -{"R": [{"id": "OV", "value": "Objective Value", "name": "ObjectiveValue", "unitRule": {"cat": [{"var": "number"}]}}], "RT": [{"id": "TTMPA", "value": "Total Technology Model Period Activity", "name": "TotalTechnologyModelPeriodActivity", "unitRule": {"cat": [{"var": "ActUnitId"}]}}], "RYT": [{"id": "ANC", "value": "Accumulated New Capacity", "name": "AccumulatedNewCapacity", "unitRule": {"cat": [{"var": "CapUnitId"}]}}, {"id": "AIC", "value": "Annualized Investment Cost ", "name": "AnnualizedInvestmentCost", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "CI", "value": "Capital Investment", "name": "CapitalInvestment", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "AFOC", "value": "Annual Fixed Operating Cost", "name": "AnnualFixedOperatingCost", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "AVOC", "value": "Annual Variable Operating Cost", "name": "AnnualVariableOperatingCost", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "NC", "value": "New Capacity", "name": "NewCapacity", "unitRule": {"cat": [{"var": "CapUnitId"}]}}, {"id": "NONTU", "value": "Number Of New Technology Units", "name": "NumberOfNewTechnologyUnits", "unitRule": {"cat": [{"var": "number"}]}}, {"id": "SV", "value": "Salvage Value", "name": "SalvageValue", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "TCA", "value": "Total Capacity By Technology", "name": "TotalCapacityAnnual", "unitRule": {"cat": [{"var": "CapUnitId"}]}}, {"id": "TEP", "value": "Technology Emissions Penalty", "name": "TechnologyEmissionsPenalty", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}], "RYE": [{"id": "AEL_d", "value": "Shadow price - Emissions Limit", "name": "E8_AnnualEmissionsLimit", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}, {"var": "divide"}, {"var": "EmiUnit"}]}}], "RYS": [{"id": "NSC", "value": "New Storage Capacity", "name": "NewStorageCapacity", "unitRule": {"cat": [{"var": "StgUnit"}]}}, {"id": "ANSC", "value": "Accumulated New Storage Capacity", "name": "AccumulatedNewStorageCapacity", "unitRule": {"cat": [{"var": "StgUnit"}]}}, {"id": "TSC", "value": "Total Storage Capacity", "name": "TotalStorageCapacity", "unitRule": {"cat": [{"var": "StgUnit"}]}}, {"id": "SVS", "value": "Salvage Value Storage", "name": "SalvageValueStorage", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "CIS", "value": "Capital Investment Storage", "name": "CapitalInvestmentStorage", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}], "RYC": [{"id": "EB_d", "value": "Shadow price - Energy Balance", "name": "EBb4_EnergyBalanceEachYear4_ICR", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}, {"var": "divide"}, {"var": "EmiUnit"}]}}], "RYCn": [{"id": "UDCI_d", "value": "Shadow price - UDC Inequality", "name": "UDC1_UserDefinedConstraintInequality", "unitRule": {"cat": [{"var": "number"}]}}, {"id": "UDCE_d", "value": "Shadow price - UDC Equality", "name": "UDC2_UserDefinedConstraintEquality", "unitRule": {"cat": [{"var": "number"}]}}], "RYTM": [{"id": "TATABM", "value": "Total Annual Technology Activity By Mode", "name": "TotalAnnualTechnologyActivityByMode", "unitRule": {"cat": [{"var": "ActUnitId"}]}}], "RYTC": [{"id": "ITNC", "value": "Input To New Capacity", "name": "InputToNewCapacity", "unitRule": {"cat": [{"var": "CommUnit"}]}}, {"id": "ITTC", "value": "Input To Total Capacity", "name": "InputToTotalCapacity", "unitRule": {"cat": [{"var": "CommUnit"}]}}], "RYTE": [{"id": "ATE", "value": "Annual Technology Emission", "name": "AnnualTechnologyEmission", "unitRule": {"cat": [{"var": "EmiUnit"}]}}], "RYCTs": [{"id": "D", "value": "Demand", "name": "Demand", "unitRule": {"cat": [{"var": "CommUnit"}]}}], "RYTEM": [{"id": "ATEBM", "value": "Annual Technology Emission By Mode", "name": "AnnualTechnologyEmissionByMode", "unitRule": {"cat": [{"var": "EmiUnit"}]}}, {"id": "EBAC", "value": "Emission By Activity Change", "name": "EmissionByActivityChange", "unitRule": {"cat": [{"var": "EmiUnit"}]}}], "RYTMTs": [{"id": "ROA", "value": "Rate Of Activity", "name": "RateOfActivity", "unitRule": {"cat": [{"var": "ActUnitId"}, {"var": "divide"}, {"var": "years"}]}}], "RYTCMTs": [{"id": "PBT", "value": "Production By Technology By Mode", "name": "ProductionByTechnologyByMode", "unitRule": {"cat": [{"var": "CommUnit"}]}}, {"id": "ROPBT", "value": "Rate Of Production By Technology By Mode", "name": "RateOfProductionByTechnologyByMode", "unitRule": {"cat": [{"var": "CommUnit"}, {"var": "divide"}, {"var": "years"}]}}, {"id": "ROUBT", "value": "Rate Of Use By Technology By Mode", "name": "RateOfUseByTechnologyByMode", "unitRule": {"cat": [{"var": "CommUnit"}, {"var": "divide"}, {"var": "years"}]}}, {"id": "UBT", "value": "Use By Technology By Mode", "name": "UseByTechnologyByMode", "unitRule": {"cat": [{"var": "CommUnit"}]}}]} \ No newline at end of file +{"R": [{"id": "OV", "value": "Objective Value", "name": "ObjectiveValue", "unitRule": {"cat": [{"var": "number"}]}}], "RT": [{"id": "TTMPA", "value": "Total Technology Model Period Activity", "name": "TotalTechnologyModelPeriodActivity", "unitRule": {"cat": [{"var": "ActUnitId"}]}}], "RYT": [{"id": "ANC", "value": "Accumulated New Capacity", "name": "AccumulatedNewCapacity", "unitRule": {"cat": [{"var": "CapUnitId"}]}}, {"id": "AIC", "value": "Annualized Investment Cost ", "name": "AnnualizedInvestmentCost", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "CI", "value": "Capital Investment", "name": "CapitalInvestment", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "AFOC", "value": "Annual Fixed Operating Cost", "name": "AnnualFixedOperatingCost", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "AVOC", "value": "Annual Variable Operating Cost", "name": "AnnualVariableOperatingCost", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "NC", "value": "New Capacity", "name": "NewCapacity", "unitRule": {"cat": [{"var": "CapUnitId"}]}}, {"id": "NONTU", "value": "Number Of New Technology Units", "name": "NumberOfNewTechnologyUnits", "unitRule": {"cat": [{"var": "number"}]}}, {"id": "SV", "value": "Salvage Value", "name": "SalvageValue", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "TCA", "value": "Total Capacity By Technology", "name": "TotalCapacityAnnual", "unitRule": {"cat": [{"var": "CapUnitId"}]}}, {"id": "TEP", "value": "Technology Emissions Penalty", "name": "TechnologyEmissionsPenalty", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}], "RYE": [{"id": "AEL_d", "value": "Shadow price - Emissions Limit", "name": "E8_AnnualEmissionsLimit", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}, {"var": "divide"}, {"var": "EmiUnit"}]}}], "RYS": [{"id": "NSC", "value": "New Storage Capacity", "name": "NewStorageCapacity", "unitRule": {"cat": [{"var": "StgUnit"}]}}, {"id": "ANSC", "value": "Accumulated New Storage Capacity", "name": "AccumulatedNewStorageCapacity", "unitRule": {"cat": [{"var": "StgUnit"}]}}, {"id": "TSC", "value": "Total Storage Capacity", "name": "TotalStorageCapacity", "unitRule": {"cat": [{"var": "StgUnit"}]}}, {"id": "SVS", "value": "Salvage Value Storage", "name": "SalvageValueStorage", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}, {"id": "CIS", "value": "Capital Investment Storage", "name": "CapitalInvestmentStorage", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}]}}], "RYC": [{"id": "EB_d", "value": "Shadow price - Energy Balance", "name": "EBb4_EnergyBalanceEachYear4_ICR", "unitRule": {"cat": [{"var": "milion"}, {"var": "Currency"}, {"var": "divide"}, {"var": "CommUnit"}]}}], "RYCn": [{"id": "UDCI_d", "value": "Shadow price - UDC Inequality", "name": "UDC1_UserDefinedConstraintInequality", "unitRule": {"cat": [{"var": "number"}]}}, {"id": "UDCE_d", "value": "Shadow price - UDC Equality", "name": "UDC2_UserDefinedConstraintEquality", "unitRule": {"cat": [{"var": "number"}]}}], "RYTM": [{"id": "TATABM", "value": "Total Annual Technology Activity By Mode", "name": "TotalAnnualTechnologyActivityByMode", "unitRule": {"cat": [{"var": "ActUnitId"}]}}], "RYTC": [{"id": "ITNC", "value": "Input To New Capacity", "name": "InputToNewCapacity", "unitRule": {"cat": [{"var": "CommUnit"}]}}, {"id": "ITTC", "value": "Input To Total Capacity", "name": "InputToTotalCapacity", "unitRule": {"cat": [{"var": "CommUnit"}]}}], "RYTE": [{"id": "ATE", "value": "Annual Technology Emission", "name": "AnnualTechnologyEmission", "unitRule": {"cat": [{"var": "EmiUnit"}]}}], "RYCTs": [{"id": "D", "value": "Demand", "name": "Demand", "unitRule": {"cat": [{"var": "CommUnit"}]}}], "RYTEM": [{"id": "ATEBM", "value": "Annual Technology Emission By Mode", "name": "AnnualTechnologyEmissionByMode", "unitRule": {"cat": [{"var": "EmiUnit"}]}}, {"id": "EBAC", "value": "Emission By Activity Change", "name": "EmissionByActivityChange", "unitRule": {"cat": [{"var": "EmiUnit"}]}}], "RYTMTs": [{"id": "ROA", "value": "Rate Of Activity", "name": "RateOfActivity", "unitRule": {"cat": [{"var": "ActUnitId"}, {"var": "divide"}, {"var": "years"}]}}], "RYTCMTs": [{"id": "PBT", "value": "Production By Technology By Mode", "name": "ProductionByTechnologyByMode", "unitRule": {"cat": [{"var": "CommUnit"}]}}, {"id": "ROPBT", "value": "Rate Of Production By Technology By Mode", "name": "RateOfProductionByTechnologyByMode", "unitRule": {"cat": [{"var": "CommUnit"}, {"var": "divide"}, {"var": "years"}]}}, {"id": "ROUBT", "value": "Rate Of Use By Technology By Mode", "name": "RateOfUseByTechnologyByMode", "unitRule": {"cat": [{"var": "CommUnit"}, {"var": "divide"}, {"var": "years"}]}}, {"id": "UBT", "value": "Use By Technology By Mode", "name": "UseByTechnologyByMode", "unitRule": {"cat": [{"var": "CommUnit"}]}}]} \ No newline at end of file