Skip to content

Commit 8999127

Browse files
A-WillsA-Wills
committed
This commit introduces V13.2.1 of 18 July 2018
Source code was updated with changes posted to http://www.esru.strath.ac.uk/Downloads/downloads.htm#ESP-r Code was updated via copy and paste from ESP-r_V13.2.1_Src.tar.gz ====================== GitHub Changes ====================== Databases have been re-integrated into the main ESP-r Source repo to ensure that database updates remain in sync with code changes. Training and validation files are to remain on the separate repo to limit space requirements ====================== Code Changes (Posted from ESRU) ====================== V13.1.1 of 4 July 2018 1. Re-release based on code taken from GitHub on 14 June 2018. V13.1.2 of 9 July 2019 1. Tidying up of the source distribution and related modifications to the Install script (but no theory changes). V13.2.1 of 18 July 2018 1. Flow networks now 3D allowing superimposition on a display of the building geometry (3D flow model examples added). 2. Feature added to automatically create flow networks from a scan of a model's surface attributes. 4. A flow visualiser added to bps to display CFD outputs per time-step. 5. The CFD flow results file extended to include contaminants. 6. Local comfort reporting in res now takes into account CFD outputs.
1 parent 71a83fb commit 8999127

File tree

555 files changed

+669293
-1987
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

555 files changed

+669293
-1987
lines changed

‎Install‎

Lines changed: 761 additions & 1327 deletions
Large diffs are not rendered by default.

‎commit.txt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
This commit introduces V13.2.1 of 18 July 2018
2+
3+
Source code was updated with changes posted to http://www.esru.strath.ac.uk/Downloads/downloads.htm#ESP-r
4+
Code was updated via copy and paste from ESP-r_V13.2.1_Src.tar.gz
5+
6+
======================
7+
GitHub Changes
8+
======================
9+
Databases have been re-integrated into the main ESP-r Source repo to ensure that
10+
database updates remain in sync with code changes.
11+
12+
Training and validation files are to remain on the separate repo to limit space requirements
13+
14+
======================
15+
Code Changes (Posted from ESRU)
16+
======================
17+
V13.1.1 of 4 July 2018
18+
1. Re-release based on code taken from GitHub on 14 June 2018.
19+
20+
V13.1.2 of 9 July 2019
21+
1. Tidying up of the source distribution and related modifications to the Install script
22+
(but no theory changes).
23+
24+
V13.2.1 of 18 July 2018
25+
1. Flow networks now 3D allowing superimposition on a display of the building geometry
26+
(3D flow model examples added).
27+
2. Feature added to automatically create flow networks from a scan of a model's surface attributes.
28+
4. A flow visualiser added to bps to display CFD outputs per time-step.
29+
5. The CFD flow results file extended to include contaminants.
30+
6. Local comfort reporting in res now takes into account CFD outputs.

‎src/Makefile‎

Lines changed: 90 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# (see README file before installing).
33
SRCdir=`pwd`
44

5-
PROGRAMS = aco bps c2e cdb clm dbm dfs e2r ecnv eco enet grd harmonizer ish mfs \
6-
mld mrt pdb prj res run vew stats
5+
PROGRAMS = aco bps c2e cdb clm dfs dfv e2r ecnv eco enet grd harmonizer ish mfs \
6+
mld mrt pdb prj res vew
77

88
allX11: libX11 $(PROGRAMS)
99
allGTK: libGTK $(PROGRAMS)
@@ -51,81 +51,81 @@ export FMIarg
5151

