Code

Issue2885 fan coil unit controls#3627

Code

Open

JayHuLBL wants to merge 115 commits intomasterlbl-srg/modelica-buildings:masterfrom issue2885_FanCoilUnitControlslbl-srg/modelica-buildings:issue2885_FanCoilUnitControlsCopy head branch name to clipboard

+5,079

Commits

Commits on Sep 1, 2020

• Merge pull request #20 from lbl-srg/master

  Show description for a432926
  karthikeyad-pnnl

  authored
  a432926

Commits on Jun 7, 2021

• Merge remote-tracking branch 'upstream/master'

  karthikeyad-pnnl

  committed
  3b2b6ca

Commits on Sep 15, 2021

• Merge remote-tracking branch 'upstream/master'

  karthikeyad-pnnl

  committed
  7f9c083

Commits on Oct 6, 2021

• Merge remote-tracking branch 'upstream_local/master'

  karthikeyad-pnnl

  committed
  b8b08fe

Commits on Oct 25, 2021

• Merge branch 'lbl-srg:master' into master

  karthikeyad-pnnl

  authored
  53454bf

Commits on Nov 9, 2021

• Merge branch 'lbl-srg:master' into master

  karthikeyad-pnnl

  authored
  45d798b

Commits on Jan 26, 2022

• Merge branch 'lbl-srg:master' into master

  karthikeyad-pnnl

  authored
  ec99cc6

Commits on Feb 14, 2022

• Merge branch 'lbl-srg:master' into master

  karthikeyad-pnnl

  authored
  b5ae2ff

Commits on Feb 15, 2022

• Added packages for fan coil unit control sequences

  karthikeyad-pnnl

  committed
  0709671

Commits on Mar 8, 2022

• Backing up files

  karthikeyad-pnnl

  committed
  2fd6809

Commits on Mar 15, 2022

• Backing up files

  karthikeyad-pnnl

  committed
  d680a40

Commits on Mar 17, 2022

• Updated formatting

  karthikeyad-pnnl

  committed
  0eb59d0

Commits on Mar 19, 2022

• Added documentation sections and updated formatting

  karthikeyad-pnnl

  committed
  d14ded5

Commits on Mar 22, 2022

• Updated documentation and validation model for main controller

  karthikeyad-pnnl

  committed
  f7aae21

Commits on Mar 27, 2022

• Added control logic diagrams to information sections

  karthikeyad-pnnl

  committed
  9e1c512

• Updated package.order files

  karthikeyad-pnnl

  committed
  aced90f

Commits on Mar 28, 2022

• Added simulation settings to validation models

  karthikeyad-pnnl

  committed
  242f261

Commits on Mar 30, 2022

• Fixed newlines at end of mos file

  karthikeyad-pnnl

  committed
  3636340

Commits on Mar 31, 2022

• Adding unit test results for main FCU controller

  karthikeyad-pnnl

  committed
  b573ce1

• Removed example icon file extension from Modelica Standard Library

  karthikeyad-pnnl

  committed
  60c97db

• Added unit test results for subsequences

  karthikeyad-pnnl

  committed
  d344a80

• Updated file spacing

  karthikeyad-pnnl

  committed
  ec27366

Commits on Apr 4, 2022

• Updated stop time in validation model settings to correspond to stop time in mos file

  karthikeyad-pnnl

  committed
  477025d

Commits on Apr 15, 2022

• Updated models based on feedback during presentation

  karthikeyad-pnnl

  committed
  2732a20

• Removed redubndant pre blocks

  karthikeyad-pnnl

  committed
  6d090a6

Commits on Apr 30, 2022

• Added model for plant requests from G36 package on lbl-srg/modelica-buildings:issue1913_g36_final

  karthikeyad-pnnl

  committed
  bd59301

Commits on May 3, 2022

• Added request generation block to fan coil unit controls package

  karthikeyad-pnnl

  committed
  aea0310

Commits on May 7, 2022

• Updated controller with plant request module

  karthikeyad-pnnl

  committed
  188e5b7

• Updated formatting

  karthikeyad-pnnl

  committed
  cb7e9eb

Commits on May 9, 2022

• Updated unit test results

  karthikeyad-pnnl

  committed
  d4ac322

• Updated package order files

  karthikeyad-pnnl

  committed
  3a6d90b

• Removed unused files for G36 single-zone AHU plant requests

  karthikeyad-pnnl

  committed
  bb39593

Commits on Sep 12, 2022

• Merge remote-tracking branch 'upstream/issue2885_FanCoilUnitControls' into issue2885_FanCoilUnitControls

  karthikeyad-pnnl

  committed
  f842463

• Updated have_coolingCoil to have_cooCoi

  karthikeyad-pnnl

  committed
  8921f6a

• Fixed validation models with have_cooCoi

  karthikeyad-pnnl

  committed
  6d6176e

