Updates for dcw 2.0.1 (#21)

* Update SJ.txt

Add Jan Mayen (from NO.txt)

* Update config.mk

* Delete NO.txt

* new NO.txt

Without Svalbard and Jan Mayen.

* Update Makefile

Chante time sh for time bash.

* Update Makefile

Change md5 to md5sum

* Update dcw-countries.txt

Update names based on #17.

* Update ChangeLog

* Update dcw-countries.txt

Ukraine change from AS to EU

* Delete t.ps

* Delete AS.txt

American Samoa

* Delete GU.txt

Guam

* Delete MP.txt

Northern Mariana Islands

* Delete PR.txt

Puerto Rico

* Delete UM.txt

United States Minor Outlying Islands

* Delete VI.txt

Virgin Islands, U.S.

* Update dcw-states.txt

Delete territories of US that are in dcw-countries.txt

* Update PB.txt

Delete polygon (#see #19 )

* Update AR.txt

Update ARG with data from the Instituto Geografico Nacional (of Argentina; access 09-09-2021).

* Delete NSW.txt

* Add new NSW.txt

The state as an enclave. Add new to file reorganize trough Spatial -Sh

* Delete KDA.txt

* Add new KDA.txt

Process to plot holes (spatial -Sh)

* Delete MOS.txt

* New MOS.txt

Process with Spatial -Sh

* Delete orig/SA/AR directory

* Add new Argentina provinces

Update with data from the Instituto Geografico Nacional (of Argentina). Data retrieve on 11-sep-2021.

* Update ChangeLog

* Delete UA from AS

* Add Ukraina (UA) to EU

* Add countries from SA

* Delete AG.txt

* Delete AI.txt

* Delete AW.txt

* Delete BB.txt

* Delete BL.txt

* Delete BM.txt

* Delete BQ.txt

* Delete BS.txt

* Delete BZ.txt

* Delete CR.txt

* Delete CU.txt

* Delete CW.txt

* Delete DM.txt

* Delete DO.txt

* Delete GD.txt

* Delete GP.txt

* Delete GT.txt

* Delete HN.txt

* Delete HT.txt

* Delete JM.txt

* Delete KY.txt

* Delete KN.txt

* Delete LC.txt

* Delete MF.txt

* Delete MQ.txt

* Delete MS.txt

* Delete NI.txt

* Delete PM.txt

* Delete PR.txt

* Delete SV.txt

* Delete SX.txt

* Delete TC.txt

* Delete TT.txt

* Delete VC.txt

* Delete VG.txt

* Delete VI.txt

* Update dcw-countries.txt

Update SA and NA countries

* Update ChangeLog

Co-authored-by: Dongdong Tian <[email protected]>

Co-authored-by: Dongdong Tian <[email protected]>

ChangeLog

@@ -2,6 +2,17 @@
         Contains changes made to the data files under dcw-gmt/orig etc
 -----------------------------------------------------------------------------------------
 
+2021-09-12      esteban82
+	        New 2.0.1. Fix some names (North Macedonia, Eswatini, Cabo Verde,
+		Brunei Darussalam, Northern Mariana Islands, Wallis and Futuna, 
+		Antigua and Barbuda, Falkland (Malvinas), Suriname, Trinidad and Tobago).
+		Fix poligons of NO and SJ (Svalbard and Jan Mayen).
+		Add polygon holes for New South Wales (Australia), Krasnodar Krai (Russia) 
+		and Moscow Krai. Upadete data of Argentina and its provinces with dara from
+		the Instituto Geografico Nacional (IGN). Fix bug in Paraíba state (Brazil). 
+
+
+
 2021-04-07	pwessel
 		New 2.0.0 tar/zip files placed on server.
 

Makefile

@@ -53,7 +53,7 @@ clean:
 all:		build-dcw tar-dcw zip-dcw checksum
 
 checksum:
-		md5 -r $(TAG)-$(DCW_VERSION).tar.gz | awk '{printf "Update $(TAG).info with the new check sum: %s\n", $$1}'
+		md5sum -r $(TAG)-$(DCW_VERSION).tar.gz | awk '{printf "Update $(TAG).info with the new check sum: %s\n", $$1}'
 
 archive:	tar-dcw zip-dcw
 
@@ -94,7 +94,7 @@ place-dcw:
 		scp ChangeLog /Volumes/MacNutRAID/UH/RESEARCH/CVSPROJECTS/www/dcw/ChangeLog.txt
 
 fig:
-		time sh dcw-figure.sh
+		time bash dcw-figure.sh
 
 #-------------------------------------------------------------------------------
 #	Data activities
@@ -103,4 +103,4 @@ fig:
 build-dcw:	$(TAG).nc
 
 $(TAG).nc:
-		time sh DCW2singleshortnc.sh $(DCW_VERSION) $(GMT_VERSION)
+		time bash DCW2singleshortnc.sh $(DCW_VERSION) $(GMT_VERSION)

config.mk

@@ -7,8 +7,8 @@
 
 # DCW data version to be released:
 GMT_VERSION	= 6.1.1
-DCW_VERSION	= 2.0.0
-DCW_DATE	= 2021-APR-01
+DCW_VERSION	= 2.0.1
+DCW_DATE	= 2021-SEP-09
 DCW_FTPSITE	= ftp.soest.hawaii.edu:/export/ftp1/ftp/pub/dcw
 GMT_FTPSITE	= ftp.soest.hawaii.edu:/export/ftp1/ftp/pub/gmt
 DCW_WEBSITE	= imina.soest.hawaii.edu:/export/imina2/httpd/htdocs/pwessel/dcw

dcw-countries.txt

@@ -13,7 +13,7 @@ AF CF Central African Republic
 AF CG Congo
 AF CI Côte d'Ivoire
 AF CM Cameroon
-AF CV Cape Verde
+AF CV Cabo Verde
 AF DJ Djibouti
 AF DZ Algeria
 AF EG Egypt
@@ -51,7 +51,7 @@ AF SN Senegal
 AF SO Somalia
 AF SS South Sudan
 AF ST Sao Tome and Principe
-AF SZ Swaziland
+AF SZ Eswatini
 AF TD Chad
 AF TF French Southern Territories
 AF TG Togo
@@ -69,7 +69,7 @@ AS AM Armenia
 AS AZ Azerbaijan
 AS BD Bangladesh
 AS BH Bahrain
-AS BN Brunei
+AS BN Brunei Darussalam
 AS BT Bhutan
 AS CN China
 AS CX Christmas Island
@@ -114,7 +114,6 @@ AS TL Timor-Leste
 AS TM Turkmenistan
 AS TR Turkey
 AS TW Taiwan
-AS UA Ukraine
 AS UZ Uzbekistan
 AS VN Viet Nam
 AS YE Yemen
@@ -168,11 +167,49 @@ EU SI Slovenia
 EU SJ Svalbard and Jan Mayen
 EU SK Slovakia
 EU SM San Marino
+EU UA Ukraine
 EU VA Holy See (Vatican City State)
 EU XK Kosovo
+NA AG Antigua and Barbuda
+NA AI Anguilla
+NA AW Aruba
+NA BB Barbados
+NA BL Saint Barthélemy
+NA BM Bermuda
+NA BQ Bonaire, Sint Eustatius and Saba
+NA BS Bahamas
+NA BZ Belize
 NA CA Canada
+NA CR Costa Rica
+NA CU Cuba
+NA CW Curaçao
+NA DM Dominica
+NA DO Dominican Republic
+NA GD Grenada
+NA GP Guadeloupe
+NA GT Guatemala
+NA HN Honduras
+NA HT Haiti
+NA JM Jamaica
+NA KN Saint Kitts and Nevis
+NA KY Cayman Islands
+NA LC Saint Lucia
+NA MF Saint Martin (French part)
+NA MQ Martinique
+NA MS Montserrat
 NA MX Mexico
+NA NI Nicaragua
+NA PA Panama
+NA PM Saint Pierre and Miquelon
+NA PR Puerto Rico
+NA SV El Salvador
+NA SX Sint Maarten
+NA TC Turks and Caicos
+NA TT Trinidad and Tobago
 NA US United States
+NA VC Saint Vincent and the Grenadines
+NA VG British Virgin Islands
+NA VI Virgin Islands
 OC AS American Samoa
 OC AU Australia
 OC CC Cocos (Keeling) Islands
@@ -182,7 +219,7 @@ OC FM Micronesia
 OC GU Guam
 OC KI Kiribati
 OC MH Marshall Islands
-OC MP Mariana
+OC MP Northern Mariana Islands
 OC NC New Caledonia
 OC NF Norfolk Island
 OC NR Nauru
@@ -198,57 +235,20 @@ OC TO Tonga
 OC TV Tuvalu
 OC UM United States Minor Outlying Islands
 OC VU Vanuatu
-OC WF Wallis
+OC WF Wallis and Futuna
 OC WS Samoa
-SA AG Antigua
-SA AI Anguilla
 SA AR Argentina
-SA AW Aruba
-SA BB Barbados
-SA BL Saint Barthélemy
-SA BM Bermuda
 SA BO Bolivia
-SA BQ Bonaire, Sint Eustatius and Saba
 SA BR Brazil
-SA BS Bahamas
-SA BZ Belize
 SA CL Chile
 SA CO Colombia
-SA CR Costa Rica
-SA CU Cuba
-SA CW Curaçao
-SA DM Dominica
-SA DO Dominican Republic
 SA EC Ecuador
-SA FK Falkland Islands
-SA GD Grenada
+SA FK Falkland Islands (Malvinas)
 SA GF French Guiana
-SA GP Guadeloupe
 SA GS South Georgia and the South Sandwich Islands
-SA GT Guatemala
 SA GY Guyana
-SA HN Honduras
-SA HT Haiti
-SA JM Jamaica
-SA KN Saint Kitts and Nevis
-SA KY Cayman Islands
-SA LC Saint Lucia
-SA MF Saint Martin (French part)
-SA MQ Martinique
-SA MS Montserrat
-SA NI Nicaragua
-SA PA Panama
 SA PE Peru
-SA PM Saint Pierre and Miquelon
-SA PR Puerto Rico
 SA PY Paraguay
-SA SR Surinam
-SA SV El Salvador
-SA SX Sint Maarten
-SA TC Turks and Caicos
-SA TT Trinidad
+SA SR Suriname
 SA UY Uruguay
-SA VC Saint Vincent and the Grenadines
 SA VE Venezuela
-SA VG British Virgin Islands
-SA VI Virgin Islands

dcw-states.txt

@@ -229,7 +229,6 @@ RU ZAB Zabaylkasky Krai (Zabaykal'skiy Kray)
 US AK Alaska
 US AL Alabama
 US AR Arkansas
-US AS American Samoa
 US AZ Arizona
 US CA California
 US CO Colorado
@@ -238,7 +237,6 @@ US DC District of Columbia
 US DE Delaware
 US FL Florida
 US GA Georgia
-US GU Guam
 US HI Hawaii
 US IA Iowa
 US ID Idaho
@@ -253,7 +251,6 @@ US ME Maine
 US MI Michigan
 US MN Minnesota
 US MO Missouri
-US MP Northern Mariana Islands
 US MS Mississippi
 US MT Montana
 US NC North Carolina
@@ -268,16 +265,13 @@ US OH Ohio
 US OK Oklahoma
 US OR Oregon
 US PA Pennsylvania
-US PR Puerto Rico
 US RI Rhode Island
 US SC South Carolina
 US SD South Dakota
 US TN Tennessee
 US TX Texas
-US UM United States Minor Outlying Islands
 US UT Utah
 US VA Virginia
-US VI Virgin Islands, U.S.
 US VT Vermont
 US WA Washington
 US WI Wisconsin