Skip to content

Commit

Permalink
4)TD&HVDC AR preventive
Browse files Browse the repository at this point in the history 
Signed-off-by: arnaud <[email protected]>
  • Loading branch information
@ARnDOSrte
ARnDOSrte committed Dec 12, 2023
1 parent fb1c01b commit cdb4da5
Show file tree
Hide file tree
Showing 29 changed files with 208 additions and 14 deletions.
70 changes: 60 additions & 10 deletions metrix-simulator/src/calculecrirecontraintesdodu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,13 +474,37 @@ int Calculer::ecrireContraintesDeBordTransformateurDephaseur()
}

// Ajout des variables x+ et x- pour penaliser le dephasage autour de la position initiale
// // x+
// pbX_[numVarTd] = 0.0;
// pbXmin_[numVarTd] = 0.0;
// pbXmax_[numVarTd] = max(puiMax - td->puiCons_, 0.);
// pbCoutLineaire_[numVarTd] = (config::configuration().usePenalisationTD() && !td->fictif_)
// ? config::configuration().costTd()
// : config::constants::zero_cost_variable;
// pbTypeDeBorneDeLaVariable_[numVarTd] = VARIABLE_BORNEE_DES_DEUX_COTES;

// if (pbXmax_[numVarTd] - pbXmin_[numVarTd] < config::constants::epsilon) {
// pbTypeDeBorneDeLaVariable_[numVarTd] = VARIABLE_FIXE;
// }

// // x-
// pbX_[numVarTd + 1] = 0.0;
// pbXmin_[numVarTd + 1] = 0.0;
// pbXmax_[numVarTd + 1] = max(td->puiCons_ - puiMin, 0.);
// pbCoutLineaire_[numVarTd + 1] = (config::configuration().usePenalisationTD() && !td->fictif_)
// ? config::configuration().costTd()
// : config::constants::zero_cost_variable;
// pbTypeDeBorneDeLaVariable_[numVarTd + 1] = VARIABLE_BORNEE_DES_DEUX_COTES;

// x+
pbX_[numVarTd] = 0.0;
pbXmin_[numVarTd] = 0.0;
pbXmax_[numVarTd] = max(puiMax - td->puiCons_, 0.);
pbCoutLineaire_[numVarTd] = (config::configuration().usePenalisationTD() && !td->fictif_)
? config::configuration().costTd()
: config::constants::zero_cost_variable;
if (config::configuration().usePenalisationTD() && !td->fictif_){
pbCoutLineaire_[numVarTd] = (td->coutTD_ > 0.0)
? td->coutTD_
: config::configuration().costTd();
}else {pbCoutLineaire_[numVarTd] = config::constants::zero_cost_variable;}
pbTypeDeBorneDeLaVariable_[numVarTd] = VARIABLE_BORNEE_DES_DEUX_COTES;

