fix enum default; clean up deprecations

Author: michael-petersen

expui/BiorthBasis.H

@@ -969,7 +969,7 @@ namespace BasisClasses
     int ncylodd, ncylnx, ncylny, ncylr, cmap, cmapR, cmapZ, vflag;
     int rnum, pnum, tnum;
     double rcylmin, rcylmax, acyl, hcyl;
-    bool expcond, logarithmic, density, EVEN_M, sech2 = false;
+    bool expcond, logarithmic, density, EVEN_M, sech2 = true;
 
     std::vector<Eigen::MatrixXd> potd, dpot, dpt2, dend;
     std::vector<Eigen::MatrixXd> legs, dlegs, d2legs;

expui/BiorthBasis.cc

@@ -1658,10 +1658,12 @@ namespace BasisClasses
 	    case DiskType::doubleexpon:
 	    case DiskType::exponential:
 	    case DiskType::diskbulge:
+	      std::cout << "---- pyEXP assumes sech^2(z/(2h)) by default in v7.9.0 and later" << std::endl
+			            << "---- Use the 'sech2: true' in your YAML config to use sech^2(z/(2h))" << std::endl
+                  << "---- This warning will be removed in v7.10.0." << std::endl;
+        break;
       default:
-	      std::cout << "---- pyEXP uses sech^2(z/h) rather than the more common sech^2(z/(2h))" << std::endl
-			<< "---- Use the 'sech2: true' in your YAML config to use sech^2(z/(2h))" << std::endl
-			<< "---- pyEXP will assume sech^2(z/(2h)) by default in v 7.9.0 and later" << std::endl;
+        break;
 	    }
 	  }
 	}

exputil/EmpCylSL.cc

@@ -267,7 +267,7 @@ EmpCylSL::EmpCylSL(int mlim, std::string cachename)
 	if (myid==0)
 	  std::cout << "---- EmpCylSL::ReadH5Cache: "
 		    << "using a workaround for a HighFive HDF5 wrapper bug. "
-                    << "this workaround will be removed in EXP 7.9.0. "
+                    << "this workaround will be removed in EXP 7.10.0. "
 		    << "Please consider rebuilding your cache if possible!"
 		    << std::endl;
       }
@@ -7502,7 +7502,7 @@ bool EmpCylSL::ReadH5Cache()
 	if (myid==0)
 	  std::cout << "---- EmpCylSL::ReadH5Cache: "
 		    << "using a workaround for a HighFive HDF5 wrapper bug. "
-        << "this workaround will be removed in EXP 7.9.0. "
+        << "this workaround will be removed in EXP 7.10.0. "
 		    << "Please consider rebuilding your cache if possible!" << std::endl;
       }
       else {

src/Cylinder.H

@@ -127,7 +127,7 @@ class Cylinder : public Basis
 {
 private:
 
-  bool precond, EVEN_M, subsamp, sech2 = false;
+  bool precond, EVEN_M, subsamp, sech2 = true;
   int rnum, pnum, tnum;
   double ashift;
   unsigned int vflag;

src/Cylinder.cc

@@ -461,9 +461,9 @@ void Cylinder::initialize()
     // Deprecation warning
     if (not sech2 and not conf["pyname"]) {
       if (myid==0)
-	std::cout << "---- Cylinder uses sech^2(z/h) rather than the more common sech^2(z/(2h))" << std::endl
-		  << "---- Use the 'sech2: true' in your YAML config to use sech^2(z/(2h))" << std::endl
-		  << "---- Cylinder will assume sech^2(z/(2h)) by default in v 7.9.0 and later" << std::endl;
+	std::cout << "---- Cylinder assumes sech^2(z/(2h)) by default in v7.9.0 and later" << std::endl
+		        << "---- Use the 'sech2: true' in your YAML config to use sech^2(z/(2h))" << std::endl
+            << "---- This warning will be removed in v7.10.0." << std::endl;
     }
 
     // Deprecation warning