diff --git a/wave_energy/aoi/capwe_mwh.tif b/wave_energy/aoi/capwe_mwh.tif
index 50b67a63fb782608be4c782f036554c27ef6994b..911e3497130993745953a88f11804ea1d6381b17 100644
Binary files a/wave_energy/aoi/capwe_mwh.tif and b/wave_energy/aoi/capwe_mwh.tif differ
diff --git a/wave_energy/aoi/capwe_rc.csv b/wave_energy/aoi/capwe_rc.csv
index 42aaee68261578448239408ca974c3c40dbca229..2149f28d2cab32ecdf67d80a2cd7c9bd5c816c14 100644
--- a/wave_energy/aoi/capwe_rc.csv
+++ b/wave_energy/aoi/capwe_rc.csv
@@ -1,6 +1,6 @@
id,Value Range,Pixel Count
-1,1 - 2181 megawatt hours per year (MWh/yr),1555.0
-2,2181 - 2420 (MWh/yr),1592.0
-3,2420 - 2558 (MWh/yr),1593.0
-4,2558 - 2619 (MWh/yr),969.0
-5,Greater than 2619 (MWh/yr),640.0
+1,1 - 2021 megawatt hours per year (MWh/yr),1.0
+2,2021 - 2214 (MWh/yr),1.0
+3,2214 - 0 (MWh/yr),0.0
+4,0 - 0 (MWh/yr),0.0
+5,Greater than 0 (MWh/yr),1.0
diff --git a/wave_energy/aoi/capwe_rc.tif b/wave_energy/aoi/capwe_rc.tif
index 638f215df7c29349a96e3da925e78c8fab6f635b..af6e89d13818112ca6d565c66100cac996d6a249 100644
Binary files a/wave_energy/aoi/capwe_rc.tif and b/wave_energy/aoi/capwe_rc.tif differ
diff --git a/wave_energy/aoi/wp_kw.tif b/wave_energy/aoi/wp_kw.tif
index 0a569df9dd9476a6b79315aff4ee656b309bcd64..0724e2c5850eed2e481a7badc35257ffb82f6876 100644
Binary files a/wave_energy/aoi/wp_kw.tif and b/wave_energy/aoi/wp_kw.tif differ
diff --git a/wave_energy/aoi/wp_rc.csv b/wave_energy/aoi/wp_rc.csv
index 8fd1c87eab05ae9c2ec5709c36d6c3fad21df753..232940ae8b9ed0f1c5690ffa82e2c6b8b93ff7f4 100644
--- a/wave_energy/aoi/wp_rc.csv
+++ b/wave_energy/aoi/wp_rc.csv
@@ -1,6 +1,6 @@
id,Value Range,Pixel Count
-1,1 - 29 wave power per unit width of wave crest length (kW/m),1287.0
-2,29 - 34 (kW/m),1386.0
-3,34 - 36 (kW/m),1340.0
-4,36 - 37 (kW/m),974.0
-5,Greater than 37 (kW/m),1236.0
+1,1 - 26 wave power per unit width of wave crest length (kW/m),1.0
+2,26 - 31 (kW/m),1.0
+3,31 - 0 (kW/m),0.0
+4,0 - 0 (kW/m),0.0
+5,Greater than 0 (kW/m),1.0
diff --git a/wave_energy/aoi/wp_rc.tif b/wave_energy/aoi/wp_rc.tif
index 05023606931ff5ea6f13ed132cd197843bb910ec..af6e89d13818112ca6d565c66100cac996d6a249 100644
Binary files a/wave_energy/aoi/wp_rc.tif and b/wave_energy/aoi/wp_rc.tif differ
diff --git a/wave_energy/input/AOI_WCVI.dbf b/wave_energy/input/AOI_WCVI.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..edfb60a2ea6a81cca5c85d38a9323effcf4e9e8f
Binary files /dev/null and b/wave_energy/input/AOI_WCVI.dbf differ
diff --git a/wave_energy/input/AOI_WCVI.prj b/wave_energy/input/AOI_WCVI.prj
new file mode 100644
index 0000000000000000000000000000000000000000..e3b35861fe70373e38264d7f280cbb2f172bfacf
--- /dev/null
+++ b/wave_energy/input/AOI_WCVI.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_10N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-123.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/wave_energy/input/AOI_WCVI.shp b/wave_energy/input/AOI_WCVI.shp
new file mode 100644
index 0000000000000000000000000000000000000000..4cfd0f69dc3b789fb3f608c26f86f798a8c9db9b
Binary files /dev/null and b/wave_energy/input/AOI_WCVI.shp differ
diff --git a/wave_energy/input/AOI_WCVI.shx b/wave_energy/input/AOI_WCVI.shx
new file mode 100644
index 0000000000000000000000000000000000000000..c769626b3dad9c3ef09beede7cf489f11e44b809
Binary files /dev/null and b/wave_energy/input/AOI_WCVI.shx differ
diff --git a/wave_energy/input/LandGridPts_WCVI.csv b/wave_energy/input/LandGridPts_WCVI.csv
new file mode 100644
index 0000000000000000000000000000000000000000..365389aab80f1aa596136daf976a046c966c8e48
--- /dev/null
+++ b/wave_energy/input/LandGridPts_WCVI.csv
@@ -0,0 +1,5 @@
+ID,TYPE,LAT,LONG,LOCATION
+1,LAND,49.286,-126.178,Ucluelet
+2,LAND,49.382,-126.337,Tofino
+1,GRID,49.277,-126.501,Ucluelet
+2,GRID,49.036,-126.299,Tofino
diff --git a/wave_energy/input/Machine_Pelamis_Economic.csv b/wave_energy/input/Machine_Pelamis_Economic.csv
new file mode 100644
index 0000000000000000000000000000000000000000..898a2c366a552fa59d6cf76d0042b1f319cf0dad
--- /dev/null
+++ b/wave_energy/input/Machine_Pelamis_Economic.csv
@@ -0,0 +1,10 @@
+NAME,VALUE,NOTE
+CapMax,750,Maximum capacity of device [kW].
+cc,3557,Capital cost per installed [$/kW].
+cml,17,Cost of mooring lines [$ per m].
+cul,111300,Cost of underwater transmission line [$ per km].
+col,73000,Cost of overland transmission line [$ per km].
+omc,0.4,Operating & maintenance cost [$ per kWh].
+p,0.2,Price of electricity [$ per kWh].
+r,0.08,Discount rate
+smlpm,3,Slack-moored (i.e. requires length of 3 * depth); 3 slack lines per machine required.
diff --git a/wave_energy/input/Machine_Pelamis_Parameter.csv b/wave_energy/input/Machine_Pelamis_Parameter.csv
new file mode 100644
index 0000000000000000000000000000000000000000..85ee49a464982db0ee10e913899550795bbb2153
--- /dev/null
+++ b/wave_energy/input/Machine_Pelamis_Parameter.csv
@@ -0,0 +1,4 @@
+NAME,VALUE,NOTE
+CapMax ,750,Maximum capacity of device [kW].
+HsMax,10.0,Upper limit of wave height for device operation [m]: this device shuts down when wave height is bigger than HsMax.
+TpMax ,20.0,Upper limit of wave period for device operation [sec]: this device shuts down when wave period is longer than TpMax.
diff --git a/wave_energy/input/Machine_Pelamis_Performance.csv b/wave_energy/input/Machine_Pelamis_Performance.csv
new file mode 100644
index 0000000000000000000000000000000000000000..dc8edfa23776b6cecc36e084c3c42351b9f239ac
--- /dev/null
+++ b/wave_energy/input/Machine_Pelamis_Performance.csv
@@ -0,0 +1,23 @@
+Hs(m)/Tp(sec),0.0,3.0,4.0,5.0,6.0,7.0,8.0,9.0,10.0,11.0,12.0,13.0,14.0,15.0,16.0,17.0,18.0,20.0
+0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+0.1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+0.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1.0,0,0,0,11,27,50,62,64,57,49,41,34,28,23,0,0,0,0
+1.5,0,0,0,26,62,112,141,143,129,110,91,76,63,52,43,36,30,23
+2.0,0,0,0,66,109,199,219,225,205,195,162,135,112,93,77,64,54,41
+2.5,0,0,7,93,171,279,342,351,320,274,230,210,174,145,120,100,84,65
+3.0,0,0,91,180,246,402,424,417,369,343,331,275,229,208,173,144,120,93
+3.5,0,0,86,211,326,484,577,568,502,421,394,330,312,260,216,196,164,140
+4.0,0,105,216,326,394,632,616,583,585,494,454,374,361,339,283,236,197,153
+4.5,0,94,233,371,467,735,744,738,634,626,520,473,390,382,319,299,250,208
+5.0,0,259,364,469,539,750,750,750,750,644,641,531,482,399,394,330,308,274
+5.5,0,428,497,566,612,750,750,750,750,750,635,642,532,482,400,399,341,322
+6.0,0,597,630,663,684,750,750,750,750,750,750,616,633,525,476,396,386,329
+6.5,0,750,750,750,750,750,750,750,750,750,750,723,592,617,513,458,430,384
+7.0,0,750,750,750,750,750,750,750,750,750,750,750,692,566,560,500,474,425
+7.5,0,750,750,750,750,750,750,750,750,750,750,750,748,610,607,542,518,467
+8.0,0,750,750,750,750,750,750,750,750,750,750,750,750,630,653,584,562,509
+8.5,0,750,750,750,750,750,750,750,750,750,750,750,750,650,699,626,606,551
+9.0,0,750,750,750,750,750,750,750,750,750,750,750,750,670,746,668,650,592
+9.5,0,750,750,750,750,750,750,750,750,750,750,750,750,691,750,710,694,662
+10.0,0,750,750,750,750,750,750,750,750,750,750,750,750,711,750,750,738,734
diff --git a/wave_energy/input/WaveData/Australia_4m.bin b/wave_energy/input/WaveData/Australia_4m.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c275467d92a67a11746c7864cf0c0bc782fe224e
Binary files /dev/null and b/wave_energy/input/WaveData/Australia_4m.bin differ
diff --git a/wave_energy/input/WaveData/Australia_4m.dbf b/wave_energy/input/WaveData/Australia_4m.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..bae69c10d39f983731731b5f78068b8262264496
Binary files /dev/null and b/wave_energy/input/WaveData/Australia_4m.dbf differ
diff --git a/wave_energy/input/WaveData/Australia_4m.prj b/wave_energy/input/WaveData/Australia_4m.prj
new file mode 100644
index 0000000000000000000000000000000000000000..a30c00a55de19be195abf9e942f6cff93bf0a825
--- /dev/null
+++ b/wave_energy/input/WaveData/Australia_4m.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/Australia_4m.shp b/wave_energy/input/WaveData/Australia_4m.shp
new file mode 100644
index 0000000000000000000000000000000000000000..05bdf79694a825a29c5a17d6d2b21427c26d5051
Binary files /dev/null and b/wave_energy/input/WaveData/Australia_4m.shp differ
diff --git a/wave_energy/input/WaveData/Australia_4m.shx b/wave_energy/input/WaveData/Australia_4m.shx
new file mode 100644
index 0000000000000000000000000000000000000000..e722573bdb81cd6df07b2ec7b875d4872e6721e4
Binary files /dev/null and b/wave_energy/input/WaveData/Australia_4m.shx differ
diff --git a/wave_energy/input/WaveData/Australia_Extract.dbf b/wave_energy/input/WaveData/Australia_Extract.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..07a28bf76995c1016f3ba42758b7d2a348ab42d7
Binary files /dev/null and b/wave_energy/input/WaveData/Australia_Extract.dbf differ
diff --git a/wave_energy/input/WaveData/Australia_Extract.prj b/wave_energy/input/WaveData/Australia_Extract.prj
new file mode 100644
index 0000000000000000000000000000000000000000..f45cbadf0074d8b7b2669559a93bc50bb95f82d4
--- /dev/null
+++ b/wave_energy/input/WaveData/Australia_Extract.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/Australia_Extract.shp b/wave_energy/input/WaveData/Australia_Extract.shp
new file mode 100644
index 0000000000000000000000000000000000000000..914469494454e0e6c384eb40fbdb358cb731855e
Binary files /dev/null and b/wave_energy/input/WaveData/Australia_Extract.shp differ
diff --git a/wave_energy/input/WaveData/Australia_Extract.shx b/wave_energy/input/WaveData/Australia_Extract.shx
new file mode 100644
index 0000000000000000000000000000000000000000..0b8f55b828336fa26fb29b9d07c1aa55550a5ded
Binary files /dev/null and b/wave_energy/input/WaveData/Australia_Extract.shx differ
diff --git a/wave_energy/input/WaveData/ECNA_extract.dbf b/wave_energy/input/WaveData/ECNA_extract.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..9375e3339f447ffc9455f52ad2d7c19eeec3e44b
Binary files /dev/null and b/wave_energy/input/WaveData/ECNA_extract.dbf differ
diff --git a/wave_energy/input/WaveData/ECNA_extract.prj b/wave_energy/input/WaveData/ECNA_extract.prj
new file mode 100644
index 0000000000000000000000000000000000000000..f45cbadf0074d8b7b2669559a93bc50bb95f82d4
--- /dev/null
+++ b/wave_energy/input/WaveData/ECNA_extract.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/ECNA_extract.sbn b/wave_energy/input/WaveData/ECNA_extract.sbn
new file mode 100644
index 0000000000000000000000000000000000000000..5b964f67858d4532bf5853d928fb0111e3a9b211
Binary files /dev/null and b/wave_energy/input/WaveData/ECNA_extract.sbn differ
diff --git a/wave_energy/input/WaveData/ECNA_extract.sbx b/wave_energy/input/WaveData/ECNA_extract.sbx
new file mode 100644
index 0000000000000000000000000000000000000000..dfc4dc65d6c87c703a3676f09e7365a4bf293927
Binary files /dev/null and b/wave_energy/input/WaveData/ECNA_extract.sbx differ
diff --git a/wave_energy/input/WaveData/ECNA_extract.shp b/wave_energy/input/WaveData/ECNA_extract.shp
new file mode 100644
index 0000000000000000000000000000000000000000..3604b8bdb004d7b2f7d58cf28cdd2d6c9879af84
Binary files /dev/null and b/wave_energy/input/WaveData/ECNA_extract.shp differ
diff --git a/wave_energy/input/WaveData/ECNA_extract.shx b/wave_energy/input/WaveData/ECNA_extract.shx
new file mode 100644
index 0000000000000000000000000000000000000000..43dd422cdd0668728f9141726a1af0b31e9f2e53
Binary files /dev/null and b/wave_energy/input/WaveData/ECNA_extract.shx differ
diff --git a/wave_energy/input/WaveData/Global.dbf b/wave_energy/input/WaveData/Global.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..a2142e566a3f5e709a717b262d80c01f93ebbc65
Binary files /dev/null and b/wave_energy/input/WaveData/Global.dbf differ
diff --git a/wave_energy/input/WaveData/Global.prj b/wave_energy/input/WaveData/Global.prj
new file mode 100644
index 0000000000000000000000000000000000000000..b13a71791932a9ecb82a81800e49b3d5b307a195
--- /dev/null
+++ b/wave_energy/input/WaveData/Global.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/Global.shp b/wave_energy/input/WaveData/Global.shp
new file mode 100644
index 0000000000000000000000000000000000000000..284e4989eee05d55c1a62a7e7c3f8f664fe83f1e
Binary files /dev/null and b/wave_energy/input/WaveData/Global.shp differ
diff --git a/wave_energy/input/WaveData/Global.shx b/wave_energy/input/WaveData/Global.shx
new file mode 100644
index 0000000000000000000000000000000000000000..36511d1b32bfb5a3d63d77aaef56a2760ce7b860
Binary files /dev/null and b/wave_energy/input/WaveData/Global.shx differ
diff --git a/wave_energy/input/WaveData/Global_WW3.txt.bin b/wave_energy/input/WaveData/Global_WW3.txt.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6f6b7006405571de2774805117287c7ddc70c587
Binary files /dev/null and b/wave_energy/input/WaveData/Global_WW3.txt.bin differ
diff --git a/wave_energy/input/WaveData/Global_extract.dbf b/wave_energy/input/WaveData/Global_extract.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..f8f778a7bc331fd8c5d10efd23fae4d7a889e1e8
Binary files /dev/null and b/wave_energy/input/WaveData/Global_extract.dbf differ
diff --git a/wave_energy/input/WaveData/Global_extract.prj b/wave_energy/input/WaveData/Global_extract.prj
new file mode 100644
index 0000000000000000000000000000000000000000..f45cbadf0074d8b7b2669559a93bc50bb95f82d4
--- /dev/null
+++ b/wave_energy/input/WaveData/Global_extract.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/Global_extract.sbn b/wave_energy/input/WaveData/Global_extract.sbn
new file mode 100644
index 0000000000000000000000000000000000000000..a670a539fec799d60916ee0daad76a16addf4dcd
Binary files /dev/null and b/wave_energy/input/WaveData/Global_extract.sbn differ
diff --git a/wave_energy/input/WaveData/Global_extract.sbx b/wave_energy/input/WaveData/Global_extract.sbx
new file mode 100644
index 0000000000000000000000000000000000000000..a669a3787a802e508f680a3d538e8e0953af5400
Binary files /dev/null and b/wave_energy/input/WaveData/Global_extract.sbx differ
diff --git a/wave_energy/input/WaveData/Global_extract.shp b/wave_energy/input/WaveData/Global_extract.shp
new file mode 100644
index 0000000000000000000000000000000000000000..5930ab4b30fc277686336d2e102ec0fff64eaa7b
Binary files /dev/null and b/wave_energy/input/WaveData/Global_extract.shp differ
diff --git a/wave_energy/input/WaveData/Global_extract.shp.xml b/wave_energy/input/WaveData/Global_extract.shp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..899d28dd1c908b519913f441b2c0d689adb1ff76
--- /dev/null
+++ b/wave_energy/input/WaveData/Global_extract.shp.xml
@@ -0,0 +1 @@
+<metadata xml:lang="en"><idinfo><citation><citeinfo><onlink Sync="TRUE">\\CSPLAB\E\Marine_InVEST\MarineInVEST\GuerreyPaper\Input\AOI\yesEEZ_mask</onlink></citeinfo></citation></idinfo><distinfo><stdorder><digform><digtinfo><transize>0.000</transize></digtinfo></digform></stdorder></distinfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><procdate Sync="TRUE">20101117</procdate><proctime Sync="TRUE">13283100</proctime></procstep><procstep><procdesc Sync="TRUE">Dataset moved.</procdesc><srcused Sync="TRUE">E:\Marine_InVEST\Wave_Energy\WW3\GRID\yesEEZ_mask</srcused><procdate Sync="TRUE">20101121</procdate><proctime Sync="TRUE">13335000</proctime></procstep><procstep><procdesc Sync="TRUE">Dataset moved.</procdesc><srcused Sync="TRUE">E:\Marine_InVEST\MarineInVEST\GuerreyPaper\Input\yesEEZ_mask</srcused><procdate Sync="TRUE">20101121</procdate><proctime Sync="TRUE">13350800</proctime></procstep></lineage></dataqual><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://\\CSPLAB\E\Marine_InVEST\MarineInVEST\GuerreyPaper\Input\AOI\yesEEZ_mask</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><Esri><DataProperties><itemProps><itemLocation><linkage Sync="TRUE">file://\\NCP-VERUTES\C$\MarineInVEST\WaveEnergy\Input\WaveData\Global_extract</linkage><protocol Sync="TRUE">Local Area Network</protocol></itemLocation></itemProps><copyHistory><copy source="C:\MarineInVEST\WaveEnergy\Input\Global_extract" dest="\\NCP-VERUTES\C$\MarineInVEST\WaveEnergy\Input\WaveData\Global_extract" date="20110118" time="08495200"></copy></copyHistory></DataProperties></Esri></metadata>
diff --git a/wave_energy/input/WaveData/Global_extract.shx b/wave_energy/input/WaveData/Global_extract.shx
new file mode 100644
index 0000000000000000000000000000000000000000..be8ee90bf73e6c0a1e4d067507da8552cb87e472
Binary files /dev/null and b/wave_energy/input/WaveData/Global_extract.shx differ
diff --git a/wave_energy/input/WaveData/NAmerica_EastCoast_4m.dbf b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..6fe350e79bdcfb454774b9d72bbe70f9fa75c2e7
Binary files /dev/null and b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.dbf differ
diff --git a/wave_energy/input/WaveData/NAmerica_EastCoast_4m.prj b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.prj
new file mode 100644
index 0000000000000000000000000000000000000000..f45cbadf0074d8b7b2669559a93bc50bb95f82d4
--- /dev/null
+++ b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/NAmerica_EastCoast_4m.sbn b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.sbn
new file mode 100644
index 0000000000000000000000000000000000000000..e0099ac8293106bea39fd15c9d0467642bb14dbb
Binary files /dev/null and b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.sbn differ
diff --git a/wave_energy/input/WaveData/NAmerica_EastCoast_4m.sbx b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.sbx
new file mode 100644
index 0000000000000000000000000000000000000000..cb9822338c8f9a7ec88a3db74c34b4b34ebf6e7c
Binary files /dev/null and b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.sbx differ
diff --git a/wave_energy/input/WaveData/NAmerica_EastCoast_4m.shp b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.shp
new file mode 100644
index 0000000000000000000000000000000000000000..e959feb0c4d423aaf710f7bbc6f2cd2db550cf72
Binary files /dev/null and b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.shp differ
diff --git a/wave_energy/input/WaveData/NAmerica_EastCoast_4m.shp.xml b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.shp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e4540d336491d075596350babf956e549fca1346
--- /dev/null
+++ b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.shp.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xml:lang="en"><Esri><CreaDate>20101219</CreaDate><CreaTime>22033900</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>TRUE</SyncOnce><DataProperties><itemProps><itemLocation><linkage Sync="TRUE">file://\\NCP-VERUTES\C$\MarineInVEST\WaveEnergy\Input\WaveData\NAmerica_EastCoast_4m</linkage><protocol Sync="TRUE">Local Area Network</protocol></itemLocation></itemProps><copyHistory><copy source="C:\MarineInVEST\WaveEnergy\Input\NAmerica_EastCoast_4m" dest="\\NCP-VERUTES\C$\MarineInVEST\WaveEnergy\Input\WaveData\NAmerica_EastCoast_4m" date="20110118" time="08495600"></copy></copyHistory><lineage><Process ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\SelectLayerByLocation" Date="20101218" Time="221857">SelectLayerByLocation F:\BETA\MarineInVEST\WaveEnergy\intermediate\WaveDataEC.lyr INTERSECT F:\BETA\MarineInVEST\WaveEnergy\intermediate\drawBndryLyr.lyr # NEW_SELECTION F:\BETA\MarineInVEST\WaveEnergy\intermediate\WaveDataEC.lyr</Process></lineage></DataProperties></Esri></metadata>
diff --git a/wave_energy/input/WaveData/NAmerica_EastCoast_4m.shx b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.shx
new file mode 100644
index 0000000000000000000000000000000000000000..4a0485f7abc160ebfff61ab834faeeeb2ddbb14f
Binary files /dev/null and b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.shx differ
diff --git a/wave_energy/input/WaveData/NAmerica_EastCoast_4m.txt.bin b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.txt.bin
new file mode 100644
index 0000000000000000000000000000000000000000..13d7bf1b1c37c178f0accaa5960af5a0402b0462
Binary files /dev/null and b/wave_energy/input/WaveData/NAmerica_EastCoast_4m.txt.bin differ
diff --git a/wave_energy/input/WaveData/NAmerica_WestCoast_4m.bin b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0128a6df0d1dfc298a29a13c5e61049a5c90abf
Binary files /dev/null and b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.bin differ
diff --git a/wave_energy/input/WaveData/NAmerica_WestCoast_4m.dbf b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..a1c3c2747422ecf5316c40b526c2e3f338f698a2
Binary files /dev/null and b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.dbf differ
diff --git a/wave_energy/input/WaveData/NAmerica_WestCoast_4m.prj b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.prj
new file mode 100644
index 0000000000000000000000000000000000000000..f45cbadf0074d8b7b2669559a93bc50bb95f82d4
--- /dev/null
+++ b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/NAmerica_WestCoast_4m.shp b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.shp
new file mode 100644
index 0000000000000000000000000000000000000000..ddb5c6556f98ab7f0655a86e19d224edba594f71
Binary files /dev/null and b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.shp differ
diff --git a/wave_energy/input/WaveData/NAmerica_WestCoast_4m.shp.xml b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.shp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a3c4575deb7720b6148a472421634187c34868da
--- /dev/null
+++ b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.shp.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xml:lang="en"><Esri><CreaDate>20101219</CreaDate><CreaTime>22035000</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>TRUE</SyncOnce><DataProperties><itemProps><itemLocation><linkage Sync="TRUE">file://\\NCP-VERUTES\C$\MarineInVEST\WaveEnergy\Input\WaveData\NAmerica_WestCoast_4m</linkage><protocol Sync="TRUE">Local Area Network</protocol></itemLocation></itemProps><copyHistory><copy source="C:\MarineInVEST\WaveEnergy\Input\NAmerica_WestCoast_4m" dest="\\NCP-VERUTES\C$\MarineInVEST\WaveEnergy\Input\WaveData\NAmerica_WestCoast_4m" date="20110118" time="08495800"></copy></copyHistory><lineage><Process ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\SelectLayerByLocation" Date="20101218" Time="221856">SelectLayerByLocation F:\BETA\MarineInVEST\WaveEnergy\intermediate\WaveDataWC.lyr INTERSECT F:\BETA\MarineInVEST\WaveEnergy\intermediate\drawBndryLyr.lyr # NEW_SELECTION F:\BETA\MarineInVEST\WaveEnergy\intermediate\WaveDataWC.lyr</Process><Process ToolSource="C:\Program Files (x86)\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\SelectLayerByLocation" Date="20110208" Time="094330">SelectLayerByLocation C:\MarineInVEST\WaveEnergy\runWCVI\intermediate\WaveDataWC.lyr INTERSECT C:\MarineInVEST\WaveEnergy\runWCVI\intermediate\AOILyr.lyr # NEW_SELECTION C:\MarineInVEST\WaveEnergy\runWCVI\intermediate\WaveDataWC.lyr</Process><Process ToolSource="C:\Program Files (x86)\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\SelectLayerByLocation" Date="20110210" Time="121757">SelectLayerByLocation C:\MarineInVEST\WaveEnergy\runBC\intermediate\WaveDataWC.lyr INTERSECT C:\MarineInVEST\WaveEnergy\runBC\intermediate\AOILyr.lyr # NEW_SELECTION C:\MarineInVEST\WaveEnergy\runBC\intermediate\WaveDataWC.lyr</Process></lineage></DataProperties></Esri></metadata>
diff --git a/wave_energy/input/WaveData/NAmerica_WestCoast_4m.shx b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.shx
new file mode 100644
index 0000000000000000000000000000000000000000..b468b2d9b92462a032c4d792b54d69b9cc9b8489
Binary files /dev/null and b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.shx differ
diff --git a/wave_energy/input/WaveData/NAmerica_WestCoast_4m.txt.bin b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.txt.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b0128a6df0d1dfc298a29a13c5e61049a5c90abf
Binary files /dev/null and b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.txt.bin differ
diff --git a/wave_energy/input/WaveData/NAmerica_WestCoast_4m.xml b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a3c4575deb7720b6148a472421634187c34868da
--- /dev/null
+++ b/wave_energy/input/WaveData/NAmerica_WestCoast_4m.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xml:lang="en"><Esri><CreaDate>20101219</CreaDate><CreaTime>22035000</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>TRUE</SyncOnce><DataProperties><itemProps><itemLocation><linkage Sync="TRUE">file://\\NCP-VERUTES\C$\MarineInVEST\WaveEnergy\Input\WaveData\NAmerica_WestCoast_4m</linkage><protocol Sync="TRUE">Local Area Network</protocol></itemLocation></itemProps><copyHistory><copy source="C:\MarineInVEST\WaveEnergy\Input\NAmerica_WestCoast_4m" dest="\\NCP-VERUTES\C$\MarineInVEST\WaveEnergy\Input\WaveData\NAmerica_WestCoast_4m" date="20110118" time="08495800"></copy></copyHistory><lineage><Process ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\SelectLayerByLocation" Date="20101218" Time="221856">SelectLayerByLocation F:\BETA\MarineInVEST\WaveEnergy\intermediate\WaveDataWC.lyr INTERSECT F:\BETA\MarineInVEST\WaveEnergy\intermediate\drawBndryLyr.lyr # NEW_SELECTION F:\BETA\MarineInVEST\WaveEnergy\intermediate\WaveDataWC.lyr</Process><Process ToolSource="C:\Program Files (x86)\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\SelectLayerByLocation" Date="20110208" Time="094330">SelectLayerByLocation C:\MarineInVEST\WaveEnergy\runWCVI\intermediate\WaveDataWC.lyr INTERSECT C:\MarineInVEST\WaveEnergy\runWCVI\intermediate\AOILyr.lyr # NEW_SELECTION C:\MarineInVEST\WaveEnergy\runWCVI\intermediate\WaveDataWC.lyr</Process><Process ToolSource="C:\Program Files (x86)\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\SelectLayerByLocation" Date="20110210" Time="121757">SelectLayerByLocation C:\MarineInVEST\WaveEnergy\runBC\intermediate\WaveDataWC.lyr INTERSECT C:\MarineInVEST\WaveEnergy\runBC\intermediate\AOILyr.lyr # NEW_SELECTION C:\MarineInVEST\WaveEnergy\runBC\intermediate\WaveDataWC.lyr</Process></lineage></DataProperties></Esri></metadata>
diff --git a/wave_energy/input/WaveData/North_Sea_10m.bin b/wave_energy/input/WaveData/North_Sea_10m.bin
new file mode 100644
index 0000000000000000000000000000000000000000..de4b338b5878cfebc3d80ab061e8a73d1200047b
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_10m.bin differ
diff --git a/wave_energy/input/WaveData/North_Sea_10m.dbf b/wave_energy/input/WaveData/North_Sea_10m.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..a6d4c0ad05a567903623ab513bf8d9cb2b934b12
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_10m.dbf differ
diff --git a/wave_energy/input/WaveData/North_Sea_10m.prj b/wave_energy/input/WaveData/North_Sea_10m.prj
new file mode 100644
index 0000000000000000000000000000000000000000..a30c00a55de19be195abf9e942f6cff93bf0a825
--- /dev/null
+++ b/wave_energy/input/WaveData/North_Sea_10m.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/North_Sea_10m.shp b/wave_energy/input/WaveData/North_Sea_10m.shp
new file mode 100644
index 0000000000000000000000000000000000000000..346729b1c38e14f233745f2e1359879d84b001c1
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_10m.shp differ
diff --git a/wave_energy/input/WaveData/North_Sea_10m.shx b/wave_energy/input/WaveData/North_Sea_10m.shx
new file mode 100644
index 0000000000000000000000000000000000000000..716b8a583a0e1c3481a40aceab3d6539aff19c68
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_10m.shx differ
diff --git a/wave_energy/input/WaveData/North_Sea_10m_Extract.dbf b/wave_energy/input/WaveData/North_Sea_10m_Extract.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..b26c993b934b824704fc32fd4512f1e0bfacc40b
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_10m_Extract.dbf differ
diff --git a/wave_energy/input/WaveData/North_Sea_10m_Extract.prj b/wave_energy/input/WaveData/North_Sea_10m_Extract.prj
new file mode 100644
index 0000000000000000000000000000000000000000..f45cbadf0074d8b7b2669559a93bc50bb95f82d4
--- /dev/null
+++ b/wave_energy/input/WaveData/North_Sea_10m_Extract.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/North_Sea_10m_Extract.shp b/wave_energy/input/WaveData/North_Sea_10m_Extract.shp
new file mode 100644
index 0000000000000000000000000000000000000000..0c94239524c403be1835571be8d2c8133b4bbbc9
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_10m_Extract.shp differ
diff --git a/wave_energy/input/WaveData/North_Sea_10m_Extract.shx b/wave_energy/input/WaveData/North_Sea_10m_Extract.shx
new file mode 100644
index 0000000000000000000000000000000000000000..390d38a1d9f86c739990bffee6647a36d19daa26
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_10m_Extract.shx differ
diff --git a/wave_energy/input/WaveData/North_Sea_4m.bin b/wave_energy/input/WaveData/North_Sea_4m.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c1c47067621c69ccb5bb3da9a12eb03c846648d5
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_4m.bin differ
diff --git a/wave_energy/input/WaveData/North_Sea_4m.dbf b/wave_energy/input/WaveData/North_Sea_4m.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..294436e58760fdd48a89030b16b9a42457bfe147
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_4m.dbf differ
diff --git a/wave_energy/input/WaveData/North_Sea_4m.prj b/wave_energy/input/WaveData/North_Sea_4m.prj
new file mode 100644
index 0000000000000000000000000000000000000000..a30c00a55de19be195abf9e942f6cff93bf0a825
--- /dev/null
+++ b/wave_energy/input/WaveData/North_Sea_4m.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/North_Sea_4m.shp b/wave_energy/input/WaveData/North_Sea_4m.shp
new file mode 100644
index 0000000000000000000000000000000000000000..8be100c569b610fa2f66aa00ecee721e50ad7004
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_4m.shp differ
diff --git a/wave_energy/input/WaveData/North_Sea_4m.shx b/wave_energy/input/WaveData/North_Sea_4m.shx
new file mode 100644
index 0000000000000000000000000000000000000000..e7f59722b6158204a8664e669beb6dfee59b01a9
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_4m.shx differ
diff --git a/wave_energy/input/WaveData/North_Sea_4m_Extract.dbf b/wave_energy/input/WaveData/North_Sea_4m_Extract.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..501c5df95518c0156e2e3b54ccf4bf9b150028f7
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_4m_Extract.dbf differ
diff --git a/wave_energy/input/WaveData/North_Sea_4m_Extract.prj b/wave_energy/input/WaveData/North_Sea_4m_Extract.prj
new file mode 100644
index 0000000000000000000000000000000000000000..f45cbadf0074d8b7b2669559a93bc50bb95f82d4
--- /dev/null
+++ b/wave_energy/input/WaveData/North_Sea_4m_Extract.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/North_Sea_4m_Extract.shp b/wave_energy/input/WaveData/North_Sea_4m_Extract.shp
new file mode 100644
index 0000000000000000000000000000000000000000..41e65a7e271bb89ff833b98110d56e01ed6e1022
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_4m_Extract.shp differ
diff --git a/wave_energy/input/WaveData/North_Sea_4m_Extract.shx b/wave_energy/input/WaveData/North_Sea_4m_Extract.shx
new file mode 100644
index 0000000000000000000000000000000000000000..6ca84bbfa9120b673f8e83bfa89df7aaf15fb2e8
Binary files /dev/null and b/wave_energy/input/WaveData/North_Sea_4m_Extract.shx differ
diff --git a/wave_energy/input/WaveData/WCNA_extract.dbf b/wave_energy/input/WaveData/WCNA_extract.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..9375e3339f447ffc9455f52ad2d7c19eeec3e44b
Binary files /dev/null and b/wave_energy/input/WaveData/WCNA_extract.dbf differ
diff --git a/wave_energy/input/WaveData/WCNA_extract.prj b/wave_energy/input/WaveData/WCNA_extract.prj
new file mode 100644
index 0000000000000000000000000000000000000000..f45cbadf0074d8b7b2669559a93bc50bb95f82d4
--- /dev/null
+++ b/wave_energy/input/WaveData/WCNA_extract.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
\ No newline at end of file
diff --git a/wave_energy/input/WaveData/WCNA_extract.sbn b/wave_energy/input/WaveData/WCNA_extract.sbn
new file mode 100644
index 0000000000000000000000000000000000000000..bd18735ee3b5abda05c4d98ebd74f317edd33bc2
Binary files /dev/null and b/wave_energy/input/WaveData/WCNA_extract.sbn differ
diff --git a/wave_energy/input/WaveData/WCNA_extract.sbx b/wave_energy/input/WaveData/WCNA_extract.sbx
new file mode 100644
index 0000000000000000000000000000000000000000..db8b58abb4977fa879cf0375802d8fbd6d614a94
Binary files /dev/null and b/wave_energy/input/WaveData/WCNA_extract.sbx differ
diff --git a/wave_energy/input/WaveData/WCNA_extract.shp b/wave_energy/input/WaveData/WCNA_extract.shp
new file mode 100644
index 0000000000000000000000000000000000000000..ee960195bbb77e4a525d22eefd9ad8be5a109909
Binary files /dev/null and b/wave_energy/input/WaveData/WCNA_extract.shp differ
diff --git a/wave_energy/input/WaveData/WCNA_extract.shx b/wave_energy/input/WaveData/WCNA_extract.shx
new file mode 100644
index 0000000000000000000000000000000000000000..382404891528e2151720803456d668fca5459de6
Binary files /dev/null and b/wave_energy/input/WaveData/WCNA_extract.shx differ
diff --git a/wave_energy/input/WaveData/pickle_wave_data.py b/wave_energy/input/WaveData/pickle_wave_data.py
new file mode 100644
index 0000000000000000000000000000000000000000..f029afb2aef8a25b3856d31d26cc4d2bb7eeeaec
--- /dev/null
+++ b/wave_energy/input/WaveData/pickle_wave_data.py
@@ -0,0 +1,59 @@
+"""This script is used to take a CK WW3 text data file and convert it
+to a compressed binary form that's faster to load and cheapter to
+build in an installer than the bulky text format supplied."""
+
+import numpy as np
+import sys
+import struct
+
+def text_wave_data_to_binary(wave_file_uri, binary_file_uri):
+ """Load the proprietary ck wave file and output it to the InVEST 3.0 proprietyary wave file binary format.
+
+ wave_file_uri - The path to a text document that holds the WW3 data.
+ binary_file_uri - The path to a a binary file that will be used to hold the binary WW3 data.
+ """
+ wave_file = open(wave_file_uri,'rU')
+ bin_file = open(wave_file_uri + '.bin', 'wb')
+
+ wave_dict = {}
+ #Create a key that hosts another dictionary where the matrix representation
+ #of the seastate bins will be saved
+ wave_dict['bin_matrix'] = {}
+ wave_array = None
+ wave_periods = []
+ wave_heights = []
+ key = None
+
+ #get the periods and heights
+ #print wave_file.readline().rstrip('\n').split(',')
+ wave_periods = map(float,wave_file.readline().rstrip('\n').split(','))
+ wave_heights = map(float,wave_file.readline().rstrip('\n').split(','))
+ s=struct.pack('ii',len(wave_periods),len(wave_heights))
+ bin_file.write(s)
+ s=struct.pack('f'*len(wave_periods), *wave_periods)
+ bin_file.write(s)
+ s=struct.pack('f'*len(wave_heights), *wave_heights)
+ bin_file.write(s)
+
+ while True:
+ line = wave_file.readline()
+ if len(line) == 0:
+ #end of file
+ wave_dict['bin_matrix'][key] = wave_array
+ break
+
+ #If it is the start of a new location, get (I,J) values
+ if line[0] == 'I':
+ #split I, n, J, m into just the numeric part
+ i,j = map(int,line.split(',')[1:4:2])
+ s=struct.pack('ii',i,j)
+ bin_file.write(s)
+ else:
+ float_list = map(float,line.split(','))
+ s=struct.pack('f'*len(float_list), *float_list)
+ bin_file.write(s)
+
+wave_file_uri = sys.argv[1]
+binary_file_uri = wave_file_uri + '.bin'
+text_wave_data_to_binary(wave_file_uri, binary_file_uri)
+print("done pickling %s" % wave_file_uri)
diff --git a/wave_energy/input/WaveData/unpickle_wave_data.py b/wave_energy/input/WaveData/unpickle_wave_data.py
new file mode 100644
index 0000000000000000000000000000000000000000..9a63b8ca211e8089fdd9af49945a92918b1e1ed0
--- /dev/null
+++ b/wave_energy/input/WaveData/unpickle_wave_data.py
@@ -0,0 +1,86 @@
+"""This was a test script to develop the WW3 unpickler"""
+
+import numpy as np
+import sys
+import struct
+
+def load_binary_wave_data(wave_file_uri):
+ """The extrapolate_wave_data function converts WW3 text data into a
+ dictionary who's keys are the corresponding (I,J) values and whose value
+ is a two-dimensional array representing a matrix of the number of hours
+ a seastate occurs over a 5 year period. The row and column headers are
+ extracted once and stored in the dictionary as well.
+
+ wave_file_uri - The path to a text document that holds the WW3 data.
+
+ returns - A dictionary of matrices representing hours of specific seastates,
+ as well as the period and height ranges. It has the following
+ structure:
+ {'periods': [1,2,3,4,...],
+ 'heights': [.5,1.0,1.5,...],
+ 'bin_matrix': { (i0,j0): [[2,5,3,2,...], [6,3,4,1,...],...],
+ (i1,j1): [[2,5,3,2,...], [6,3,4,1,...],...],
+ ...
+ (in, jn): [[2,5,3,2,...], [6,3,4,1,...],...]
+ }
+ }
+ """
+ print('Extrapolating wave data from text to a dictionary')
+ wave_file = open(wave_file_uri,'rb')
+ wave_dict = {}
+ #Create a key that hosts another dictionary where the matrix representation
+ #of the seastate bins will be saved
+ wave_dict['bin_matrix'] = {}
+ wave_array = None
+ wave_periods = []
+ wave_heights = []
+ key = None
+
+ #get rows,cols
+ row_col_bin = wave_file.read(8)
+ row,col = struct.unpack('ii',row_col_bin)
+ print row,col
+
+ #get the periods and heights
+ line = wave_file.read(row*4)
+ wave_periods = list(struct.unpack('f'*row,line))
+ line = wave_file.read(col*4)
+ print(len(line))
+ wave_heights = list(struct.unpack('f'*col,line))
+ print wave_periods,wave_heights
+
+ key = None
+ while True:
+ line = wave_file.read(8)
+ if len(line) == 0:
+ #end of file
+ wave_dict['bin_matrix'][key] = wave_array
+ break
+
+ if key != None:
+ wave_dict['bin_matrix'][key] = wave_array
+
+ #Clear out array
+ wave_array = []
+
+ key = struct.unpack('ii',line)
+ print key
+
+ for row_id in range(row):
+ line = wave_file.read(col*4)
+ array = list(struct.unpack('f'*col,line))
+ #print(array)
+ wave_array.append(array)
+
+ wave_file.close()
+ #Add row/col header to dictionary
+ print('WaveData row %s', wave_periods)
+ wave_dict['periods'] = np.array(wave_periods, dtype='f')
+ print('WaveData col %s', wave_heights)
+ wave_dict['heights'] = np.array(wave_heights, dtype='f')
+ print('Finished extrapolating wave data to dictionary')
+ return wave_dict
+
+wave_file_uri = sys.argv[1]
+load_binary_wave_data(wave_file_uri)
+print("done loading %s" % wave_file_uri)
diff --git a/wave_energy/input/resampled_global_dem.tif b/wave_energy/input/resampled_global_dem.tif
new file mode 100644
index 0000000000000000000000000000000000000000..1e735715bfc2c03eef134c9c2bb8b0c6c88f314d
Binary files /dev/null and b/wave_energy/input/resampled_global_dem.tif differ
diff --git a/wave_energy/noaoi/capwe_mwh.tif b/wave_energy/noaoi/capwe_mwh.tif
index 15e6a06961673a23a87af5a5c403294f11fa4f6f..bcae51122e677db984beecd390ce933a7b514692 100644
Binary files a/wave_energy/noaoi/capwe_mwh.tif and b/wave_energy/noaoi/capwe_mwh.tif differ
diff --git a/wave_energy/noaoi/capwe_rc.csv b/wave_energy/noaoi/capwe_rc.csv
index 7730a007fa223da6d1d2ad040daf23192f05bbc9..15f3020c4a7b2d09052f477ff5bb5a05ece9ca90 100644
--- a/wave_energy/noaoi/capwe_rc.csv
+++ b/wave_energy/noaoi/capwe_rc.csv
@@ -1,6 +1,6 @@
id,Value Range,Pixel Count
-1,1 - 1602 megawatt hours per year (MWh/yr),20170.0
-2,1602 - 2200 (MWh/yr),20295.0
-3,2200 - 2348 (MWh/yr),20298.0
-4,2348 - 2528 (MWh/yr),12213.0
-5,Greater than 2528 (MWh/yr),8143.0
+1,1 - 1991 megawatt hours per year (MWh/yr),19.0
+2,1991 - 1991 (MWh/yr),0.0
+3,1991 - 2293 (MWh/yr),477.0
+4,2293 - 2293 (MWh/yr),0.0
+5,Greater than 2293 (MWh/yr),243.0
diff --git a/wave_energy/noaoi/capwe_rc.tif b/wave_energy/noaoi/capwe_rc.tif
index 2ac582a0e6ce6acb2b41bfee1dd3507a82a8c169..1a60d5c10d5c153ee0cec7b7ba451305e7b3a185 100644
Binary files a/wave_energy/noaoi/capwe_rc.tif and b/wave_energy/noaoi/capwe_rc.tif differ
diff --git a/wave_energy/noaoi/wp_kw.tif b/wave_energy/noaoi/wp_kw.tif
index bc341e0325a17ac890d19df8994bf1d01b4a68de..0399caded2d552e9b56a8f02038823f682f75e2d 100644
Binary files a/wave_energy/noaoi/wp_kw.tif and b/wave_energy/noaoi/wp_kw.tif differ
diff --git a/wave_energy/noaoi/wp_rc.csv b/wave_energy/noaoi/wp_rc.csv
index 1845af6580a0ef0318bbb71456535fdda9c2be79..e4e3a6868d471e8ea8f9e7e01c8c4533c71f745d 100644
--- a/wave_energy/noaoi/wp_rc.csv
+++ b/wave_energy/noaoi/wp_rc.csv
@@ -1,6 +1,6 @@
id,Value Range,Pixel Count
-1,1 - 20 wave power per unit width of wave crest length (kW/m),18330.0
-2,20 - 27 (kW/m),19416.0
-3,27 - 34 (kW/m),21655.0
-4,34 - 36 (kW/m),8666.0
-5,Greater than 36 (kW/m),12564.0
+1,1 - 25 wave power per unit width of wave crest length (kW/m),19.0
+2,25 - 25 (kW/m),0.0
+3,25 - 32 (kW/m),477.0
+4,32 - 32 (kW/m),0.0
+5,Greater than 32 (kW/m),243.0
diff --git a/wave_energy/noaoi/wp_rc.tif b/wave_energy/noaoi/wp_rc.tif
index f343607b0d815f9a1a49979c2f530654cb00b5fc..1a60d5c10d5c153ee0cec7b7ba451305e7b3a185 100644
Binary files a/wave_energy/noaoi/wp_rc.tif and b/wave_energy/noaoi/wp_rc.tif differ
diff --git a/wave_energy/valuation/GridPts_prj.dbf b/wave_energy/valuation/GridPts_prj.dbf
index cf9036ec1f172ad1877f8a362cd48b2cfd945e43..7e29f0e3fd1a15d0fc030a091e5ef5f8cc20af3c 100644
Binary files a/wave_energy/valuation/GridPts_prj.dbf and b/wave_energy/valuation/GridPts_prj.dbf differ
diff --git a/wave_energy/valuation/GridPts_prj.shp b/wave_energy/valuation/GridPts_prj.shp
index 465bd7b464acc7d233617ac1021a9d6b765567fc..18cd1954ace27ed871891f3538e88051bb2e2db6 100644
Binary files a/wave_energy/valuation/GridPts_prj.shp and b/wave_energy/valuation/GridPts_prj.shp differ
diff --git a/wave_energy/valuation/GridPts_prj.shx b/wave_energy/valuation/GridPts_prj.shx
index 4856aa853123bf7c5e82d7267ebf6c58c8d90695..9eb56d925b8f02430aa59dbd2199485010fd2fe9 100644
Binary files a/wave_energy/valuation/GridPts_prj.shx and b/wave_energy/valuation/GridPts_prj.shx differ
diff --git a/wave_energy/valuation/LandPts_prj.dbf b/wave_energy/valuation/LandPts_prj.dbf
index cf9036ec1f172ad1877f8a362cd48b2cfd945e43..7e29f0e3fd1a15d0fc030a091e5ef5f8cc20af3c 100644
Binary files a/wave_energy/valuation/LandPts_prj.dbf and b/wave_energy/valuation/LandPts_prj.dbf differ
diff --git a/wave_energy/valuation/LandPts_prj.shp b/wave_energy/valuation/LandPts_prj.shp
index f9c2fe789cf81a732350afc1d9a929f76637e7de..0103c2a755fc94ee03aa971384762fc4df825035 100644
Binary files a/wave_energy/valuation/LandPts_prj.shp and b/wave_energy/valuation/LandPts_prj.shp differ
diff --git a/wave_energy/valuation/LandPts_prj.shx b/wave_energy/valuation/LandPts_prj.shx
index 4729c352693ccfa0fb2858e19a5bae4adf58e04a..3bb834ed2cd99fd3e229ec5b6c2d5d275ac80024 100644
Binary files a/wave_energy/valuation/LandPts_prj.shx and b/wave_energy/valuation/LandPts_prj.shx differ
diff --git a/wave_energy/valuation/capwe_mwh.tif b/wave_energy/valuation/capwe_mwh.tif
index 98eb1eb17f81d49ab7c1451b030e766916a0af3c..911e3497130993745953a88f11804ea1d6381b17 100644
Binary files a/wave_energy/valuation/capwe_mwh.tif and b/wave_energy/valuation/capwe_mwh.tif differ
diff --git a/wave_energy/valuation/capwe_rc.csv b/wave_energy/valuation/capwe_rc.csv
index 42aaee68261578448239408ca974c3c40dbca229..2149f28d2cab32ecdf67d80a2cd7c9bd5c816c14 100644
--- a/wave_energy/valuation/capwe_rc.csv
+++ b/wave_energy/valuation/capwe_rc.csv
@@ -1,6 +1,6 @@
id,Value Range,Pixel Count
-1,1 - 2181 megawatt hours per year (MWh/yr),1555.0
-2,2181 - 2420 (MWh/yr),1592.0
-3,2420 - 2558 (MWh/yr),1593.0
-4,2558 - 2619 (MWh/yr),969.0
-5,Greater than 2619 (MWh/yr),640.0
+1,1 - 2021 megawatt hours per year (MWh/yr),1.0
+2,2021 - 2214 (MWh/yr),1.0
+3,2214 - 0 (MWh/yr),0.0
+4,0 - 0 (MWh/yr),0.0
+5,Greater than 0 (MWh/yr),1.0
diff --git a/wave_energy/valuation/capwe_rc.tif b/wave_energy/valuation/capwe_rc.tif
index 58df303d6ecdf2a948395b9a3035d84007de1685..af6e89d13818112ca6d565c66100cac996d6a249 100644
Binary files a/wave_energy/valuation/capwe_rc.tif and b/wave_energy/valuation/capwe_rc.tif differ
diff --git a/wave_energy/valuation/npv_rc.csv b/wave_energy/valuation/npv_rc.csv
index e10e5e504bfb1d7519f47cd9149479d80fc99bd7..b2d05286f09462a839eb4adc563a4a7f73e08c94 100644
--- a/wave_energy/valuation/npv_rc.csv
+++ b/wave_energy/valuation/npv_rc.csv
@@ -1,6 +1,6 @@
id,Value Range,Pixel Count
-1,1 - -255305 thousands of US dollars (US$),0.0
-2,-255305 - -238059 (US$),1591.0
-3,-238059 - -212179 (US$),1585.0
-4,-212179 - -177555 (US$),952.0
-5,Greater than -177555 (US$),633.0
+1,1 - -164199 thousands of US dollars (US$),0.0
+2,-164199 - 0 (US$),0.0
+3,0 - 0 (US$),0.0
+4,0 - 0 (US$),0.0
+5,Greater than 0 (US$),0.0
diff --git a/wave_energy/valuation/npv_rc.tif b/wave_energy/valuation/npv_rc.tif
index 9ecb49cfafe3938963f54346795d5494e5c3622f..af9e2ea9e6e1b441059391ae3552a84aa4fbd823 100644
Binary files a/wave_energy/valuation/npv_rc.tif and b/wave_energy/valuation/npv_rc.tif differ
diff --git a/wave_energy/valuation/npv_usd.tif b/wave_energy/valuation/npv_usd.tif
index dd356d06d63d2b8bdefa6178acc852f7434c214e..719ca1d21194a21e387faa8d44c652c108f49724 100644
Binary files a/wave_energy/valuation/npv_usd.tif and b/wave_energy/valuation/npv_usd.tif differ
diff --git a/wave_energy/valuation/wp_kw.tif b/wave_energy/valuation/wp_kw.tif
index e9d20a88d523217b3c8ec601df69cf250eb953a5..0724e2c5850eed2e481a7badc35257ffb82f6876 100644
Binary files a/wave_energy/valuation/wp_kw.tif and b/wave_energy/valuation/wp_kw.tif differ
diff --git a/wave_energy/valuation/wp_rc.csv b/wave_energy/valuation/wp_rc.csv
index 8fd1c87eab05ae9c2ec5709c36d6c3fad21df753..232940ae8b9ed0f1c5690ffa82e2c6b8b93ff7f4 100644
--- a/wave_energy/valuation/wp_rc.csv
+++ b/wave_energy/valuation/wp_rc.csv
@@ -1,6 +1,6 @@
id,Value Range,Pixel Count
-1,1 - 29 wave power per unit width of wave crest length (kW/m),1287.0
-2,29 - 34 (kW/m),1386.0
-3,34 - 36 (kW/m),1340.0
-4,36 - 37 (kW/m),974.0
-5,Greater than 37 (kW/m),1236.0
+1,1 - 26 wave power per unit width of wave crest length (kW/m),1.0
+2,26 - 31 (kW/m),1.0
+3,31 - 0 (kW/m),0.0
+4,0 - 0 (kW/m),0.0
+5,Greater than 0 (kW/m),1.0
diff --git a/wave_energy/valuation/wp_rc.tif b/wave_energy/valuation/wp_rc.tif
index 412e9117333e3c1da8ff1be87219c5a6330e0fe2..af6e89d13818112ca6d565c66100cac996d6a249 100644
Binary files a/wave_energy/valuation/wp_rc.tif and b/wave_energy/valuation/wp_rc.tif differ