if (pbXmax_[numVarTd] - pbXmin_[numVarTd] < config::constants::epsilon) {
Expand All @@ -491,9 +515,14 @@ int Calculer::ecrireContraintesDeBordTransformateurDephaseur()
pbX_[numVarTd + 1] = 0.0;
pbXmin_[numVarTd + 1] = 0.0;
pbXmax_[numVarTd + 1] = max(td->puiCons_ - puiMin, 0.);
pbCoutLineaire_[numVarTd + 1] = (config::configuration().usePenalisationTD() && !td->fictif_)
? config::configuration().costTd()
: config::constants::zero_cost_variable;
if (config::configuration().usePenalisationTD() && !td->fictif_){
if (td->coutTD_ > 0.0){
std::cout<<td->quadVrai_->nom_<<" : coutTD non nul, vaut "<<td->coutTD_<<std::endl;
}
pbCoutLineaire_[numVarTd + 1] = (td->coutTD_ > 0.0)
? td->coutTD_
: config::configuration().costTd();
}else {pbCoutLineaire_[numVarTd + 1] = config::constants::zero_cost_variable;}
pbTypeDeBorneDeLaVariable_[numVarTd + 1] = VARIABLE_BORNEE_DES_DEUX_COTES;


Expand All @@ -514,17 +543,38 @@ int Calculer::ecrireContraintesDeBordLignesCC()
numVarCc = lcc->numVar_;

// Ajout des variables x+ et x- pour avoir la plus petite variation de transit possible autour de P0
// // x+
// pbX_[numVarCc] = 0.0;
// pbXmin_[numVarCc] = 0.0;
// pbCoutLineaire_[numVarCc] = (config::configuration().usePenalisationHVDC()) ? config::configuration().costHvdc()
// : 0.;
// // x-
// pbX_[numVarCc + 1] = 0.0;
// pbXmin_[numVarCc + 1] = 0.0;
// pbCoutLineaire_[numVarCc + 1] = (config::configuration().usePenalisationHVDC())
// ? config::configuration().costHvdc()
// : 0.;

// x+
pbX_[numVarCc] = 0.0;
pbXmin_[numVarCc] = 0.0;
pbCoutLineaire_[numVarCc] = (config::configuration().usePenalisationHVDC()) ? config::configuration().costHvdc()
if (lcc->coutLigneCC_ != 0.0){
std::cout<<"LCC "<<lcc->nom_<<" : coutLigneCC non nul vaut "<<lcc->coutLigneCC_<<std::endl;
pbCoutLineaire_[numVarCc] = lcc->coutLigneCC_;
}else{
std::cout<<"LCC "<<lcc->nom_<<" : coutLigneCC = 0.0"<<std::endl;
pbCoutLineaire_[numVarCc] = (config::configuration().usePenalisationHVDC()) ? config::configuration().costHvdc()
: 0.;
}
// x-
pbX_[numVarCc + 1] = 0.0;
pbXmin_[numVarCc + 1] = 0.0;
pbCoutLineaire_[numVarCc + 1] = (config::configuration().usePenalisationHVDC())
? config::configuration().costHvdc()
: 0.;
if (lcc->coutLigneCC_ != 0.0){
pbCoutLineaire_[numVarCc + 1] = lcc->coutLigneCC_;
}else{
pbCoutLineaire_[numVarCc + 1] = (config::configuration().usePenalisationHVDC()) ? config::configuration().costHvdc()
: 0.;
}

if (lcc->type_ == LigneCC::PILOTAGE_PUISSANCE_IMPOSE || lcc->type_ == LigneCC::PILOTAGE_EMULATION_AC) {
pbXmax_[numVarCc] = 0.;
Expand Down
24 changes: 24 additions & 0 deletions metrix-simulator/src/config/variant_configuration.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ VariantConfiguration::VariantConfiguration(const std::string& pathname) :
std::make_pair(
"COUEFFAR",
std::bind(&VariantConfiguration::processCostConsoAr, this, std::placeholders::_1, std::placeholders::_2)),
std::make_pair(
"COUTLCC",
std::bind(&VariantConfiguration::processVariantCostLCC, this, std::placeholders::_1, std::placeholders::_2)),
std::make_pair(
"COUTTD",
std::bind(&VariantConfiguration::processVariantCostTD, this, std::placeholders::_1, std::placeholders::_2)),
std::make_pair(
"QUADIN",
std::bind(&VariantConfiguration::processLine, this, std::placeholders::_1, std::placeholders::_2)),
Expand Down Expand Up @@ -351,6 +357,24 @@ void VariantConfiguration::processLine(VariantConfig& variant, std::istringstrea
LOG(debug) << metrix::log::verbose_config << "Variant " << variant.num << " : line " << sub_line << " unavailable";
}

void VariantConfiguration::processVariantCostLCC(VariantConfig& variant, std::istringstream& iss) const
{
auto hvdc = extractDouble(iss);
variant.variantCostHvdc.push_back(hvdc);

LOG(debug) << metrix::log::verbose_config << "Variant " << variant.num << " : hvdc " << std::get<NAME>(hvdc)
<< " Cost at " << std::get<VALUE>(hvdc);
}

void VariantConfiguration::processVariantCostTD(VariantConfig& variant, std::istringstream& iss) const
{
auto td = extractDouble(iss);
variant.variantCostTd.push_back(td);

LOG(debug) << metrix::log::verbose_config << "Variant " << variant.num << " : td " << std::get<NAME>(td)
<< " Cost at " << std::get<VALUE>(td);
}

void VariantConfiguration::processHVDCPmax(VariantConfig& variant, std::istringstream& iss) const
{
auto line = extractDouble(iss);
Expand Down
4 changes: 4 additions & 0 deletions metrix-simulator/src/config/variant_configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ class VariantConfiguration
std::vector<double_value> pminGroups;
std::map<CostType, std::vector<double_value>> costs;

std::vector<double_value> variantCostHvdc;
std::vector<double_value> variantCostTd;
std::vector<std::string> unavailableLines;
std::vector<double_value> pmaxHvdc;
std::vector<double_value> pminHvdc;
Expand Down Expand Up @@ -118,6 +120,8 @@ class VariantConfiguration
void processCostConso(VariantConfig& variant, std::istringstream& iss) const;
void processCostConsoHr(VariantConfig& variant, std::istringstream& iss) const;
void processCostConsoAr(VariantConfig& variant, std::istringstream& iss) const;
void processVariantCostLCC(VariantConfig& variant, std::istringstream& iss) const;
void processVariantCostTD(VariantConfig& variant, std::istringstream& iss) const;
void processImposedGroup(VariantConfig& variant, std::istringstream& iss) const;
void processGroupPmax(VariantConfig& variant, std::istringstream& iss) const;
void processGroupPmin(VariantConfig& variant, std::istringstream& iss) const;
Expand Down
8 changes: 4 additions & 4 deletions metrix-simulator/src/metrix2assess.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ int Calculer::metrix2Assess(const std::shared_ptr<Variante>& var, const vector<d
} else {
priseFinale = config::constants::valdef;
}
fprintf(fr, "R5 ;;%s;%.2f;%d; \n", s.c_str(), td->power2Angle(val), priseFinale);
fprintf(fr, "R5 ;;%s;%.4f;%d; \n", s.c_str(), td->power2Angle(val), priseFinale);
}
// ecriture : R5B: Td en mode curatif
//--------------
Expand Down Expand Up @@ -1225,13 +1225,13 @@ int Calculer::metrix2Assess(const std::shared_ptr<Variante>& var, const vector<d
if (itVm != vmHvdc.end() && varMargGlob < itVm->second) {
varMargGlob = itVm->second;
}
fprintf(fr, ("R6 ;;%s;" + PREC_FLOAT + ";%.3f;\n").c_str(), nom.c_str(), val, -varMargGlob);
fprintf(fr, ("R6 ;;%s;" + PREC_FLOAT_BIS + ";%.4f;\n").c_str(), nom.c_str(), val, -varMargGlob);
if (config::inputConfiguration().useAllOutputs()) {
auto valHR = ligne->puiCons_ + pbXhR_[numVar] - pbXhR_[numVar + 1];
fprintf(fr, "R6 ;;%s;%.1f;%.3f;%.3f;%.1f;\n", nom.c_str(), val, -varMargPrev, -varMargGlob, valHR);
fprintf(fr, "R6 ;;%s;%.4f;%.4f;%.4f;%.4f;\n", nom.c_str(), val, -varMargPrev, -varMargGlob, valHR);
}
} else {
fprintf(fr, ("R6 ;;%s;" + PREC_FLOAT + ";;\n").c_str(), nom.c_str(), val);
fprintf(fr, ("R6 ;;%s;" + PREC_FLOAT_BIS + ";;\n").c_str(), nom.c_str(), val);
}
}

Expand Down
42 changes: 42 additions & 0 deletions metrix-simulator/src/reseau.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1891,6 +1891,11 @@ int Reseau::modifReseau(const std::shared_ptr<Variante>& var)
elem.first->puiCons_ = elem.second;
}