5252
aco:
5353
if [ "$(doInstall)" = "yes" ]; then \
54-
cd $(SRCdir)/esruaco; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
54+
cd $(SRCdir)/eaco; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
5555
else \
56-
cd $(SRCdir)/esruaco; $(MAKE); \
56+
cd $(SRCdir)/eaco; $(MAKE); \
5757
fi
5858
b2e:
5959
if [ "$(doInstall)" = "yes" ]; then \
60-
cd $(SRCdir)/esrub2e; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
60+
cd $(SRCdir)/eb2e; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
6161
else \
62-
cd $(SRCdir)/esrub2e; $(MAKE); \
62+
cd $(SRCdir)/eb2e; $(MAKE); \
6363
fi
6464
bps:
6565
if [ "$(doInstall)" = "yes" ]; then \
66-
cd $(SRCdir)/esrubps; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
66+
cd $(SRCdir)/ebps; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
6767
else \
68-
cd $(SRCdir)/esrubps; $(MAKE) theEXE; \
68+
cd $(SRCdir)/ebps; $(MAKE) theEXE; \
6969
fi
7070
bpsdll:
7171
if [ "$(doInstall)" = "yes" ]; then \
72-
cd $(SRCdir)/esrubps; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
72+
cd $(SRCdir)/ebps; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
7373
else \
74-
cd $(SRCdir)/esrubps; $(MAKE) theDLL; \
74+
cd $(SRCdir)/ebps; $(MAKE) theDLL; \
7575
fi
76-
dbm:
76+
dfs:
7777
if [ "$(doInstall)" = "yes" ]; then \
78-
cd $(SRCdir)/esrudbm; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
78+
cd $(SRCdir)/edfs; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
7979
else \
80-
cd $(SRCdir)/esrudbm; $(MAKE); \
80+
cd $(SRCdir)/edfs; $(MAKE); \
8181
fi
82-
dfs:
82+
dfv:
8383
if [ "$(doInstall)" = "yes" ]; then \
84-
cd $(SRCdir)/esrudfs; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
84+
cd $(SRCdir)/edfv; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
8585
else \
86-
cd $(SRCdir)/esrudfs; $(MAKE); \
86+
cd $(SRCdir)/edfv; $(MAKE); \
8787
fi
8888
c2e:
8989
if [ "$(doInstall)" = "yes" ]; then \
90-
cd $(SRCdir)/esruc2e; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
90+
cd $(SRCdir)/ec2e; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
9191
else \
92-
cd $(SRCdir)/esruc2e; $(MAKE); \
92+
cd $(SRCdir)/ec2e; $(MAKE); \
9393
fi
9494
cdb:
9595
if [ "$(doInstall)" = "yes" ]; then \
96-
cd $(SRCdir)/esrucdb; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
96+
cd $(SRCdir)/ecdb; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
9797
else \
98-
cd $(SRCdir)/esrucdb; $(MAKE); \
98+
cd $(SRCdir)/ecdb; $(MAKE); \
9999
fi
100100
clm:
101101
if [ "$(doInstall)" = "yes" ]; then \
102-
cd $(SRCdir)/esruclm; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
102+
cd $(SRCdir)/eclm; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
103103
else \
104-
cd $(SRCdir)/esruclm; $(MAKE); \
104+
cd $(SRCdir)/eclm; $(MAKE); \
105105
fi
106106
e2r:
107107
if [ "$(doInstall)" = "yes" ]; then \
108-
cd $(SRCdir)/esrue2r; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
108+
cd $(SRCdir)/ee2r; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
109109
else \
110-
cd $(SRCdir)/esrue2r; $(MAKE); \
110+
cd $(SRCdir)/ee2r; $(MAKE); \
111111
fi
112112
ecnv:
113113
if [ "$(doInstall)" = "yes" ]; then \
114-
cd $(SRCdir)/esrucnv; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
114+
cd $(SRCdir)/cnv; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
115115
else \
116-
cd $(SRCdir)/esrucnv; $(MAKE); \
116+
cd $(SRCdir)/cnv; $(MAKE); \
117117
fi
118118
eco:
119119
if [ "$(doInstall)" = "yes" ]; then \
120-
cd $(SRCdir)/esrueco; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
120+
cd $(SRCdir)/eeco; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
121121
else \
122-
cd $(SRCdir)/esrueco; $(MAKE); \
122+
cd $(SRCdir)/eeco; $(MAKE); \
123123
fi
124124
grd:
125125
if [ "$(doInstall)" = "yes" ]; then \
126-
cd $(SRCdir)/esrugrd; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
126+
cd $(SRCdir)/egrd; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
127127
else \
128-
cd $(SRCdir)/esrugrd; $(MAKE); \
128+
cd $(SRCdir)/egrd; $(MAKE); \
129129
fi
130130
harmonizer:
131131
if [ "$(doInstall)" = "yes" ]; then \
@@ -141,121 +141,105 @@ harmonizerdll:
141141
fi
142142
ish:
143143
if [ "$(doInstall)" = "yes" ]; then \
144-
cd $(SRCdir)/esruish; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
144+
cd $(SRCdir)/eish; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
145145
else \
146-
cd $(SRCdir)/esruish; $(MAKE); \
146+
cd $(SRCdir)/eish; $(MAKE); \
147147
fi
148148
mfs:
149149
if [ "$(doInstall)" = "yes" ]; then \
150-
cd $(SRCdir)/esrumfs; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
150+
cd $(SRCdir)/emfs; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
151151
else \
152-
cd $(SRCdir)/esrumfs; $(MAKE); \
152+
cd $(SRCdir)/emfs; $(MAKE); \
153153
fi
154154
mld:
155155
if [ "$(doInstall)" = "yes" ]; then \
156-
cd $(SRCdir)/esrumld; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
156+
cd $(SRCdir)/emld; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
157157
else \
158-
cd $(SRCdir)/esrumld; $(MAKE); \
158+
cd $(SRCdir)/emld; $(MAKE); \
159159
fi
160160
mrt:
161161
if [ "$(doInstall)" = "yes" ]; then \
162-
cd $(SRCdir)/esrumrt; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
162+
cd $(SRCdir)/emrt; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
163163
else \
164-
cd $(SRCdir)/esrumrt; $(MAKE); \
164+
cd $(SRCdir)/emrt; $(MAKE); \
165165
fi
166166
enet:
167167
if [ "$(doInstall)" = "yes" ]; then \
168-
cd $(SRCdir)/esrunet; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
168+
cd $(SRCdir)/net; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
169169
else \
170-
cd $(SRCdir)/esrunet; $(MAKE); \
170+
cd $(SRCdir)/net; $(MAKE); \
171171
fi
172172
pdb:
173173
if [ "$(doInstall)" = "yes" ]; then \
174-
cd $(SRCdir)/esrupdb; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
174+
cd $(SRCdir)/epdb; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
175175
else \
176-
cd $(SRCdir)/esrupdb; $(MAKE); \
176+
cd $(SRCdir)/epdb; $(MAKE); \
177177
fi
178178
prj:
179179
if [ "$(doInstall)" = "yes" ]; then \
180-
cd $(SRCdir)/esruprj; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
180+
cd $(SRCdir)/eprj; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
181181
else \
182-
cd $(SRCdir)/esruprj; $(MAKE); \
182+
cd $(SRCdir)/eprj; $(MAKE); \
183183
fi
184184
res:
185185
if [ "$(doInstall)" = "yes" ]; then \
186-
cd $(SRCdir)/esrures; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
186+
cd $(SRCdir)/eres; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
187187
else \
188-
cd $(SRCdir)/esrures; $(MAKE); \
188+
cd $(SRCdir)/eres; $(MAKE); \
189189
fi
190190
vew:
191191
if [ "$(doInstall)" = "yes" ]; then \
192-
cd $(SRCdir)/esruvew; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
192+
cd $(SRCdir)/evew; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
193193
else \
194-
cd $(SRCdir)/esruvew; $(MAKE); \
194+
cd $(SRCdir)/evew; $(MAKE); \
195195
fi
196-
stats:
197-
if [ "$(doInstall)" = "yes" ]; then \
198-
cd $(SRCdir)/esrustats; $(MAKE) ESPBinDir=${ESPBinDir} EXE=${EXE} install; \
199-
else \
200-
cd $(SRCdir)/esrustats; $(MAKE); \
201-
fi
202-
203196
clean:
204197
cd $(SRCdir)/lib; $(MAKE) clean
205-
cd $(SRCdir)/esruaco; $(MAKE) clean
206-
cd $(SRCdir)/esrub2e; $(MAKE) clean
207-
cd $(SRCdir)/esrubps; $(MAKE) clean
208-
cd $(SRCdir)/esrudbm; $(MAKE) clean
209-
cd $(SRCdir)/esrudfs; $(MAKE) clean
210-
cd $(SRCdir)/esruc2e; $(MAKE) clean
211-
cd $(SRCdir)/esrucdb; $(MAKE) clean
212-
cd $(SRCdir)/esruclm; $(MAKE) clean
213-
cd $(SRCdir)/esrue2r; $(MAKE) clean
214-
cd $(SRCdir)/esrucnv; $(MAKE) clean
215-
cd $(SRCdir)/esrueco; $(MAKE) clean
216-
cd $(SRCdir)/esrugrd; $(MAKE) clean
217-
cd $(SRCdir)/esruish; $(MAKE) clean
218-
cd $(SRCdir)/esrumfs; $(MAKE) clean
219-
cd $(SRCdir)/esrumld; $(MAKE) clean
220-
cd $(SRCdir)/esrumrt; $(MAKE) clean
221-
cd $(SRCdir)/esrunet; $(MAKE) clean
222-
cd $(SRCdir)/esrupdb; $(MAKE) clean
223-
cd $(SRCdir)/esruprj; $(MAKE) clean
224-
cd $(SRCdir)/esrures; $(MAKE) clean
225-
cd $(SRCdir)/esruvew; $(MAKE) clean
226-
cd $(SRCdir)/esrustats; $(MAKE) clean
198+
cd $(SRCdir)/eaco; $(MAKE) clean
199+
cd $(SRCdir)/eb2e; $(MAKE) clean
200+
cd $(SRCdir)/ebps; $(MAKE) clean
201+
cd $(SRCdir)/edfs; $(MAKE) clean
202+
cd $(SRCdir)/edfv; $(MAKE) clean
203+
cd $(SRCdir)/ec2e; $(MAKE) clean
204+
cd $(SRCdir)/ecdb; $(MAKE) clean
205+
cd $(SRCdir)/eclm; $(MAKE) clean
206+
cd $(SRCdir)/ee2r; $(MAKE) clean
207+
cd $(SRCdir)/cnv; $(MAKE) clean
208+
cd $(SRCdir)/eeco; $(MAKE) clean
209+
cd $(SRCdir)/egrd; $(MAKE) clean
210+
cd $(SRCdir)/eish; $(MAKE) clean
211+
cd $(SRCdir)/emfs; $(MAKE) clean
212+
cd $(SRCdir)/emld; $(MAKE) clean
213+
cd $(SRCdir)/emrt; $(MAKE) clean
214+
cd $(SRCdir)/net; $(MAKE) clean
215+
cd $(SRCdir)/epdb; $(MAKE) clean
216+
cd $(SRCdir)/eprj; $(MAKE) clean
217+
cd $(SRCdir)/eres; $(MAKE) clean
218+
cd $(SRCdir)/evew; $(MAKE) clean
227219
cd $(SRCdir)/harmonizer; $(MAKE) clean
228220
@if [ -f $(SRCdir)/include/espinstalldir.h ]; then rm $(SRCdir)/include/espinstalldir.h; fi
229221
@if [ -f $(SRCdir)/include/build_info.h ]; then rm $(SRCdir)/include/build_info.h; fi
230222

