Skip to content
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.

Sign up for GitHub

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

Version 8.6.7 #2113

Merged
merged 5 commits into from
May 27, 2024
Merged

Version 8.6.7 #2113

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63fa7d1
cherry pick d2066ab
payetvin May 22, 2024
7f6f9b0
remove release tests for ubuntu
payetvin May 24, 2024
a5ea9fd
update cmakelists
payetvin May 27, 2024
ff52d78
update simtest.json
payetvin May 27, 2024
7fa93e7
revert ci tests ubuntu
payetvin May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,31 +159,31 @@ jobs:
os: ${{ matrix.test-platform }}

- name: Run medium-tests
if: ${{ env.IS_RELEASE == 'true' }}
if: ${{ env.IS_PUSH == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
batch-name: medium-tests
os: ${{ matrix.test-platform }}

- name: Run long-tests-1
if: ${{ env.IS_RELEASE == 'true' }}
if: ${{ env.IS_PUSH == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
batch-name: long-tests-1
os: ${{ matrix.test-platform }}

- name: Run long-tests-2
if: ${{ env.IS_RELEASE == 'true' }}
if: ${{ env.IS_PUSH == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
batch-name: long-tests-2
os: ${{ matrix.test-platform }}

- name: Run long-tests-3
if: ${{ env.IS_RELEASE == 'true' }}
if: ${{ env.IS_PUSH == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14) # FetchContent_MakeAvailable
# Version
set(ANTARES_VERSION_HI 8)
set(ANTARES_VERSION_LO 6)
set(ANTARES_VERSION_REVISION 6)
set(ANTARES_VERSION_REVISION 7)
set(ANTARES_VERSION_YEAR 2024)

project(antares
Expand Down
4 changes: 2 additions & 2 deletions src/solver/variable/economy/profitByPlant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +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 - pMin)
= std::max((hourlyClusterProduction - cluster->PthetaInf[hourInTheYear]), 0.)
* (-areaMarginalCosts[hourInTheWeek]
- cluster->marginalCost
* cluster->modulation[Data::thermalModulationCost][hourInTheYear]);
Expand Down
Loading