for (auto& elem : var->dcVariantCost_) {
const auto& lcc = elem.first;
lcc->coutLigneCC_ = elem.second;
}

// Vérification PCons, Pmin et Pmax (si pilotage puissance imposée)
// ----------------------------------------------------------------
for (auto lIt = LigneCCs_.cbegin(); lIt != LigneCCs_.end(); ++lIt) {
Expand All @@ -1912,6 +1917,11 @@ int Reseau::modifReseau(const std::shared_ptr<Variante>& var)
td->puiCons_ = elem.second;
}

for (auto& elem : var->tdVariantCost_) {
const auto& td = elem.first;
td->coutTD_ = elem.second;
}

// XIV-Seuils des quadripoles
//----------------------------
for (const auto& elem : var->quati00mn_) {
Expand Down Expand Up @@ -2284,6 +2294,13 @@ int Reseau::resetReseau(const std::shared_ptr<Variante>& var, bool toutesConsos)
<< " est remis a jour a son etat de base";
}

for (auto lccIt = var->dcVariantCost_.cbegin(); lccIt != var->dcVariantCost_.end(); ++lccIt) {
const auto& lcc = lccIt->first;
lcc->coutLigneCC_ = 0.0;

LOG(debug) << "le coût de la liaison HVDC : " << lcc->nom_ << " est remis a jour a son etat de base";
}

