Using optional restart loading instead of extra.

This commit is contained in:
Joakim Hove
2017-04-11 14:42:32 +02:00
parent 39f9d0e397
commit 527c0a9e75
2 changed files with 23 additions and 22 deletions

View File

@@ -175,29 +175,29 @@ void solutionToSim( const data::Solution& sol,
state.getCellData("SSOL") = sol.data("SSOL");
}
if ( extra.find("SOMAX") != extra.end() ) {
if ( sol.has("SOMAX")) {
state.registerCellData("SOMAX", 1);
state.getCellData("SOMAX") = extra.find("SOMAX")->second;
state.getCellData("SOMAX") = sol.data("SOMAX");
}
if ( extra.find("PCSWM_OW") != extra.end() ) {
if ( sol.has("PCSWM_OW")) {
state.registerCellData("PCSWMDC_OW", 1);
state.getCellData("PCSWMDC_OW") = extra.find("PCSWM_OW")->second;
state.getCellData("PCSWMDC_OW") = sol.data("PCSWM_OW");
}
if ( extra.find("KRNSW_OW") != extra.end() ) {
if ( sol.has("KRNSW_OW")) {
state.registerCellData("KRNSWMDC_OW", 1);
state.getCellData("KRNSWMDC_OW") = extra.find("KRNSW_OW")->second;
state.getCellData("KRNSWMDC_OW") = sol.data("KRNSW_OW");
}
if ( extra.find("PCSWM_GO") != extra.end() ) {
if ( sol.has("PCSWM_GO")) {
state.registerCellData("PCSWMDC_GO", 1);
state.getCellData("PCSWMDC_GO") = extra.find("PCSWM_GO")->second;
state.getCellData("PCSWMDC_GO") = sol.data("PCSWM_GO");
}
if ( extra.find("KRNSW_GO") != extra.end() ) {
if ( sol.has("KRNSW_GO")) {
state.registerCellData("KRNSWMDC_GO", 1);
state.getCellData("KRNSWMDC_GO") = extra.find("KRNSW_GO")->second;
state.getCellData("KRNSWMDC_GO") = sol.data("KRNSW_GO");
}
}