diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4477e83a10..17cb3478a9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 7) +set(ANTARES_VERSION_REVISION 8) set(ANTARES_VERSION_YEAR 2024) project(antares diff --git a/src/libs/antares/study/parts/short-term-storage/properties.cpp b/src/libs/antares/study/parts/short-term-storage/properties.cpp index d09b99c65a..0b997a2e77 100644 --- a/src/libs/antares/study/parts/short-term-storage/properties.cpp +++ b/src/libs/antares/study/parts/short-term-storage/properties.cpp @@ -98,9 +98,6 @@ bool Properties::loadKey(const IniFile::Property* p) if (p->key == "name") return p->value.to(this->name); - if (p->key == "storagecycle") - return p->value.to(this->cycleDuration); - if (p->key == "initiallevel") return valueForOptional(this->initialLevel); @@ -149,7 +146,6 @@ bool Properties::saveToFolder(const std::string& folder) const s->add("withdrawalnominalcapacity", this->withdrawalNominalCapacity); s->add("efficiency", this->efficiencyFactor); - s->add("storagecycle", this->cycleDuration); s->add("initialleveloptim", this->initialLevelOptim); diff --git a/src/libs/antares/study/parts/short-term-storage/properties.h b/src/libs/antares/study/parts/short-term-storage/properties.h index 933904a4e7..4d566d0d53 100644 --- a/src/libs/antares/study/parts/short-term-storage/properties.h +++ b/src/libs/antares/study/parts/short-term-storage/properties.h @@ -68,8 +68,6 @@ class Properties bool initialLevelOptim = false; // Efficiency factor between 0 and 1 double efficiencyFactor = 1; - // Cycle duration, 1 <= cycleDuration <= 168 - unsigned int cycleDuration; // Used to sort outputs Group group = Group::Other1; // cluster name diff --git a/vcpkg b/vcpkg index 9d47b24eac..e3ad383ceb 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 9d47b24eacbd1cd94f139457ef6cd35e5d92cc84 +Subproject commit e3ad383ceb886677eb181e16adeeb4d4a2c2d4c4