// XII-dephasage des TDs
//----------------------
for (auto tdIt = var->dtValDep_.cbegin(); tdIt != var->dtValDep_.end(); ++tdIt) {
Expand All @@ -2294,6 +2311,13 @@ int Reseau::resetReseau(const std::shared_ptr<Variante>& var, bool toutesConsos)
LOG(debug) << "le dephasage du TD : " << td->quadVrai_->nom_ << " est remis a jour a son etat de base";
}

for (auto tdIt = var->tdVariantCost_.cbegin(); tdIt != var->tdVariantCost_.end(); ++tdIt) {
const auto& td = tdIt->first;
td->coutTD_ = 0.0;

LOG(debug) << "le coût du TD: " << td->num_ << " est remis a jour a son etat de base";
}

// XIV - Bilans zonaux
//--------------------
int numRegion = -1;
Expand Down Expand Up @@ -2938,6 +2962,24 @@ void Reseau::updateVariant(MapQuadinVar& mapping, const config::VariantConfigura
}
}

for (const auto& line : config.variantCostHvdc) {
const auto& str = std::get<VariantConfiguration::NAME>(line);
auto lccIt = LigneCCs_.find(str);
if (lccIt != LigneCCs_.end()) {
auto var_dbl = std::get<VariantConfiguration::VALUE>(line);
variant->dcVariantCost_.insert(std::pair<std::shared_ptr<LigneCC>, double>(lccIt->second, var_dbl));
}
}

for (const auto& quad : config.variantCostTd) {
const auto& str = std::get<VariantConfiguration::NAME>(quad);
auto tdIt = TransfoDephaseurs_.find(str);
if (tdIt != TransfoDephaseurs_.end()) {
auto var_dbl = std::get<VariantConfiguration::VALUE>(quad);
variant->tdVariantCost_.insert(std::pair<std::shared_ptr<TransformateurDephaseur>, double>(tdIt->second, var_dbl));
}
}