231223
strip:
232-
cd $(SRCdir)/esruaco; $(MAKE) strip
233-
cd $(SRCdir)/esrub2e; $(MAKE) strip
234-
cd $(SRCdir)/esrubps; $(MAKE) strip
235-
cd $(SRCdir)/esrudbm; $(MAKE) strip
236-
cd $(SRCdir)/esrudfs; $(MAKE) strip
237-
cd $(SRCdir)/esruc2e; $(MAKE) strip
238-
cd $(SRCdir)/esrucdb; $(MAKE) strip
239-
cd $(SRCdir)/esruclm; $(MAKE) strip
240-
cd $(SRCdir)/esrue2r; $(MAKE) strip
241-
cd $(SRCdir)/esrucnv; $(MAKE) strip
242-
cd $(SRCdir)/esrueco; $(MAKE) strip
243-
cd $(SRCdir)/esrugrd; $(MAKE) strip
224+
cd $(SRCdir)/eaco; $(MAKE) strip
225+
cd $(SRCdir)/eb2e; $(MAKE) strip
226+
cd $(SRCdir)/ebps; $(MAKE) strip
227+
cd $(SRCdir)/edfs; $(MAKE) strip
228+
cd $(SRCdir)/edfv; $(MAKE) strip
229+
cd $(SRCdir)/ec2e; $(MAKE) strip
230+
cd $(SRCdir)/ecdb; $(MAKE) strip
231+
cd $(SRCdir)/eclm; $(MAKE) strip
232+
cd $(SRCdir)/ee2r; $(MAKE) strip
233+
cd $(SRCdir)/cnv; $(MAKE) strip
234+
cd $(SRCdir)/eeco; $(MAKE) strip
235+
cd $(SRCdir)/egrd; $(MAKE) strip
244236
cd $(SRCdir)/harmonizer; $(MAKE) strip
245-
cd $(SRCdir)/esruish; $(MAKE) strip
246-
cd $(SRCdir)/esrumfs; $(MAKE) strip
247-
cd $(SRCdir)/esrumld; $(MAKE) strip
248-
cd $(SRCdir)/esrumrt; $(MAKE) strip
249-
cd $(SRCdir)/esrunet; $(MAKE) strip
250-
cd $(SRCdir)/esrupdb; $(MAKE) strip
251-
cd $(SRCdir)/esruprj; $(MAKE) strip
252-
cd $(SRCdir)/esrures; $(MAKE) strip
253-
cd $(SRCdir)/esruvew; $(MAKE) strip
254-
cd $(SRCdir)/esrustats; $(MAKE) strip
255-
256-
tars: clean
257-
rm -f esp-r.tar esp-r.tar.gz esp-r_training.tar esp-r_training.tar.gz
258-
tar cvf - esru* archive bitmaps lib cetc Install* Makefile* Readme* bin \
259-
climate databases GPL.txt Version env include manual tutorial \
260-
validation common_list shocc src2html > esp-r.tar 2> esp-r.list; gzip -9 esp-r.tar
261-
tar cvf - training/[a-z]* training/3* > esp-r_training.tar 2>> esp-r.list; gzip -9 esp-r_training.tar
237+
cd $(SRCdir)/eish; $(MAKE) strip
238+
cd $(SRCdir)/emfs; $(MAKE) strip
239+
cd $(SRCdir)/emld; $(MAKE) strip
240+
cd $(SRCdir)/emrt; $(MAKE) strip
241+
cd $(SRCdir)/net; $(MAKE) strip
242+
cd $(SRCdir)/epdb; $(MAKE) strip
243+
cd $(SRCdir)/eprj; $(MAKE) strip
244+
cd $(SRCdir)/eres; $(MAKE) strip
245+
cd $(SRCdir)/evew; $(MAKE) strip

0 commit comments

Comments
 (0)