• Replaced user-defined parameter for have_heatingCoil with two parameters have_hotWatCoi and have_eleHeaCoi

  karthikeyad-pnnl

  committed
  ee6f300

• Updated parameter comments

  karthikeyad-pnnl

  committed
  9362122

Commits on Sep 13, 2022

• Addeed information sections to packages. Removed non-required parameter assignments. Removed simulation experiment annotations

  karthikeyad-pnnl

  committed
  1eeb084

• Added protected statement to reduce output variables in results file

  karthikeyad-pnnl

  committed
  58c41f2

• Updated text display settings for all control blocks

  karthikeyad-pnnl

  committed
  11cc01e

Commits on Nov 16, 2022

• Merge branch 'issue2885_FanCoilUnitControls' into modelica-buildings/issue2885_FanCoilUnitControls

  terrancelu92

  committed
  a95e635

• Renamed the parameter heaSpeMin, heaSpeMax to heaSpe_min, heaSpe_max

  terrancelu92

  committed
  9fc8535

• Renamed the group name parameters

  terrancelu92

  committed
  2c7d8ea

• Renamed the comments of the heaDea

  terrancelu92

  committed
  8a355ba

• Changed the instance name isOcc to notUno.

  terrancelu92

  committed
  8ab9778

• Changed surfix _min, _max to lower cases

  terrancelu92

  committed
  fcbbb7c

• Changed the parameter name heaPerMin, heaPerMax to uHea_min, uHea_max, as well as the cooling loop parameters.

  terrancelu92

  committed
  3362fa6

Commits on Nov 17, 2022

• Changed the variable name in the intro figure

  terrancelu92

  committed
  4c101af

• Changed the min/max parameter names

  terrancelu92

  committed
  34ae94a

• Add spaces in the info

  terrancelu92

  committed
  792e189

• Changed the naming from TZonSetHea to TZonHeaSet

  terrancelu92

  committed
  9a01585

• Changed the naming from TZonSetHea to TZonHeaSet in the example file

  terrancelu92

  committed
  e762a9e

• Changed the name of cooPerMax/heaPerMax to uCoo_max/uHea_max

  terrancelu92

  committed
  5b4fffe

• Change the naming of min/max parameters

  terrancelu92

  committed
  097a782

• Correct the documentation error

  terrancelu92

  committed
  d3ddb2b

• Translate the variable name to detailed value

  terrancelu92

  committed
  8b30c8c

• Update SupplyAirTemperature.png

  terrancelu92

  committed
  35902ae

Commits on Nov 21, 2022

• Merge remote-tracking branch 'upstream/issue2885_FanCoilUnitControls' into issue2885_FanCoilUnitControls

  karthikeyad-pnnl

  committed
  e74839d

• Merge remote-tracking branch 'upstream/master' into issue2885_FanCoilUnitControls

  karthikeyad-pnnl

  committed
  ca54aac

• Merge branch 'master' into issue2885_FanCoilUnitControls

  terrancelu92

  committed
  f6fa1bc

• Merge branch 'issue2885_FanCoilUnitControls' of github.com:terrancelu92/modelica-buildings into terrancelu92-issue2885_FanCoilUnitControls

  karthikeyad-pnnl

  committed
  dba6ea8

• Merge branch 'terrancelu92-issue2885_FanCoilUnitControls' into issue2885_FanCoilUnitControls

  karthikeyad-pnnl

  committed
  ab5f460

Commits on Nov 28, 2022

• Updated instance names for min and max parameters. Added input interface instances to match changes in mode setpoint controller and to change zone setpoints from parameters to time-varying inputs

  karthikeyad-pnnl

  committed
  534d3c5

• Updated instance names in validation scripts. Removed non-required zero strings. Changed formatting to UTF-8 without BOM

  karthikeyad-pnnl

  committed
  f6540ab

• Updated unit test results

  karthikeyad-pnnl

  committed
  7edd0e7

Commits on Nov 30, 2022

• Changed annotation and comments for parameters

  karthikeyad-pnnl

  committed
  08b449f

• Updated fan speed logic to switch to deadband speed once the fan is enabled until the fan is proven ON

  karthikeyad-pnnl

  committed
  285ab15

• Updated unit test results

  karthikeyad-pnnl

  committed
  9c2cc04

• Updated text in documentation sections

  karthikeyad-pnnl

  committed
  41aa8cb

• Updated interface instance names

  karthikeyad-pnnl

  committed
  8273a1c

• Updated unit test results

  karthikeyad-pnnl

  committed
  3212320

• Updated documentation and images so that parameter names match across all of them. Added svg file for control diagrams

  karthikeyad-pnnl

  committed
  fdee3c4

Commits on Oct 4, 2023

• Updated names and comments of connections in FanCoilUnit folder

  junkewang001

  committed
  c40af7d

Commits on Oct 12, 2023

• Merge pull request #96 from junkewang001/issue2885_FanCoilUnitControls

  Show description for 8b45252
  karthikeyad-pnnl

  authored
  8b45252

