Add ability to simulate ASHRAE 205 representations

.github/workflows/build-and-test.yml

@@ -36,6 +36,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+        with:
+          submodules: recursive
       - name: Configure CMake
         run: cmake -P cmake/configure.cmake
       - name: Build wcmp
@@ -69,6 +71,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+        with:
+          submodules: recursive
       - name: Configure CMake
         run: cmake -P cmake/configure.cmake
       - name: Download executable artifact
@@ -78,7 +82,6 @@ jobs:
           path: msvc
       - name: Install pandoc
         run: 'cinst -y pandoc --version=1.17.2 --ia=ALLUSERS=1'
-        shell: bash
       - name: Add pandoc to path
         run: echo "C:\Program Files (x86)\Pandoc" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: Add MSVC developer commands to PATH

.github/workflows/release.yml

@@ -5,6 +5,8 @@ on:
     types:
       - created
 
+env:
+  CI_GIT_BRANCH: ${GITHUB_REF#refs/heads/}
 jobs:
   release-cse:
     name: Deploy CSE release
@@ -34,8 +36,8 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install pandoc
         run: 'cinst -y pandoc --version=1.17.2 --ia=ALLUSERS=1'
-        shell: bash
       - name: Add pandoc to path
+        shell: pwsh
         run: echo "C:\Program Files (x86)\Pandoc" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: Add MSVC developer commands to PATH
         uses: ilammy/msvc-dev-cmd@v1

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "vendor/btwxt"]
 	path = vendor/btwxt
 	url = https://github.com/bigladder/btwxt.git
+[submodule "vendor/libtk205"]
+	path = vendor/libtk205
+	url = https://github.com/open205/libtk205.git

cmake/BuildFlags.cmake

@@ -21,6 +21,7 @@ if (MSVC AND NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel"))
     /fp:precise #+Specifies floating-point behavior.
     /fp:except- # Specifies floating-point behavior.
     /arch:IA32  # Specifies the architecture for code generation (no special instructions).
+    /std:c++14  #+Enable supported C and C++ language features from the specified version of the C or C++ language standard.
   )
   string(REPLACE ";" " " CMAKE_CXX_FLAGS "${CompileCommon}")
 

src/CMakeLists.txt

@@ -133,6 +133,7 @@ set(source
   WFPAK.CPP
   XIOPAK.CPP
   YACAM.CPP
+  A205FACE.CPP
 )
 
 set(precomp
@@ -199,6 +200,7 @@ set(headers
   WFPAK.H
   XIOPAK.H
   YACAM.H
+  A205FACE.H
 )
 
 if(USE_XMODULE) # Runtime Share Library interface - Not used since Version 0.899. (Windows only)
@@ -212,6 +214,10 @@ include_directories(
   "${CMAKE_SOURCE_DIR}/vendor/Penumbra/include"
   "${CMAKE_SOURCE_DIR}/vendor/HPWHsim/src"
   "${CMAKE_BINARY_DIR}/vendor/HPWHsim/src"
+  "${CMAKE_SOURCE_DIR}/vendor/toolkit-205/schema-205/build/include"
+  "${CMAKE_SOURCE_DIR}/vendor/toolkit-205/libtk205/vendor/json/single_include"
+  "${CMAKE_SOURCE_DIR}/vendor/toolkit-205/libtk205/include"
+  "${CMAKE_SOURCE_DIR}/vendor/toolkit-205/schema-205/schema205/src"
   "${btwxt_SOURCE_DIR}/src"
 )
 
@@ -252,6 +258,7 @@ set(libs
   libHPWHsim
   libkiva
   btwxt
+  libtk205
 )
 
 source_group("Source Files" FILES ${source})

src/CNCULT.CPP

@@ -74,6 +74,7 @@ makAncMTR(MtriB);			// Meters input records basAnc
 makAncAFMTR(AfMtriB);		// Airflow meters input records basAnc
 
 // simple HVAC and DHW (for CSE T24 residential compliance)
+makAncEQUIPDATA(EDiB);			// residential HVAC system
 makAncRSYS( RSiB);			// residential HVAC system
 makAncDHWMTR( WMtriB);		// DHW meters
 makAncDHWSYS( WSiB);		// DHW system
@@ -144,6 +145,7 @@ void FC iRatsFree()	// free record storage for all input basAncs.
 	AfMtriB.free();
 	GniB.free();
 	MtriB.free();
+	EDiB.free();
 	RSiB.free();
 	WMtriB.free();
 	WSiB.free();
@@ -1575,6 +1577,20 @@ CULT()
 };	// izxT
 #undef ZFAN
 
