Initial commit
Merge commit '9d0f3be79e866186bf23d0c3da6427d80cf2dd64' into Achim_Geissler

Conflicts:
	Install; solved by "use theirs"
Merge branch 'master' of https://github.com/ESP-rCommunity/ESP-rSource into Achim_Geissler

# By Alex Ferguson
# Via Alex Ferguson
* 'master' of https://github.com/ESP-rCommunity/ESP-rSource:
  Adding license file.
Added bFirst_call_erv boolean variable to flag first call to ERV model.
This allows creation of new reporting variable to hold and eventually report the electricity consumption of the ERV.
Added bFirst_call_erv boolean variable to flag first call to ERV model.
This allows creation of new reporting variable to hold and eventually report the electricity consumption of the ERV.
Added ERV model: routines ERVInit() and ERVOperation() in CentralVentSys.F
Made change to existing CVS models
- Subroutine MECH_VENT_CONTROL() now has three outputs
	+ ZONE_mechvent_cond, the equivalent UA value for ventilation sensible load
	+ ZONE_mechvent_moistFlow, the equivalent flow of ambiant air resulting in the same moisture flow as transported by the supply airstream
	+ ZONE_mechvent_airFlow, the ventilation airflow
- Made changes to MZVENT() in subsys.F so that:
	+ ZMBI(ICOMP,1) corresponds to a flow of ambiant air carrying the same moisture into the zone as the ventilation supply airstream
	+ and ZMBI(ICOMP,4) corresponds to the flow of dry air out of the zone
- Changed the logic behind the temperature control of CVS: CVS now OFF when ambient temperature between T_low and T_high
- Moved zone fractions calculations to the initialisation of the CVS
- Switched exhaust air conditions calculations from the conditions of AIM2_ref_zone to a zone volume average: routine ZONEAVG(Flag)
- Grouped initialisation actions common to all CVS systems into a CVSCommonInitialisation() routine to facilitate future changes

For details of these changes, their justification, and the testing (including the ESP-r Tester), see report:
	Pinel P., Development of an ERV model for ESP-r, Submitted to NRCan, 2014
Merge branch 'patrice_ERVModel' of https://github.com/ESP-rCommunity/ESP-rSource into patrice_ERVModel
Added tester cases for mechanical ventilation model.
These cases use the CCHT house model used in the AIM2 test suite
An idealised moisture control maintaining the zones at 50% relative humidity was added.
The added cases are:
- CVS_None: No CVS
- CVS_Fan: Central ventilation fans
- HRV: Heat recovery ventilator
- ERV: Energy recovery ventilator
Merge pull request #4 from ESP-rCommunity/patrice_ERVModel

Added ERV model and modified existing CVS models.

Changes include addition of an ERV model, modifications to other CVS models, and modifications in the data passed to the zone balance routines.  Tester cases for mechanical ventilation systems were also added. See individual commits for details of changes.  See"Development of an ERV model for ESP-r" NRCan report (Sept 2014) for further details.
- Changes in models folder associated with graphic network. This
  is with current focus on master.