for (const auto& line : config.pmaxHvdc) {
const auto& str = std::get<VariantConfiguration::NAME>(line);
auto lccIt = LigneCCs_.find(str);
Expand Down
2 changes: 2 additions & 0 deletions metrix-simulator/src/reseau.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ class TransformateurDephaseur
int uppran_; /* borne maximale de variation de prises du td */
std::set<int> incidentsAtraiterCuratif_; // indices des incidents a traiter en curatif
int numVar_ = -1; // numero de la position de sa consigne en N dans le vecteur variable
double coutTD_ = 0.0; // coût des TDs (Seulement pour les TNRs)
int numVarEntiere_ = -1; // numero de la variable entiere d'activation (td fictif)

TransformateurDephaseur(int unsigned num,
Expand Down Expand Up @@ -524,6 +525,7 @@ class LigneCC : public Connexion
double coeffPertesEx_; // %pertes dans la station Ex
double r_; // resistance du cable DC
double vdc_; // tension du cable DC
double coutLigneCC_ = 0.0; /* coût des LCCs (Seulement pour les TNRs)*/

int numVar_ = -1; // numero de la position de sa consigne en N dans le vecteur variable
std::set<int> incidentsAtraiterCuratif_; // indices des incidents a traiter en curatif
Expand Down
5 changes: 5 additions & 0 deletions metrix-simulator/src/variante.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,13 @@ class Variante
std::map<std::shared_ptr<Groupe>, double> grpHausseAR_; /*cout a la hausse AR: numero grp, valeur*/
std::map<std::shared_ptr<Groupe>, double> grpBaisseAR_; /*cout a la baisse AR: numero grp, valeur*/

std::map<std::shared_ptr<LigneCC>, double> dcVariantCost_; /*Cout de transit sur liaisons DC (POUR TESTS SEULEMENT)*/
std::map<std::shared_ptr<LigneCC>, double> dcPuissMin_; /*puissance minimale de liaisons DC*/
std::map<std::shared_ptr<LigneCC>, double> dcPuissMax_; /*puissance minimale de liaisons DC*/
std::map<std::shared_ptr<LigneCC>, double> dcPuissImp_; /*consigne de puissance imposée de la liaison DC*/

std::map<std::shared_ptr<TransformateurDephaseur>, double> tdVariantCost_; /*Cout de transit sur TDs (POUR TESTS SEULEMENT)*/

std::map<std::shared_ptr<TransformateurDephaseur>, double> dtValDep_; /*dephasage initial du TD*/

std::map<std::shared_ptr<Incident>, double> probabinc_; /* probabilite de défaut */
Expand Down Expand Up @@ -94,6 +97,8 @@ class Variante
int nbCoutEfface() const { return static_cast<int>(coutEfface_.size()); }
int nbCoutEffaceHr() const { return static_cast<int>(coutEffaceHr_.size()); }
int nbCoutEffaceAr() const { return static_cast<int>(coutEffaceAr_.size()); }
int nbDcVariantCost() const { return static_cast<int>(dcVariantCost_.size()); }
int nbTdVariantCost() const { return static_cast<int>(tdVariantCost_.size()); }
int nbIndispoLignes() const { return static_cast<int>(indispoLignes_.size()); }
int nbDcPuissMin() const { return static_cast<int>(dcPuissMin_.size()); }
int nbDcPuissMax() const { return static_cast<int>(dcPuissMax_.size()); }
Expand Down
3 changes: 3 additions & 0 deletions ...simulator/tests/sirius/connexite/incident_rompant_connexite_avec_preventif/VariantSet.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ NT;6;
2;CTORDR;4;FSSV.O11_G;10;FSSV.O12_G;10;FVALDI11_G;9.9999;FVERGE11_G;10;
2;QATI5MNS;1;FS.BIS1 FSSV.O1 1;150;
2;GROURAND;4;FVALDI11_G;FVERGE11_G;FSSV.O12_G;FSSV.O11_G;
2;COUTTD;1;FP.AND1 FTDPRA1 1;0.0099;
3;PRODIM;1;FVERGE11_G;420;
3;CTORDR;4;FSSV.O11_G;10;FSSV.O12_G;10;FVALDI11_G;10;FVERGE11_G;10;
3;QATI5MNS;1;FS.BIS1 FSSV.O1 1;240;
3;GROURAND;4;FSSV.O12_G;FSSV.O11_G;FVALDI11_G;FVERGE11_G;
3;COUTTD;1;FP.AND1 FTDPRA1 1;0.0099;
4;PRODIM;1;FVERGE11_G;420;
4;CTORDR;4;FSSV.O11_G;10;FSSV.O12_G;10;FVALDI11_G;10;FVERGE11_G;10;
4;QATI5MNS;1;FS.BIS1 FSSV.O1 1;240;
Expand All @@ -22,3 +24,4 @@ NT;6;
5;QATI5MNS;1;FS.BIS1 FSSV.O1 1;240;
5;DTVALDEP;1;FP.AND1 FTDPRA1 1;26;
5;GROURAND;4;FVERGE11_G;FVALDI11_G;FSSV.O11_G;FSSV.O12_G;
5;COUTTD;1;FP.AND1 FTDPRA1 1;0.0099;
1 change: 1 addition & 0 deletions ...-simulator/tests/sirius/connexite/incidents_rompant_connexite_avec_parades/VariantSet.csv
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions metrix-simulator/tests/sirius/connexite/pb_inc_rompant_connex/VariantSet.csv
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions metrix-simulator/tests/sirius/curatif/contraintes_equivalentes/VariantSet.csv
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions metrix-simulator/tests/sirius/curatif/fermeture_ligne_et_TD_en_curatif/VariantSet.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ NT;3;
1;QATI5MNS;2;FS.BIS1 FSSV.O1 2;350;FP.AND1 FTDPRA1 1;250;
1;GROURAND;4;FSSV.O11_G;FSSV.O12_G;FVALDI11_G;FVERGE11_G;
1;COUBHR;2;FSSV.O11_G;-0.0001;FSSV.O12_G;0;
1;COUTTD;1;FP.AND1 FTDPRA1 1;0.0099;
2;CONELE;2;FSSV.O1_15;0;FVALDI1_11;700;
2;COUBAR;4;FSSV.O11_G;100;FSSV.O12_G;100;FVALDI11_G;100;FVERGE11_G;100;
2;COUHAR;4;FSSV.O11_G;100;FSSV.O12_G;100;FVALDI11_G;100;FVERGE11_G;100;
Expand All @@ -24,3 +25,4 @@ NT;3;
2;QATITAMN;2;FSSV.O1 FP.AND1 1;350;FP.AND1 FTDPRA1 1;250;
2;GROURAND;4;FVALDI11_G;FVERGE11_G;FSSV.O12_G;FSSV.O11_G;
2;COUBHR;2;FSSV.O12_G;-0.0001;FSSV.O11_G;0;
2;COUTTD;1;FP.AND1 FTDPRA1 1;0.0099;
3 changes: 3 additions & 0 deletions metrix-simulator/tests/sirius/curatif/limitation_nb_actions/VariantSet.csv
View file

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions metrix-simulator/tests/sirius/curatif/parades_et_TD/VariantSet.csv
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions metrix-simulator/tests/sirius/divers/contrainte_sans_action_possible_opf/VariantSet.csv
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions metrix-simulator/tests/sirius/divers/probleme_bornes_ecart_1/VariantSet.csv
View file

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions metrix-simulator/tests/sirius/divers/resultats_surcharges_uniquement/VariantSet.csv
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions metrix-simulator/tests/sirius/divers/tres_long/VariantSet.csv
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions metrix-simulator/tests/sirius/divers/variations_marginales/VariantSet.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ NT;3;
1;CTORDR;2;FSSV.O11_G;-0.0001;FSSV.O12_G;0;
1;COUHAR;1;FVERGE11_G;100;
1;COUBAR;1;FSSV.O12_G;-10;
1;COUTLCC;1;HVDC1;0.0999;
2;QATI5MNS;1;FS.BIS1 FSSV.O1 2;400;
2;DCMAXPUI;1;HVDC1;90;
2;GROURAND;4;FVALDI11_G;FVERGE11_G;FSSV.O12_G;FSSV.O11_G;
2;CTORDR;2;FSSV.O12_G;-0.0001;FSSV.O11_G;0;
2;COUHAR;1;FVERGE11_G;99.9999;
2;COUBAR;1;FSSV.O12_G;-0.0001;
2;COUTLCC;1;HVDC1;0.0999;
2 changes: 2 additions & 0 deletions metrix-simulator/tests/sirius/divers/variations_marginales_with_offset/VariantSet.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ NT;3;
1;CTORDR;2;FSSV.O11_G;-0.0001;FSSV.O12_G;0;
1;COUHAR;1;FVERGE11_G;100;
1;COUBAR;1;FSSV.O12_G;-10;
1;COUTLCC;1;HVDC1;0.0999;
2;QATI5MNS;1;FS.BIS1 FSSV.O1 2;400;
2;DCMAXPUI;1;HVDC1;90;
2;GROURAND;4;FVALDI11_G;FVERGE11_G;FSSV.O12_G;FSSV.O11_G;
2;CTORDR;2;FSSV.O12_G;-0.0001;FSSV.O11_G;0;
2;COUHAR;1;FVERGE11_G;99.9999;
2;COUBAR;1;FSSV.O12_G;-0.0001;
2;COUTLCC;1;HVDC1;0.0999;
3 changes: 3 additions & 0 deletions metrix-simulator/tests/sirius/effacements/delestage_charges_negatives/VariantSet.csv
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions metrix-simulator/tests/sirius/hvdc/hvdcEmulAC_et_seuil_ITAM/VariantSet.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ NT;7;
1;GROURAND;4;FSSV.O11_G;FSSV.O12_G;FVALDI11_G;FVERGE11_G;
2;DCIMPPUI;1;HVDC2;-500;
2;GROURAND;4;FVALDI11_G;FVERGE11_G;FSSV.O12_G;FSSV.O11_G;
2;COUTTD;1;FP.AND1 FTDPRA1 1;0.0099;
3;CONELE;2;FSSV.O1_1;0;FVALDI1_1;960;
3;DCIMPPUI;2;HVDC1;0;HVDC2;0;
3;GROURAND;4;FSSV.O12_G;FSSV.O11_G;FVALDI11_G;FVERGE11_G;
3;COUTTD;1;FP.AND1 FTDPRA1 1;0.0099;
4;CONELE;2;FSSV.O1_1;0;FVALDI1_1;960;
4;DCIMPPUI;2;HVDC1;0;HVDC2;500;
4;DCMAXPUI;1;HVDC2;500;
Expand All @@ -23,3 +25,4 @@ NT;7;
6;DCIMPPUI;2;HVDC1;-200;HVDC2;500;
6;DCMAXPUI;1;HVDC2;500;
6;GROURAND;4;FVERGE11_G;FVALDI11_G;FSSV.O11_G;FSSV.O12_G;
6;COUTTD;1;FP.AND1 FTDPRA1 1;0.0099;
1 change: 1 addition & 0 deletions metrix-simulator/tests/sirius/hvdc/incidentHvdcCuratif/VariantSet.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ NT;2;
0;QATI5MNS;13;FP.AND1 FTDPRA1 1;153.141;FTDPRA1 FVERGE1 2;229.711;FVALDI1 FTDPRA1 2;229.711;FVALDI1 FTDPRA1 1;229.711;FTDPRA1 FVERGE1 1;229.711;FSSV.O1 FP.AND1 2;229.711;FP.AND1 FVERGE1 1;229.711;FS.BIS1 FSSV.O1 2;191.426;FSSV.O1 FP.AND1 1;229.711;FP.AND1 FVERGE1 2;229.711;FS.BIS1 FSSV.O1 1;191.426;FS.BIS1 FVALDI1 1;191.426;FS.BIS1 FVALDI1 2;191.426;
0;COUHAR;4;FSSV.O11_G;100;FSSV.O12_G;100;FVALDI11_G;100;FVERGE11_G;100;
0;GROURAND;4;FSSV.O12_G;FSSV.O11_G;FVALDI11_G;FVERGE11_G;
0;COUTLCC;1;HVDC1;0.0999;
1;CONELE;2;FSSV.O1_2;0;FVALDI1_1;960;
1;PRODIM;3;FSSV.O11_G;0;FSSV.O12_G;960;FVALDI11_G;0;
1;QATI00MN;13;FP.AND1 FTDPRA1 1;153.141;FTDPRA1 FVERGE1 2;229.711;FVALDI1 FTDPRA1 2;229.711;FVALDI1 FTDPRA1 1;229.711;FTDPRA1 FVERGE1 1;229.711;FSSV.O1 FP.AND1 2;229.711;FP.AND1 FVERGE1 1;229.711;FS.BIS1 FSSV.O1 2;191.426;FSSV.O1 FP.AND1 1;229.711;FP.AND1 FVERGE1 2;229.711;FS.BIS1 FSSV.O1 1;191.426;FS.BIS1 FVALDI1 1;191.426;FS.BIS1 FVALDI1 2;191.426;
Expand Down
Loading

0 comments on commit cdb4da5

Please sign in to comment.