Skip to content
This repository has been archived by the owner on Dec 23, 2020. It is now read-only.

Commit

Permalink
v2020a release (#114)
Browse files Browse the repository at this point in the history 
* update recent publications

* more recent papers

* fix

* edits to RSL description

* update refs

* fix sorting order

* add more comments

* improve formatting

* renaming

* add water for all surfaces

* minor edits

* fix subroutine

* fixed passing water use within driver subroutine

* success in implementing irrigation on all surfaces

* improve formatting

* improve formatting

* update version number: 2019b

* Regenerate build artifacts.

* update version

* update sample run for 2019b

* expose variable output level for supy driver

* update driver version

* recover legacy solweig code

* cleaning

* cleaning

* cleaning

* recover a simple version of SOLWEIG back into SUEWS

* fix output of SOLWEIG

* fix K side in SOLWEIG

* fix L side

* fix Tg by using SUEWS produced surface temperature

* update sample run

* update driver version

* Revert "cleaning"

This reverts commit 2c66410.

* add pythonn 3.8 recipe for supy_driver in azure

* add SOLWEIG output meta info csv

* include solweig into supy_driver

* cleaning

* add initialisation of wu

* several fixes in SOLWEIG

* update sample run

* update driver version

* minor change

* fix solweig part in supy driver

* refine formatting

* add build of supy-driver for python 3.8

* fix manylinux build for python 3.8

* update py3.8 path

* update sample run

* add new option for roughlenheatmethod

* update docs

* update ignore

* add a release template

* update actions

* update actions

* disable one action

* trigger fpretify

* Regenerate build artifacts.

* update issue template

* add 2020a input files

* remove binary

* update test procedure

* update build and test procedure

* cleaning

* update driver version

* update template

* update sample run

* optimise test procedure

* cleaning

* Regenerate build artifacts.

* cleaning

* implemented a ponding-allowed scheme in irrigation module; updated input files

* improve formatting

* fix a bug in initialisation of irrigation input data

* update sample run

* update docs

* update supy-driver version

* minor edits in docs

* Regenerate build artifacts.

* renaming variables for consistency

* update sample run

* update the water-to-maintain feature

* update supy version

* Regenerate build artifacts.

* update driver version

* test up-to-date numpy build

* fix numpy on many-linux

* update format

* Regenerate build artifacts.

* add irrigation fractions for non-vegetative surfaces and update sample input files (CHANGES IN SITESELECT)

* implemented irrigation fractions for non-vegetative surfaces

* update supy-driver version: irrigation fractions

* Regenerate build artifacts.

* update driver version

* update docs

* update azure pipeline for macOS version

* update mac version in pipeline

* fix a bug in multitstep for supy-driver

* update docs requirements

* simplify QF interface

* simplify QF code 1

* update test python code to include only output files

* simplify qf code

* simplify QF code

* add a new method to calculate HDD/CDD based on U-shape approach

* update docs

* cleaning

* Regenerate build artifacts.

* update supy-driver version for the HDD/CDD calculation

* fix variable naming in docs

* fix glitches in docs

* updating the docs for SUEWS_parameters (#112)

Co-authored-by: Hamidreza Omidvar <omidvar.hamidreza@gmail.com>

* stop using `gitflow`: rather tedious and less agile; remove description from README

* minor edits

* Regenerate build artifacts.

* update docs for input converter

* update docs for 2020a

* update pipeline

* update driver version. Fix #106 - Checklist for V2020a

Co-authored-by: sunt05 <sunt05@users.noreply.github.com>
Co-authored-by: Hamidreza Omidvar <omidvar.hamidreza@gmail.com>
  • Loading branch information
@sunt05 @hamidrezaomidvar
3 people authored May 15, 2020
1 parent 5a8aa85 commit 11ed2f1
Show file tree
Hide file tree
Showing 60 changed files with 971 additions and 891 deletions.
15 changes: 2 additions & 13 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ This is a public repo for SUEWS source code and documentation.
- [Developer Note](#developer-note)
- [Branch](#branch)
- [Central curated branches](#central-curated-branches)
- [Workflow](#workflow)
- [Manual](#manual)
- [Test](#test)
- [Tests and purposes](#tests-and-purposes)
- [Workflow](#workflow-1)
- [Workflow](#workflow)
- [Preparation of tests](#preparation-of-tests)
- [Debugging with GDB](#debugging-with-gdb)
- [GDB on macOS](#gdb-on-macos)
- [debugging with GDB](#debugging-with-gdb)
- [debugging with GDB](#debugging-with-gdb-1)
- [Questions](#questions)


Expand All @@ -30,8 +29,6 @@ This is a public repo for SUEWS source code and documentation.

### Branch

The SUEWS repo follows the [`GitFlow` model](https://nvie.com/posts/a-successful-git-branching-model/) to manage sustainable development.

#### Central curated branches
These branches are regularly curated by admin members with specific purposes and set with triggers for automatic deployment (via MS Azure Pipeline) in the [*releases* page](https://github.com/Urban-Meteorology-Reading/SUEWS/releases) named **Latest Release Test**:

Expand All @@ -43,14 +40,6 @@ These branches are regularly curated by admin members with specific purposes and
* `push` is restricted to admin members.


#### Workflow

Please follow the [`GitFlow` model](https://nvie.com/posts/a-successful-git-branching-model/) for development.

![`GitFlow` model](https://nvie.com/img/git-model@2x.png)



### Manual

* Please keep the development changes documented in the [Documentation repo](https://github.com/Urban-Meteorology-Reading/SUEWS-Docs).
Expand Down
1 change: 1 addition & 0 deletions Release/InputTables/2020a/RunControl.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
CBLUse=1
SnowUse=1
NetRadiationMethod=13
BaseTMethod=1
EmissionsMethod=1
StorageHeatMethod=1
OHMIncQF=0
Expand Down
2 changes: 1 addition & 1 deletion Release/InputTables/2020a/SUEWS_AnthropogenicEmission.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
Code BaseTHDD QF_A_WD QF_B_WD QF_C_WD QF_A_WE QF_B_WE QF_C_WE AHMin_WD AHMin_WE AHSlope_Heating_WD AHSlope_Heating_WE AHSlope_Cooling_WD AHSlope_Cooling_WE TCritic_Heating_WD TCritic_Heating_WE TCritic_Cooling_WD TCritic_Cooling_WE EnergyUseProfWD EnergyUseProfWE ActivityProfWD ActivityProfWE TraffProfWD TraffProfWE PopProfWD PopProfWE MinQFMetab MaxQFMetab MinFCMetab MaxFCMetab FrPDDwe FrFossilFuel_Heat FrFossilFuel_NonHeat EF_umolCO2perJ EnEF_v_Jkm FcEF_v_kgkmWD FcEF_v_kgkmWE CO2PointSource TrafficUnits
Code BaseT_HC QF_A_WD QF_B_WD QF_C_WD QF_A_WE QF_B_WE QF_C_WE AHMin_WD AHMin_WE AHSlope_Heating_WD AHSlope_Heating_WE AHSlope_Cooling_WD AHSlope_Cooling_WE TCritic_Heating_WD TCritic_Heating_WE TCritic_Cooling_WD TCritic_Cooling_WE EnergyUseProfWD EnergyUseProfWE ActivityProfWD ActivityProfWE TraffProfWD TraffProfWE PopProfWD PopProfWE MinQFMetab MaxQFMetab MinFCMetab MaxFCMetab FrPDDwe FrFossilFuel_Heat FrFossilFuel_NonHeat EF_umolCO2perJ EnEF_v_Jkm FcEF_v_kgkmWD FcEF_v_kgkmWE CO2PointSource TrafficUnits
10 18.2000 0.1000 0.0099 0.0102 0.1000 0.0099 0.0102 15.0000 15.0000 2.7000 2.7000 2.7000 2.7000 7.0000 7.0000 7.0000 7.0000 44.0000 45.0000 55663.0000 55664.0000 701.0000 702.0000 801.0000 802.0000 75.0000 175.0000 120.0000 280.0000 1.0000 0.0500 0.0000 1.1590 3970000.0000 0.2850 0.2850 0 1.0000
11 18.2000 0.3081 0.0099 0.0102 0.3081 0.0099 0.0102 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 44.0000 45.0000 55663.0000 55664.0000 701.0000 702.0000 801.0000 802.0000 75.0000 175.0000 120.0000 280.0000 1.0000 0.0500 0.0000 1.1590 4110000.0000 0.2850 0.2850 0 1.0000
551 18.2000 0.1446 0.0000 0.0037 0.1329 0.0000 0.0038 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 -999.0000 42.0000 43.0000 55663.0000 55664.0000 701.0000 702.0000 801.0000 802.0000 75.0000 175.0000 120.0000 280.0000 1.0000 0.7000 0.7000 1.1590 3970000.0000 0.2850 0.2850 0 1.0000
Expand Down
12 changes: 6 additions & 6 deletions Release/InputTables/2020a/SUEWS_Irrigation.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
Code Ie_start Ie_end InternalWaterUse Faut Ie_a1 Ie_a2 Ie_a3 Ie_m1 Ie_m2 Ie_m3 DayWat(1) DayWat(2) DayWat(3) DayWat(4) DayWat(5) DayWat(6) DayWat(7) DayWatPer(1) DayWatPer(2) DayWatPer(3) DayWatPer(4) DayWatPer(5) DayWatPer(6) DayWatPer(7)
99999 1 366 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ! No irrigation
1 152 243 0 0.2 -84.535 9.959 3.674 -25.36 2.988 1.102 1 1 1 1 1 1 1 1 1 1 1 1 1 1
550 1 366 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ! Swindon "(not used, no irrigation)"
660 1 366 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ! London (assume no irrigation at the moment)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
Code Ie_start Ie_end InternalWaterUse Faut H_maintain Ie_a1 Ie_a2 Ie_a3 Ie_m1 Ie_m2 Ie_m3 DayWat(1) DayWat(2) DayWat(3) DayWat(4) DayWat(5) DayWat(6) DayWat(7) DayWatPer(1) DayWatPer(2) DayWatPer(3) DayWatPer(4) DayWatPer(5) DayWatPer(6) DayWatPer(7)
99999 1 366 0 0 -999 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ! No irrigation
1 152 243 0 0.2 -999 -84.535 9.959 3.674 -25.36 2.988 1.102 1 1 1 1 1 1 1 1 1 1 1 1 1 1
550 1 366 0 0 -999 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ! Swindon "(not used, no irrigation)"
660 1 366 0 0 -999 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ! London (assume no irrigation at the moment)
-9
-9
Loading

0 comments on commit 11ed2f1

Please sign in to comment.