- Changes in databases to reflect new graphic network facilities.
Repointing ESPrSouce to a published commit in the models directory?
Repointing ESPrSource to a published commit in the data directory (hope Alex' instructions works for me, also)
Adds new flow component based on type 10 (power law), extended with  a "max flow" value and the possibility to close the connection at the set point "max flow".

This commit to make available, tests will follow.

Compile and run on OS X O.K.
Additonal edit to new afn component.

Compile and run on OS X O.K.
Slight change in new flow component logic, correction of density used. Some documentation added.

Compile on OS X O.K.
Merge branch 'afn_cmp10mod' into Achim_Geissler

* afn_cmp10mod:
  Slight change in new flow component logic, correction of density used. Some documentation added.
  Additonal edit to new afn component.
  Adds new flow component based on type 10 (power law), extended with  a "max flow" value and the possibility to close the connection at the set point "max flow".
  Repointing ESPrSource to a published commit in the data directory (hope Alex' instructions works for me, also)
  Repointing ESPrSouce to a published commit in the models directory?
  - Changes in databases to reflect new graphic network facilities.
  - Changes in models folder associated with graphic network. This   is with current focus on master.
  Added tester cases for mechanical ventilation model. These cases use the CCHT house model used in the AIM2 test suite An idealised moisture control maintaining the zones at 50% relative humidity was added. The added cases are: - CVS_None: No CVS - CVS_Fan: Central ventilation fans - HRV: Heat recovery ventilator - ERV: Energy recovery ventilator
  Added ERV model: routines ERVInit() and ERVOperation() in CentralVentSys.F Made change to existing CVS models - Subroutine MECH_VENT_CONTROL() now has three outputs 	+ ZONE_mechvent_cond, the equivalent UA value for ventilation sensible load 	+ ZONE_mechvent_moistFlow, the equivalent flow of ambiant air resulting in the same moisture flow as transported by the supply airstream 	+ ZONE_mechvent_airFlow, the ventilation airflow - Made changes to MZVENT() in subsys.F so that: 	+ ZMBI(ICOMP,1) corresponds to a flow of ambiant air carrying the same moisture into the zone as the ventilation supply airstream 	+ and ZMBI(ICOMP,4) corresponds to the flow of dry air out of the zone - Changed the logic behind the temperature control of CVS: CVS now OFF when ambient temperature between T_low and T_high - Moved zone fractions calculations to the initialisation of the CVS - Switched exhaust air conditions calculations from the conditions of AIM2_ref_zone to a zone volume average: routine ZONEAVG(Flag) - Grouped initialisation actions common to all CVS systems into a CVSCommonInitialisation() routine to facilitate future changes
  Added bFirst_call_erv boolean variable to flag first call to ERV model. This allows creation of new reporting variable to hold and eventually report the electricity consumption of the ERV.
  Added bFirst_call_erv boolean variable to flag first call to ERV model. This allows creation of new reporting variable to hold and eventually report the electricity consumption of the ERV.
  This commit corrects errors in the Install script that prevent the successful building of the full system.  These changes were made by Joe Clarke.
  Fix bug when not compiling with xml support.
  Identified and removed problem with h3k report names. The problem arose when length of passed strings was fully used. The original logic did not take this into account. Should work now.
  In h3k output of electrical nets and "ideal_havac_models" the changes in this branch have some side-effects.
  Remove whitespace in h3k-output names for air flow network. This leads to failed results in tester.pl, however is necessary to avoid name shortening due to whitespace check in *wild?() functions.
  Remove whitespace in h3k-output names for air flow network. This will likely lead to failed results in tester.pl, however is necessary to avoid name shortening due to whitespace check in *wild?() functions.
  Update Install for branch h3k_switch to the version which is working for tester script.
Merge branch 'Achim_Geissler' into AG_master

* Achim_Geissler: (1199 commits)
  Slight change in new flow component logic, correction of density used. Some documentation added.
  Additonal edit to new afn component.
  Adds new flow component based on type 10 (power law), extended with  a "max flow" value and the possibility to close the connection at the set point "max flow".
  Repointing ESPrSource to a published commit in the data directory (hope Alex' instructions works for me, also)
  Repointing ESPrSouce to a published commit in the models directory?
  - Changes in databases to reflect new graphic network facilities.
  - Changes in models folder associated with graphic network. This   is with current focus on master.
  Added tester cases for mechanical ventilation model. These cases use the CCHT house model used in the AIM2 test suite An idealised moisture control maintaining the zones at 50% relative humidity was added. The added cases are: - CVS_None: No CVS - CVS_Fan: Central ventilation fans - HRV: Heat recovery ventilator - ERV: Energy recovery ventilator
  Added ERV model: routines ERVInit() and ERVOperation() in CentralVentSys.F Made change to existing CVS models - Subroutine MECH_VENT_CONTROL() now has three outputs 	+ ZONE_mechvent_cond, the equivalent UA value for ventilation sensible load 	+ ZONE_mechvent_moistFlow, the equivalent flow of ambiant air resulting in the same moisture flow as transported by the supply airstream 	+ ZONE_mechvent_airFlow, the ventilation airflow - Made changes to MZVENT() in subsys.F so that: 	+ ZMBI(ICOMP,1) corresponds to a flow of ambiant air carrying the same moisture into the zone as the ventilation supply airstream 	+ and ZMBI(ICOMP,4) corresponds to the flow of dry air out of the zone - Changed the logic behind the temperature control of CVS: CVS now OFF when ambient temperature between T_low and T_high - Moved zone fractions calculations to the initialisation of the CVS - Switched exhaust air conditions calculations from the conditions of AIM2_ref_zone to a zone volume average: routine ZONEAVG(Flag) - Grouped initialisation actions common to all CVS systems into a CVSCommonInitialisation() routine to facilitate future changes
  Added bFirst_call_erv boolean variable to flag first call to ERV model. This allows creation of new reporting variable to hold and eventually report the electricity consumption of the ERV.
  Added bFirst_call_erv boolean variable to flag first call to ERV model. This allows creation of new reporting variable to hold and eventually report the electricity consumption of the ERV.
  This commit corrects errors in the Install script that prevent the successful building of the full system.  These changes were made by Joe Clarke.
  Fix bug when not compiling with xml support.
  Identified and removed problem with h3k report names. The problem arose when length of passed strings was fully used. The original logic did not take this into account. Should work now.
  In h3k output of electrical nets and "ideal_havac_models" the changes in this branch have some side-effects.
  Remove whitespace in h3k-output names for air flow network. This leads to failed results in tester.pl, however is necessary to avoid name shortening due to whitespace check in *wild?() functions.
  Remove whitespace in h3k-output names for air flow network. This will likely lead to failed results in tester.pl, however is necessary to avoid name shortening due to whitespace check in *wild?() functions.
  Update Install for branch h3k_switch to the version which is working for tester script.
  Adding license file.
  This commit patches the svn fetch script.
  ...
Merge branch 'AG_master' into el-net1

* AG_master:
  Slight change in new flow component logic, correction of density used. Some documentation added.
  Additonal edit to new afn component.
  Adds new flow component based on type 10 (power law), extended with  a "max flow" value and the possibility to close the connection at the set point "max flow".
  Repointing ESPrSource to a published commit in the data directory (hope Alex' instructions works for me, also)
  Repointing ESPrSouce to a published commit in the models directory?
  - Changes in databases to reflect new graphic network facilities.
  - Changes in models folder associated with graphic network. This   is with current focus on master.
  Added tester cases for mechanical ventilation model. These cases use the CCHT house model used in the AIM2 test suite An idealised moisture control maintaining the zones at 50% relative humidity was added. The added cases are: - CVS_None: No CVS - CVS_Fan: Central ventilation fans - HRV: Heat recovery ventilator - ERV: Energy recovery ventilator
  Added ERV model: routines ERVInit() and ERVOperation() in CentralVentSys.F Made change to existing CVS models - Subroutine MECH_VENT_CONTROL() now has three outputs 	+ ZONE_mechvent_cond, the equivalent UA value for ventilation sensible load 	+ ZONE_mechvent_moistFlow, the equivalent flow of ambiant air resulting in the same moisture flow as transported by the supply airstream 	+ ZONE_mechvent_airFlow, the ventilation airflow - Made changes to MZVENT() in subsys.F so that: 	+ ZMBI(ICOMP,1) corresponds to a flow of ambiant air carrying the same moisture into the zone as the ventilation supply airstream 	+ and ZMBI(ICOMP,4) corresponds to the flow of dry air out of the zone - Changed the logic behind the temperature control of CVS: CVS now OFF when ambient temperature between T_low and T_high - Moved zone fractions calculations to the initialisation of the CVS - Switched exhaust air conditions calculations from the conditions of AIM2_ref_zone to a zone volume average: routine ZONEAVG(Flag) - Grouped initialisation actions common to all CVS systems into a CVSCommonInitialisation() routine to facilitate future changes
  Added bFirst_call_erv boolean variable to flag first call to ERV model. This allows creation of new reporting variable to hold and eventually report the electricity consumption of the ERV.
  Added bFirst_call_erv boolean variable to flag first call to ERV model. This allows creation of new reporting variable to hold and eventually report the electricity consumption of the ERV.
  Initial commit