Added default EXP n-body units with L=M=T=G; Coefs throws an exception if units are not fully specified

Author: Martin D. Weinberg

expui/Coefficients.cc

@@ -152,10 +152,12 @@ namespace CoefClasses
   void Coefs::WriteH5Units(HighFive::File& file)
   {
     if (units.size() != 4) {
-      std::cout << "---- Coefs::WriteH5Units: Warning, expected 4 units: "
-		<< "(length, mass, time, G) or (length, mass, velocity, G), etc. " << std::endl
-		<< "---- Coefs::WriteH5Units:  I found " << units.size() << " units instead.  Please "
-		<< " provide a consistent unit set." << std::endl;
+      std::ostringstream sout;
+      sout << "---- Coefs::WriteH5Units: Warning, expected 4 units: "
+	   << "(length, mass, time, G) or (length, mass, velocity, G), etc. "
+	   << "I found " << units.size() << " units instead.  Please "
+	   << " provide a consistent unit set.";
+      throw std::runtime_error(sout.str());
     }
 
     HighFive::DataSet dataset = file.createDataSet("Units", units);
@@ -171,8 +173,10 @@ namespace CoefClasses
     if (file.exist("Units")) {
       HighFive::DataSet dataset = file.getDataSet("Units");
       units = dataset.read<std::vector<Unit>>();
-      std::cout << "Coefs::ReadH5Units: read units from HDF5 file:" << std::endl;
-      std::cout << units;
+      if (verbose and myid==0) {
+	std::cout << "Coefs::ReadH5Units: read units from HDF5 file:" << std::endl;
+	std::cout << units;
+      }
     }
   }
 

src/Cube.cc

@@ -520,6 +520,11 @@ void Cube::dump_coefs_h5(const std::string& file)
     // Add the name attribute.  We only need this on the first call.
     cubeCoefs.setName(component->name);
 
+    // Add the default units
+    cubeCoefs.setUnits({{"length", "none", 1.0},
+			{"mass",   "none", 1.0},
+			{"time",   "none", 1.0}});
+
     // And the new coefficients and write the new HDF5
     cubeCoefs.clear();
     cubeCoefs.add(cur);

src/Cylinder.cc

@@ -1587,6 +1587,11 @@ void Cylinder::dump_coefs_h5(const std::string& file)
     // Add the name attribute.  We only need this on the first call.
     cylCoefs.setName(component->name);
 
+    // Add the default units
+    cylCoefs.setUnits({{"length", "none", 1.0},
+		       {"mass",   "none", 1.0},
+		       {"time",   "none", 1.0}});
+
     // Add the new coefficients and write the new HDF5
     cylCoefs.clear();
     cylCoefs.add(cur);

src/PolarBasis.cc

@@ -1842,6 +1842,11 @@ void PolarBasis::dump_coefs_h5(const std::string& file)
     // Add the name attribute.  We only need this on the first call.
     cylCoefs.setName(component->name);
 
+    // Add the default units
+    cylCoefs.setUnits({{"length", "none", 1.0},
+		       {"mass",   "none", 1.0},
+		       {"time",   "none", 1.0}});
+
     // And the new coefficients and write the new HDF5
     cylCoefs.clear();
     cylCoefs.add(cur);

src/ShearSL.cc

@@ -374,6 +374,11 @@ void ShearSL::dump_coefs_h5(const std::string& file)
     // Add the name attribute.  We only need this on the first call.
     slabCoefs.setName(component->name);
 
+    // Add the default units
+    slabCoefs.setUnits({{"length", "none", 1.0},
+			{"mass",   "none", 1.0},
+			{"time",   "none", 1.0}});
+
     // And the new coefficients and write the new HDF5
     slabCoefs.clear();
     slabCoefs.add(cur);

src/SlabSL.cc

@@ -513,6 +513,11 @@ void SlabSL::dump_coefs_h5(const std::string& file)
     // Add the name attribute.  We only need this on the first call.
     slabCoefs.setName(component->name);
 
+    // Add the default units
+    slabCoefs.setUnits({{"length", "none", 1.0},
+			{"mass",   "none", 1.0},
+			{"time",   "none", 1.0}});
+
     // And the new coefficients and write the new HDF5
     slabCoefs.clear();
     slabCoefs.add(cur);

src/SphericalBasis.cc

@@ -1926,6 +1926,11 @@ void SphericalBasis::dump_coefs_h5(const std::string& file)
     // Add the name attribute.  We only need this on the first call.
     sphCoefs.setName(component->name);
 
+    // Add the default units
+    sphCoefs.setUnits({{"length", "none", 1.0},
+		       {"mass",   "none", 1.0},
+		       {"time",   "none", 1.0}});
+
     // And the new coefficients and write the new HDF5
     sphCoefs.clear();
     sphCoefs.add(cur);