Not using proper spherical earth in tests that use a spherical projection. +a replaced with +R

21 files changed, 27 insertions, 27 deletions

diff --git a/src/PJ_aea.c b/src/PJ_aea.c
index f30d3b6c..9ed9cf04 100644
--- a/src/PJ_aea.c
+++ b/src/PJ_aea.c
@@ -220,7 +220,7 @@ int pj_aea_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=aea   +ellps=GRS80  +lat_1=0 +lat_2=2"};
-    char s_args[] = {"+proj=aea   +a=6400000    +lat_1=0 +lat_2=2"};
+    char s_args[] = {"+proj=aea   +R=6400000    +lat_1=0 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
@@ -280,7 +280,7 @@ int pj_leac_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=leac   +ellps=GRS80  +lat_1=0 +lat_2=2"};
-    char s_args[] = {"+proj=leac   +a=6400000    +lat_1=0 +lat_2=2"};
+    char s_args[] = {"+proj=leac   +R=6400000    +lat_1=0 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_aeqd.c b/src/PJ_aeqd.c
index d1dcdaa1..907e7d44 100644
--- a/src/PJ_aeqd.c
+++ b/src/PJ_aeqd.c
@@ -319,7 +319,7 @@ int pj_aeqd_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=aeqd   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=aeqd   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=aeqd   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_aitoff.c b/src/PJ_aitoff.c
index 68d95ef8..e85f6391 100644
--- a/src/PJ_aitoff.c
+++ b/src/PJ_aitoff.c
@@ -207,7 +207,7 @@ int pj_aitoff_selftest (void) {
     double tolerance_lp = 1e-10;
     double tolerance_xy = 1e-7;
 
-    char s_args[] = {"+proj=aitoff   +a=6400000    +lat_1=0 +lat_2=2"};
+    char s_args[] = {"+proj=aitoff   +R=6400000    +lat_1=0 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_bonne.c b/src/PJ_bonne.c
index ac2249f8..47793ed6 100644
--- a/src/PJ_bonne.c
+++ b/src/PJ_bonne.c
@@ -129,7 +129,7 @@ int pj_bonne_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=bonne   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=bonne   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=bonne   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_cass.c b/src/PJ_cass.c
index 1eb978e5..85280205 100644
--- a/src/PJ_cass.c
+++ b/src/PJ_cass.c
@@ -129,7 +129,7 @@ int pj_cass_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=cass   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=cass   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=cass   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_cea.c b/src/PJ_cea.c
index 723611cf..eb6435ab 100644
--- a/src/PJ_cea.c
+++ b/src/PJ_cea.c
@@ -105,7 +105,7 @@ int pj_cea_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=cea   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=cea   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=cea   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_eqdc.c b/src/PJ_eqdc.c
index 1fc4cef7..a83abede 100644
--- a/src/PJ_eqdc.c
+++ b/src/PJ_eqdc.c
@@ -139,7 +139,7 @@ int pj_eqdc_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=eqdc   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=eqdc   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=eqdc   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_geos.c b/src/PJ_geos.c
index 283063ba..b7caacc3 100644
--- a/src/PJ_geos.c
+++ b/src/PJ_geos.c
@@ -248,7 +248,7 @@ int pj_geos_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=geos   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +h=35785831"};
-    char s_args[] = {"+proj=geos   +a=6400000    +lat_1=0.5 +lat_2=2 +h=35785831"};
+    char s_args[] = {"+proj=geos   +R=6400000    +lat_1=0.5 +lat_2=2 +h=35785831"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_gn_sinu.c b/src/PJ_gn_sinu.c
index b35ee290..5dad9787 100644
--- a/src/PJ_gn_sinu.c
+++ b/src/PJ_gn_sinu.c
@@ -189,7 +189,7 @@ int pj_sinu_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=sinu   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=sinu   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=sinu   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_gstmerc.c b/src/PJ_gstmerc.c
index 0951aacf..a550ab2c 100644
--- a/src/PJ_gstmerc.c
+++ b/src/PJ_gstmerc.c
@@ -93,7 +93,7 @@ int pj_gstmerc_selftest (void) {
     double tolerance_lp = 1e-10;
     double tolerance_xy = 1e-7;
 
-    char s_args[] = {"+proj=gstmerc   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=gstmerc   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_healpix.c b/src/PJ_healpix.c
index 8fd2c829..781fbb7a 100644
--- a/src/PJ_healpix.c
+++ b/src/PJ_healpix.c
@@ -671,7 +671,7 @@ int pj_healpix_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=healpix   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=healpix   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=healpix   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
@@ -730,7 +730,7 @@ int pj_rhealpix_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=rhealpix   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=rhealpix   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=rhealpix   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_laea.c b/src/PJ_laea.c
index c9aef5c3..a92c2a4a 100644
--- a/src/PJ_laea.c
+++ b/src/PJ_laea.c
@@ -287,7 +287,7 @@ int pj_laea_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=laea   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=laea   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=laea   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_merc.c b/src/PJ_merc.c
index 4740e1eb..e0ec9658 100644
--- a/src/PJ_merc.c
+++ b/src/PJ_merc.c
@@ -83,7 +83,7 @@ int pj_merc_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=merc   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=merc   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=merc   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_misrsom.c b/src/PJ_misrsom.c
index 2e7e6b52..4d910b4a 100644
--- a/src/PJ_misrsom.c
+++ b/src/PJ_misrsom.c
@@ -230,7 +230,7 @@ int pj_misrsom_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=misrsom   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +path=1"};
-    char s_args[] = {"+proj=misrsom   +a=6400000    +lat_1=0.5 +lat_2=2 +path=1"};
+    char s_args[] = {"+proj=misrsom   +R=6400000    +lat_1=0.5 +lat_2=2 +path=1"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_mod_ster.c b/src/PJ_mod_ster.c
index 9d34aa73..5d66fb41 100644
--- a/src/PJ_mod_ster.c
+++ b/src/PJ_mod_ster.c
@@ -299,7 +299,7 @@ int pj_mil_os_selftest (void) {
     double tolerance_lp = 1e-10;
     double tolerance_xy = 1e-7;
 
-    char s_args[] = {"+proj=mil_os   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=mil_os   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
@@ -343,7 +343,7 @@ int pj_lee_os_selftest (void) {
     double tolerance_lp = 1e-10;
     double tolerance_xy = 1e-7;
 
-    char s_args[] = {"+proj=lee_os   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=lee_os   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
@@ -387,7 +387,7 @@ int pj_gs48_selftest (void) {
     double tolerance_lp = 1e-12;
     double tolerance_xy = 1e-8;
 
-    char s_args[] = {"+proj=gs48 +a=6370997"};
+    char s_args[] = {"+proj=gs48 +R=6370997"};
 
     /* All latitudes and longitudes within the continental US */
     LP fwd_in[] = {
@@ -435,7 +435,7 @@ int pj_alsk_selftest (void) {
     double tolerance_xy = 1e-8;
 
     char e_args[] = {"+proj=alsk +ellps=clrk66"};
-    char s_args[] = {"+proj=alsk +a=6370997"};
+    char s_args[] = {"+proj=alsk +R=6370997"};
 
     LP fwd_in[] = {
         {-160.0, 55.0},
@@ -494,7 +494,7 @@ int pj_gs50_selftest (void) {
     double tolerance_xy = 1e-8;
 
     char e_args[] = {"+proj=gs50 +ellps=clrk66"};
-    char s_args[] = {"+proj=gs50 +a=6370997"};
+    char s_args[] = {"+proj=gs50 +R=6370997"};
 
     LP fwd_in[] = {
         {-160.0, 65.0},
diff --git a/src/PJ_poly.c b/src/PJ_poly.c
index e2ecdd89..5a679d61 100644
--- a/src/PJ_poly.c
+++ b/src/PJ_poly.c
@@ -166,7 +166,7 @@ int pj_poly_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=poly   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=poly   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=poly   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_qsc.c b/src/PJ_qsc.c
index 2777736b..5881290b 100644
--- a/src/PJ_qsc.c
+++ b/src/PJ_qsc.c
@@ -420,7 +420,7 @@ int pj_qsc_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=qsc   +ellps=GRS80  +lat_1=0.5 +lat_2=2"};
-    char s_args[] = {"+proj=qsc   +a=6400000    +lat_1=0.5 +lat_2=2"};
+    char s_args[] = {"+proj=qsc   +R=6400000    +lat_1=0.5 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_somerc.c b/src/PJ_somerc.c
index 22ee5f5c..f7438a92 100644
--- a/src/PJ_somerc.c
+++ b/src/PJ_somerc.c
@@ -114,7 +114,7 @@ int pj_somerc_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=somerc   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5"};
-    char s_args[] = {"+proj=somerc   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5"};
+    char s_args[] = {"+proj=somerc   +R=6400000    +lat_1=0.5 +lat_2=2 +n=0.5"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_stere.c b/src/PJ_stere.c
index cfea73d8..c08b1093 100644
--- a/src/PJ_stere.c
+++ b/src/PJ_stere.c
@@ -310,7 +310,7 @@ int pj_stere_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=stere   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5"};
-    char s_args[] = {"+proj=stere   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5"};
+    char s_args[] = {"+proj=stere   +R=6400000    +lat_1=0.5 +lat_2=2 +n=0.5"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_sterea.c b/src/PJ_sterea.c
index 1b912316..6e450899 100644
--- a/src/PJ_sterea.c
+++ b/src/PJ_sterea.c
@@ -127,7 +127,7 @@ int pj_sterea_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=sterea   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5"};
-    char s_args[] = {"+proj=sterea   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5"};
+    char s_args[] = {"+proj=sterea   +R=6400000    +lat_1=0.5 +lat_2=2 +n=0.5"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/PJ_tmerc.c b/src/PJ_tmerc.c
index 793f1e95..dcade171 100644
--- a/src/PJ_tmerc.c
+++ b/src/PJ_tmerc.c
@@ -206,7 +206,7 @@ int pj_tmerc_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=tmerc   +ellps=GRS80  +lat_1=0.5 +lat_2=2 +n=0.5"};
-    char s_args[] = {"+proj=tmerc   +a=6400000    +lat_1=0.5 +lat_2=2 +n=0.5"};
+    char s_args[] = {"+proj=tmerc   +R=6400000    +lat_1=0.5 +lat_2=2 +n=0.5"};
 
     LP fwd_in[] = {
         { 2, 1},