Skip to content

Commit

Permalink
Fix output variable PROFIT for thermal clusters (#1767)
Browse files Browse the repository at this point in the history
* [DEV] Set thetaInf value to match constraint value

* [DEV] Revert thetainf changes

* [DEV] Add pmin to thermal cluster

* [DEV] Add pmin to resultatsHoraires

* [DEV] Add move pmin to PRODUCTION_THERMIQUE_OPTIMAL

* [DEV] Use PuissanceMinDuPalierThermique

* [DEV] Check if PuissanceDisponibleEtCout is empty

* [DEV] if syntax

* [DEV] use PMinOfClusters

* [DEV] Clean comments

* [DEV] use PuissanceMinDuPalierThermique

* Revert "[DEV] use PuissanceMinDuPalierThermique"

This reverts commit 8580847.

---------

Co-authored-by: Florian OMNES <[email protected]>
  • Loading branch information
flomnes committed Nov 20, 2023
1 parent b11cd6b commit a03a912
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/solver/variable/economy/profitByPlant.h
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,10 @@ class ProfitByPlant : public Variable::IVariable<ProfitByPlant<NextT>, NextT, VC
auto* cluster = state.area->thermal.clusters[clusterIndex];
double hourlyClusterProduction
= thermal[area->index].thermalClustersProductions[clusterIndex];
double pMin = thermal[area->index].PMinOfClusters[clusterIndex];
// Thermal cluster profit
pValuesForTheCurrentYear[numSpace][cluster->areaWideIndex].hour[hourInTheYear]
= (hourlyClusterProduction - cluster->PthetaInf[hourInTheYear])
= (hourlyClusterProduction - pMin)
* (-areaMarginalCosts[hourInTheWeek]
- cluster->marginalCost
* cluster->modulation[Data::thermalModulationCost][hourInTheYear]);
Expand Down

0 comments on commit a03a912

Please sign in to comment.