+//========== EQUIPDATA command (ASHRAE 205 equipment data) ==============
+
+static CULT edT[] = //-------------- EQUIPDATA cmd table, used from cnTopCult
+{
+	// id                      cs   fn                        f        uc evf     ty      b    dfls                           p2   ckf
+	//"*",                   STAR,  0,                        0,       0, 0,      0,      0,   N,    0.f,                     N,   edStarCkf),
+	CULT("edFilePath",       DAT,   EQUIPDATA_FILEPATH,       RQD,     0, VEOI,   TYSTR,  0,   N,    0.f,                     N,   N),
+	CULT("edExpectedRS",     DAT,   EQUIPDATA_EXPECTEDRS,     RQD,     0, VEOI,   TYCH,   0,   N,    0.f,                     N,   N),
+	CULT("edDoValidation",   DAT,   EQUIPDATA_DOVALIDATION,   RQD,     0, VEOI,   TYCH,   0,   N,    0.f,                     N,   N),
+	CULT("endEquipmentData", ENDER, 0,                        0,       0, 0,      0,      0,   N,    0.f,                     N,   N),
+	CULT()
+};	// edT
+
+
 
 //=================== DUCTSEG command ( duct segment) ===================
 RC DUCTSEG::ds_Ckf()
@@ -1678,6 +1694,7 @@ CULT( "*",           STAR,  0,               0,       0, 0,      0,     0,
 CULT( "rsType",		 DAT,   RSYS_TYPE,		 0,       0, VEOI,   TYCH,  0,      C_RSYSTYCH_ACFURN, N, N),
 CULT( "rsDesc",		 DAT,   RSYS_DESC,       0,       0, VEOI,   TYSTR, 0,		0,		N,	 N),
 CULT( "rsPerfMap",	 DAT,	RSYS_PERFMAP,	 0,       0, VEOI,   TYCH,  0,      C_NOYESCH_NO, N, N),
+CULT( "rsRep205",    DAT,   RSYS_REP205,     0,       0, VEOI,   TYREF, &EDiB,  N,      N,   N),
 CULT( "rsFanTy",	 DAT,	RSFAN( FANTY),   0,       0, VEOI,   TYCH,  0,      C_FANTYCH_BLOWTHRU, N, N ),
 CULT( "rsFanMotTy",  DAT,   RSFAN( MOTTY),   0,       0, VEOI,   TYCH,  0,      C_MOTTYCH_PSC,  N, N ),
 CULT( "rsAdjForFanHt", DAT, RSYS_ADJFORFANHT,0,       0, VEOI,   TYCH,  0,      C_NOYESCH_YES,  N, N),
@@ -2856,6 +2873,7 @@ CULT cnTopCult[] = 		// Top level table, points to all other tables, used in cal
 	CULT( "zone",        RATE,  0,                 NM_RQD/*|RQD*/, 0, 0,  0,    &ZiB,    N,    0.f,           znT,  N),
 	CULT( "izXfer",      RATE,  0,                 0,          0, 0,      0,    &IzxiB,  N,    0.f,          izxT,  N),
 	CULT("afmeter",      RATE,  0,                 NM_RQD,     0, 0,      0,    &AfMtriB,N,    0.f,      afMeterT,  N),
+	CULT( "equipdata",   RATE,  0,                 NM_RQD,     0, 0,      0,    &EDiB,   N,    0.f,           edT,  N),
 	CULT( "rsys",        RATE,  0,                 NM_RQD,     0, 0,      0,    &RSiB,   N,    0.f,         rsysT,  N),
 	CULT( "dhwdayuse",   RATE,  0,                 NM_RQD,     0, 0,      0,    &WDUiB,  N,    0.f,    dhwDayUseT,  N),
 	CULT( "dhwmeter",    RATE,  0,                 NM_RQD,     0, 0,      0,    &WMtriB, N,    0.f,     dhwMeterT,  N),

src/CNCULT2.CPP

@@ -1455,6 +1455,7 @@ LOCAL RC topMtr()	// check/dup all types of meters (energy, dhw, airflow)
 LOCAL RC topRSys1()	// check RSYS / copy to run rat
 {
 	RC rc = RCOK;
+	CSE_E(EdR.RunDup(EDiB));		// TODO: Move to its own function?
 	CSE_E( RsR.al( RSiB.n, WRN) )	// delete old records, alloc to needed size now for min fragmentation
 	if (rc == RCOK)
 	{	RSYS* pRSi;

src/CNDTYPES.DEF

@@ -329,6 +329,12 @@ PIPESEGP -- "class PIPESEG*"	 4	    none
 			  DOE2 "DOE2"
 			  UNIFIED "Unified"
 			  }
+*choicb EDRSCH {
+			RS0002 "RS0002"
+			RS0003 "RS0003"
+			RS0004 "RS0004"
+			RS0005 "RS0005"
+			}
 *choicb RSYSMODECTRLCH {
 		    OFF "Off"
 			HEAT "Heat"

src/CNFIELDS.DEF

@@ -166,6 +166,7 @@ GROUNDMODELCH GROUNDMODELCH LMNONE   UNNONE
 FBXREFCH      FBXREFCH     LMNONE   UNNONE
 FBZREFCH      FBZREFCH     LMNONE   UNNONE
 CONVMODELCH	  CONVMODELCH  LMNONE    UNNONE
+EDRSCH        EDRSCH       LMNONE    UNNONE
 RSYSMODECTRLCH RSYSMODECTRLCH LMNONE UNNONE
 RSYSTYCH	  RSYSTYCH	   LMNONE	 UNNONE
 RSYSOAVTYCH	  RSYSOAVTYCH  LMNONE	 UNNONE

src/CNGLOB.H

@@ -494,6 +494,7 @@ struct RXPORTINFO;
 namespace Pumbra { class Penumbra; }
 namespace Kiva { class Instance; class Aggregator; class Foundation; }
 namespace Btwxt { class RegularGridInterpolator; }
+namespace tk205 { namespace RS0002_NS { class RS0002; } }
 
 
 
@@ -654,6 +655,11 @@ const double cfV = 1./2.23694;		// m/s / mph
 template< typename T> inline T VIPtoSI(T mph) { return T( mph*cfV); }
 template< typename T> inline T VSItoIP(T ms) { return T( ms/cfV); }
 
+// pressure inHg <-> Pa
+const double cfP = 3386.39;
+template< typename T> inline T inHGtoPa(T inHG) { return T(inHG * cfP); }
+template< typename T> inline T PatoinHG(T Pa) { return T(Pa / cfP); }
+
 // air mass flow <--> air volume flow
 //   amf in lbm/hr
 //   cfm in ft3/min std air

src/CNGUTS.CPP

@@ -202,6 +202,7 @@ void FC runFazDataFree()
 
 	ZrB.free(); 	// Zones runtime info
 	ZnresB.free();	// zone simulation results
+	EdR.free();   	// EQUIPDATA
 	RsResR.free();	// RSYS results
 	DsResR.free();	// DUCTSEG results
 	WsResR.free();	// DHWSYS results

src/CNGUTS.H

@@ -116,6 +116,7 @@ extern anc<DESCOND> DcR;		// design conditions
 extern anc<ZNR> ZrB;			// zones runtime info
 extern anc<ZNRES> ZnresB;      	// Zones simulation results info
 extern anc<IZXRAT> IzxR;		// interzone transfers
+extern anc<EQUIPDATA> EdR;		// ASHRAE 205 equipment data
 extern anc<RSYS> RsR;			// residential system
 extern anc<RSYSRES> RsResR;		// residential system results
 extern anc<DUCTSEG> DsR;		// duct segments