Catch EMS variables initialized after reference, follow-up #11551
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -310,6 +310,10 @@ void BeginEnvrnInitializeRuntimeLanguage(EnergyPlusData &state) | |
| if (state.dataRuntimeLang->ErlVariable(ErlVariableNum).Value.initialized) { | ||
| state.dataRuntimeLang->ErlVariable(ErlVariableNum).Value = | ||
| SetErlValueNumber(0.0, state.dataRuntimeLang->ErlVariable(ErlVariableNum).Value); | ||
|
|
||
| if (!state.dataRuntimeLang->ErlVariable(ErlVariableNum).Value.SetupInit) { | ||
| state.dataRuntimeLang->ErlVariable(ErlVariableNum).Value.initialized = false; | ||
| } | ||
| } | ||
| } | ||
| // reinitialize state of actuators | ||
|
|
@@ -976,7 +980,7 @@ void WriteTrace(EnergyPlusData &state, int const StackNum, int const Instruction | |
| std::string LineString; | ||
| std::string cValueString; | ||
| std::string TimeString; | ||
| std::string OccurrenceTimingInfo; | ||
|
|
||
| if ((!state.dataRuntimeLang->OutputFullEMSTrace) && (!state.dataRuntimeLang->OutputEMSErrors) && (!seriousErrorFound)) { | ||
| return; | ||
|
|
@@ -1004,19 +1008,27 @@ void WriteTrace(EnergyPlusData &state, int const StackNum, int const Instruction | |
|
|
||
| // put together timestamp info | ||
| if (state.dataGlobal->WarmupFlag) { | ||
| if (!state.dataGlobal->SetupFlag) { | ||
| if (!state.dataGlobal->DoingSizing) { | ||
| OccurrenceTimingInfo = " During Warmup, Occurrence info="; | ||
| } else { | ||
| OccurrenceTimingInfo = " During Warmup & Sizing, Occurrence info="; | ||
| } | ||
| } else { | ||
| if (!state.dataGlobal->DoingSizing) { | ||
| OccurrenceTimingInfo = " During Setup, Occurrence info="; | ||
| } else { | ||
| OccurrenceTimingInfo = " During Setup & Sizing, Occurrence info="; | ||
| } | ||
| } | ||
| } else { | ||
| if (!state.dataGlobal->DoingSizing) { | ||
| OccurrenceTimingInfo = " Occurrence info="; | ||
| } else { | ||
| OccurrenceTimingInfo = " During Sizing, Occurrence info="; | ||
| } | ||
| } | ||
| TimeString = OccurrenceTimingInfo + state.dataEnvrn->EnvironmentName + ", " + state.dataEnvrn->CurMnDy + ' ' + CreateSysTimeIntervalString(state); | ||
|
|
||
| if (state.dataRuntimeLang->OutputFullEMSTrace || (state.dataRuntimeLang->OutputEMSErrors && (ReturnValue.Type == Value::Error))) { | ||
| print(state.files.edd, "{},Line {},{},{},{}\n", NameString, LineNumString, LineString, cValueString, TimeString); | ||
|
|
@@ -1806,19 +1818,17 @@ ErlValueType EvaluateExpression(EnergyPlusData &state, int const ExpressionNum, | |
| } | ||
|
|
||
| } else if (thisOperand.Type == Value::Variable) { | ||
| auto &thisErlVar = state.dataRuntimeLang->ErlVariable(thisOperand.Variable); | ||
|
Collaborator
Author
There was a problem hiding this comment. Remove const since we may be updating |
||
| if (thisErlVar.Value.initialized) { // check that value has been initialized | ||
| thisOperand = thisErlVar.Value; | ||
| } else { // value has never been set | ||
|
|
||
| ReturnValue.Type = Value::Error; | ||
| ReturnValue.Error = "EvaluateExpression: Variable = '" + thisErlVar.Name + "' used in expression has not been initialized!"; | ||
| // Use SetupInit in BeginEnvrnInitializeRuntimeLanguage for "un-initializing" Erl variables that may have been | ||
| // initialized to zero during setup. This can happen since SetupSimulation does not call BeginNewEnvironment. | ||
| thisErlVar.Value.SetupInit = false; | ||
|
Collaborator
Author
There was a problem hiding this comment. Revert the change from #11409, and instead just add this single line. |
||
| if (!state.dataGlobal->DoingSizing && !state.dataGlobal->KickOffSimulation && !state.dataEMSMgr->FinishProcessingUserInput) { | ||
|
|
||
| // check if this is an arg in CurveValue, | ||
| if (thisErlExpression.Operator != | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -77655,43 +77655,6 @@ | |
| Flr_1_Stor_DT2, !- <none> | ||
| Flr_1_Waiting_DT2; !- <none> | ||
|
|
||
|
Comment on lines
-77658
to
-77693
Collaborator
Author
There was a problem hiding this comment. This reverts the IDF additions from #11409. |
||
| !- =========== ALL OBJECTS IN CLASS: ENERGYMANAGEMENTSYSTEM:OUTPUTVARIABLE =========== | ||
|
|
||
| EnergyManagementSystem:OutputVariable, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7948,6 +7948,10 @@ | |
| SET SumReliefMCT = SumReliefMCT + (h_Relief_3 * mdotRelief_3 ), !- <none> | ||
| SET SumReliefMCT = SumReliefMCT + (h_Relief_4 * mdotRelief_4 ); !- <none> | ||
|
|
||
| EnergyManagementSystem:Program, | ||
| InitializeRoofTemperature, !- Name | ||
| Set Troof = 0.0; !- Program Line 1 | ||
|
|
||
| EnergyManagementSystem:Program, | ||
| InitializeParameters, !- Name | ||
| Set CV_Height = 1.0, !- Program Line 1 | ||
|
|
@@ -8066,10 +8070,8 @@ | |
|
|
||
| EnergyManagementSystem:GlobalVariable, | ||
| Troof, !- Erl Variable 1 Name | ||
|
Comment on lines
-8069
to
-8070
Collaborator
Author
There was a problem hiding this comment. This reverts the IDF additions from #11409. |
||
| CV_Height, !- Erl Variable 2 Name | ||
| CV_crossSectArea, !- Erl Variable 3 Name | ||
| C_v, !- <none> | ||
| rhoAir, !- <none> | ||
| CpAir, !- <none> | ||
|
|
@@ -8100,6 +8102,11 @@ | |
| Set NatBouyMC = rhoAir * C_d * A_roof * temp2 * CpAir, !- <none> | ||
| Set NatBouyMCT = NatBouyMC * Ta; !- <none> | ||
|
|
||
| EnergyManagementSystem:ProgramCallingManager, | ||
| InitializeRoofTemperatureOnBeginNewEnvironment, !- Name | ||
| BeginNewEnvironment, !- EnergyPlus Model Calling Point | ||
| InitializeRoofTemperature; !- Program Name 1 | ||
|
|
||
| EnergyManagementSystem:ProgramCallingManager, | ||
| Model Flat Roof Microclimate, !- Name | ||
| BeginTimestepBeforePredictor, !- EnergyPlus Model Calling Point | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7279,6 +7279,11 @@ | |
|
|
||
| !- =========== ALL OBJECTS IN CLASS: ENERGYMANAGEMENTSYSTEM:PROGRAMCALLINGMANAGER =========== | ||
|
|
||
| EnergyManagementSystem:ProgramCallingManager, | ||
| init calling manager, !- Name | ||
| BeginNewEnvironment, !- EnergyPlus Model Calling Point | ||
| init; !- Program Name 1 | ||
|
|
||
| EnergyManagementSystem:ProgramCallingManager, | ||
| attic_unvented_1_duct_leakage_imbalance_infil_program calling manager, !- Name | ||
| BeginZoneTimestepAfterInitHeatBalance, !- EnergyPlus Model Calling Point | ||
|
|
@@ -7336,6 +7341,13 @@ | |
|
|
||
| !- =========== ALL OBJECTS IN CLASS: ENERGYMANAGEMENTSYSTEM:PROGRAM =========== | ||
|
|
||
| EnergyManagementSystem:Program, | ||
| init, !- Name | ||
| Set CENTRAL_AC_AND_FURNACE_AIRLOOP_0_DUCTIMBALLKSUPFANEQUIVDZ = 0.0, !- Program Line 1 | ||
| Set CENTRAL_AC_AND_FURNACE_AIRLOOP_0_DUCTIMBALLKEXHFANEQUIVDZ = 0.0, !- Program Line 2 | ||
| Set CENTRAL_AC_AND_FURNACE_AIRLOOP_0_DUCTIMBALLKSUPFANEQUIVCOND = 0.0, !- <none> | ||
| Set CENTRAL_AC_AND_FURNACE_AIRLOOP_0_DUCTIMBALLKEXHFANEQUIVCOND = 0.0; !- <none> | ||
|
|
||
| EnergyManagementSystem:Program, | ||
| attic_unvented_1_duct_leakage_imbalance_infil_program, !- Name | ||
| Set Qducts = 0, !- Program Line 1 | ||
|
|
@@ -7785,11 +7797,6 @@ | |
| EnergyManagementSystem:GlobalVariable, | ||
| natural_vent_program_Qwhf; !- Erl Variable 1 Name | ||
|
|
||
|
Comment on lines
-7788
to
-7791
Collaborator
Author
There was a problem hiding this comment. This reverts the IDF additions from #11409. |
||
| !- =========== ALL OBJECTS IN CLASS: ENERGYMANAGEMENTSYSTEM:OUTPUTVARIABLE =========== | ||
|
|
||
| EnergyManagementSystem:OutputVariable, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right before BeginNewEnvironment, "un-initialize" any Erl variables that had originally hit the
EvaluateExpression: Variable = 'xyz' used in expression has not been initialized!error. If BeginNewEnvironment initializes them, theninitializedis set back to true and we're good; if it doesn't, or there are other legitimate Erl variable initialization errors, theEvaluateExpression ...will throw.