• Updated names of the connections in validation models

  junkewang001

  committed
  d6631b0

• Merge pull request #100 from junkewang001/issue2885_FanCoilUnitControls

  Show description for 1d3ac0e
  karthikeyad-pnnl

  authored
  1d3ac0e

• Propagated the naming changes to the validation scripts

  junkewang001

  committed
  7470e82

• Merge pull request #101 from junkewang001/issue2885_FanCoilUnitControls

  Show description for f03e16c
  karthikeyad-pnnl

  authored
  f03e16c

• Updated unit test logs

  junkewang001

  committed
  0d0bb42

Commits on Oct 16, 2023

• Merge pull request #102 from junkewang001/issue2885_FanCoilUnitControls

  Show description for 4cbc0f2
  karthikeyad-pnnl

  authored
  4cbc0f2

Commits on Oct 17, 2023

• Updated interface names in the documentation sections. Added additional documentation to the plant requests subsequence validation

  karthikeyad-pnnl

  committed
  982fdb9

Commits on Jan 3, 2024

• Merge pull request #2946 from karthikeyad-pnnl/issue2885_FanCoilUnitControls

  Show description for 16f5c4b
  JayHuLBL

  authored
  16f5c4b

• Merge branch 'master' into issue2885_FanCoilUnitControls

  JayHuLBL

  committed
  1b8f91f

Commits on Jan 4, 2024

• merged master, improved implementation

  JayHuLBL

  committed
  d9b30bf

Commits on Jan 5, 2024

• removed empty lines

  JayHuLBL

  committed
  9dcbd7d

• improved comment

  JayHuLBL

  committed
  bb7b4de

• added enabling conditions

  JayHuLBL

  committed
  80101ff

Commits on Jan 9, 2024

• merged master

  JayHuLBL

  committed
  7da157c

Commits on Mar 1, 2024

• Merge branch 'master' into issue2885_FanCoilUnitControls

  JayHuLBL

  committed
  cf53ad1

Commits on Apr 8, 2024

• Updated documentation for main controller with plant request information

  karthikeyad-pnnl

  committed
  7986025

• Merge pull request #3785 from karthikeyad-pnnl/issue2885_FanCoilUnitControls

  Show description for 1046724
  JayHuLBL

  authored
  1046724

• Merge branch 'master' into issue2885_FanCoilUnitControls

  JayHuLBL

  committed
  200a174

• Merge branch 'issue2885_FanCoilUnitControls' of https://github.com/lbl-srg/modelica-buildings into issue2885_FanCoilUnitControls

  JayHuLBL

  committed
  48c213f

Commits on Apr 10, 2024

• merged master

  JayHuLBL

  committed
  51577e5

Commits on Apr 12, 2024

• merged master

  JayHuLBL

  committed
  d7a6ac1

Commits on May 2, 2024

• Merge pull request #134 from lbl-srg/issue2885_FanCoilUnitControls

  Show description for 09c6df1
  karthikeyad-pnnl

  authored
  09c6df1

Commits on May 3, 2024

• Added additional parameter for symmetry between plant and reset requests. Updated parameter group annotations. Simplified logic with hysteresis blocks

  karthikeyad-pnnl

  committed
  8062283

• Added CDL flags to annotations in main controller and submodules

  karthikeyad-pnnl

  committed
  93a5b3b

Commits on Aug 15, 2024

• Changed validation model settings to change window open status

  karthikeyad-pnnl

  committed
  44b8796

• Changed window status to open for one instance

  karthikeyad-pnnl

  committed
  245aaf8

• Updated unit test results

  karthikeyad-pnnl

  committed
  7323a47

• Updated incorrect comment on controller instance

  karthikeyad-pnnl

  committed
  0bdcaf5

Commits on Aug 22, 2024

• Merge pull request #3960 from karthikeyad-pnnl/issue2885_FanCoilUnitControls

  Show description for 64da409
  JayHuLBL

  authored
  64da409

• merged master

  JayHuLBL

  committed
  8afcba3

• improved temperature settings

  JayHuLBL

  committed
  5a7c2ea

• updated checksum

  JayHuLBL

  committed
  ddb53d3

Commits on Aug 23, 2024

• Removed connection to itself

  mwetter

  committed
  c50ec2d

• Moved layout

  mwetter

  committed
  bbacefd

• Reformatted file

  mwetter

  committed
  ab33de9

• Revised info section

  mwetter

  committed
  71f6d70

• Revised info section

  mwetter

  committed
  b477ace

Commits on Aug 27, 2024

• removed self connection [ci skip]

  JayHuLBL

  committed
  4ee7c98

Commits on Dec 18, 2024

• merged master

  JayHuLBL

  committed
  b5b1f9b

• updated release note

  JayHuLBL

  committed
  b02e46b

Commits on Dec 20, 2024

• reverted changes

  JayHuLBL

  committed
  0969c25