Merge pull request #4743 from NREL/4734-EMS-warmup-flag

issue 4734 EMS add dynamic built in variable for WarmupFlag
NREL · Mar 2, 2015 · 54e3769 · 54e3769 · nrel-bot · Mar 2, 2015
2 parents e5c9e89 + c56982e
commit 54e3769
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/EnergyPlus/RuntimeLanguageProcessor.cc b/src/EnergyPlus/RuntimeLanguageProcessor.cc
@@ -114,6 +114,7 @@ namespace RuntimeLanguageProcessor {
 	int CurrentEnvironmentPeriodNum( 0 );
 	int ActualDateAndTimeNum( 0 );
 	int ActualTimeNum( 0 );
+	int WarmUpFlagNum( 0 );
 
 	static gio::Fmt fmtLD( "*" );
 	static gio::Fmt fmtA( "(A)" );
@@ -148,6 +149,7 @@ namespace RuntimeLanguageProcessor {
 		using DataGlobals::OutputFileDebug;
 		using DataGlobals::CurrentTime;
 		using DataGlobals::TimeStepZone;
+		using DataGlobals::WarmupFlag;
 		using DataEnvironment::Year;
 		using DataEnvironment::Month;
 		using DataEnvironment::DayOfMonth;
@@ -214,6 +216,7 @@ namespace RuntimeLanguageProcessor {
 			CurrentEnvironmentPeriodNum = NewEMSVariable( "CURRENTENVIRONMENT", 0 );
 			ActualDateAndTimeNum = NewEMSVariable( "ACTUALDATEANDTIME", 0 );
 			ActualTimeNum = NewEMSVariable( "ACTUALTIME", 0 );
+			WarmUpFlagNum = NewEMSVariable( "WARMUPFLAG", 0);
 
 			GetRuntimeLanguageUserInput(); // Load and parse all runtime language objects
 
@@ -268,6 +271,11 @@ namespace RuntimeLanguageProcessor {
 
 		tmpCurEnvirNum = double( CurEnvirNum );
 		ErlVariable( CurrentEnvironmentPeriodNum ).Value = SetErlValueNumber( tmpCurEnvirNum );
+		if ( WarmupFlag ) {
+			ErlVariable( WarmUpFlagNum ).Value = SetErlValueNumber( 1.0 );
+		} else {
+			ErlVariable( WarmUpFlagNum ).Value = SetErlValueNumber( 0.0 );
+		}
 
 	}
 

diff --git a/src/EnergyPlus/RuntimeLanguageProcessor.hh b/src/EnergyPlus/RuntimeLanguageProcessor.hh
@@ -84,6 +84,7 @@ namespace RuntimeLanguageProcessor {
 	extern int CurrentEnvironmentPeriodNum;
 	extern int ActualDateAndTimeNum;
 	extern int ActualTimeNum;
+	extern int WarmUpFlagNum;
 
 	// SUBROUTINE SPECIFICATIONS: