(fix) Small changes for fuselage

blast/src/blDriver.cpp

@@ -3,11 +3,6 @@
 #include "blSolver.h"
 #include <iomanip>
 
-#define ANSI_COLOR_RED "\x1b[1;31m"
-#define ANSI_COLOR_GREEN "\x1b[1;32m"
-#define ANSI_COLOR_YELLOW "\x1b[1;33m"
-#define ANSI_COLOR_RESET "\x1b[0m"
-
 using namespace blast;
 
 /**
@@ -90,19 +85,16 @@ int Driver::run()
                     maxMach = reg->getMaxMach();
 
                 // Reset transition
-                if (reg->getName() == "wake")
+                if (reg->getName() == "wake" || reg->getName() == "fuselage")
                     reg->setxtr(0.);
                 else if (reg->getName() == "upper" || reg->getName() == "lower")
                     reg->setxtr(1.);
                 else
-                {
-                    std::cout << "reg->getName() " << reg->getName() << std::endl;
-                    throw std::runtime_error("Wrong region name\n");
-                }
+                    throw std::runtime_error("Didn't expect region name: " + reg->getName());
 
                 // Reset regime.
                 lockTrans = false;
-                if (reg->getName() == "upper" || reg->getName() == "lower")
+                if (reg->getName() == "upper" || reg->getName() == "lower" || reg->getName() == "fuselage")
                 {
                     for (auto &nod : reg->nodes)
                         nod->setRegime(0);
@@ -122,7 +114,7 @@ int Driver::run()
                     lockTrans = true;
                 }
                 else
-                    throw std::runtime_error("Wrong region name\n");
+                throw std::runtime_error("Didn't expect region name: " + reg->getName());
 
                 // Loop over points
                 for (size_t inod = 1; inod < reg->getnNodes(); ++inod)

blast/src/blSection.cpp

@@ -143,14 +143,11 @@ void Section::computeDrag()
     else
     {
         // Loop on "upper" "lower" string
-        for (std::string name : {"upper", "lower"})
+        for (auto &reg : regions)
         {
-            int regionId = this->getRegionIdByName(name);
-            if (regionId != -1)
-                std::runtime_error("Region not found");
-            size_t lastPt = (regions[regionId]->getnNodes() - 1) * nVar;
-            Cdt += regions[regionId]->u[lastPt + 0] *
-                   pow(regions[regionId]->u[lastPt + 3], (regions[regionId]->u[lastPt + 1] + 5) / 2);
+            size_t lastPt = (reg->getnNodes() - 1) * nVar;
+            Cdt += reg->u[lastPt + 0] *
+                   pow(reg->u[lastPt + 3], (reg->u[lastPt + 1] + 5) / 2);
         }
     }
     // Pressure drag coefficient.