Skip to content

Commit c28f9e4

Browse files
committed
Use Debian's archived copy of the non-free harmonics database
1 parent 9efaf32 commit c28f9e4

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

TestTCD.out

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
nullSlackOffset: 2560
22
amplitudeEpsilon: 5.0e-5
3-
getTideDbHeader: DatabaseHeader {hdrVersion = "PFM Software - libtcd v2.2.5 - 2010-08-17", hdrMajorRev = 2, hdrMinorRev = 2, hdrLastModified = "2011-12-30 19:02 EST", hdrNumberOfRecords = 133, hdrStartYear = 1700, hdrNumberOfYears = 401, hdrConstituents = 175, hdrLevelUnitTypes = 5, hdrDirUnitTypes = 3, hdrRestrictionTypes = 3, hdrDatumTypes = 64, hdrCountries = 241, hdrTzfiles = 406, hdrLegaleses = 2, hdrPedigreeTypes = 1}
3+
getTideDbHeader: DatabaseHeader {hdrVersion = "PFM Software - libtcd v2.2.4 - 2008-08-20", hdrMajorRev = 2, hdrMinorRev = 2, hdrLastModified = "2010-05-29 19:26 EDT", hdrNumberOfRecords = 133, hdrStartYear = 1700, hdrNumberOfYears = 401, hdrConstituents = 175, hdrLevelUnitTypes = 5, hdrDirUnitTypes = 3, hdrRestrictionTypes = 3, hdrDatumTypes = 64, hdrCountries = 241, hdrTzfiles = 406, hdrLegaleses = 2, hdrPedigreeTypes = 1}
44
constituents : 175
55
start_year : 1700
66
number_of_years : 401
77
number_of_records: 133
8-
searchStation: 58
9-
readTideRecord: 58
10-
Record number = 58
8+
searchStation: 53
9+
readTideRecord: 53
10+
Record number = 53
1111
Record size = 1317
1212
Record type = ReferenceStation
1313
Latitude = 51.216700
@@ -135,7 +135,7 @@ Epoch[153] = 59.080002
135135
Amplitude[155] = 0.037400
136136
Epoch[155] = 91.279999
137137
getNearestPartialTideRecord 51.25 (-3.0):
138-
(58,TideStationHeader {tshNumber = 58, tshSize = 1317, tshType = ReferenceStation, tshLatitude = 51.2167, tshLongitude = -3.1333, tshReferenceStation = -1, tshTZFile = 326, tshName = "Hinkley Point, England"})
138+
(53,TideStationHeader {tshNumber = 53, tshSize = 1317, tshType = ReferenceStation, tshLatitude = 51.2167, tshLongitude = -3.1333, tshReferenceStation = -1, tshTZFile = 326, tshName = "Hinkley Point, England"})
139139
getTZFile: :Europe/London
140140
getLevelUnits: meters
141141
getEquilibriums:

harmonics.nix

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ let
1010
sourceRoot = "";
1111
};
1212
nonfree = rec {
13-
version = "20111230";
14-
src = Downloads/ftp.flaterco.com/xtide/harmonics-dwf-${version}-nonfree.tar.bz2;
13+
version = "20100529";
14+
src = fetchurl {
15+
url = "http://deb.debian.org/debian/pool/non-free/x/xtide-data-nonfree/xtide-data-nonfree_${version}.orig.tar.bz2";
16+
sha256 = "0i9cm6p9hm8857c8ras3qswnwpg2xb9ajlw677hj1jyjr6axvrbw";
17+
};
1518
sourceRoot = ".";
1619
};
1720
origin = if type == "free" then free else nonfree;

0 commit comments

Comments
 (0)