diff --git a/blast/_src/blastw.h b/blast/_src/blastw.h index 3d5c1f2144c919cb64f716aa53c72244eae8e4bb..ff4c9d12bf3ccbb26f40acc047f7b1e0e92e7c4f 100644 --- a/blast/_src/blastw.h +++ b/blast/_src/blastw.h @@ -14,6 +14,6 @@ * limitations under the License. */ -#include "DBoundaryLayer.h" -#include "DCoupledAdjoint.h" -#include "DDriver.h" \ No newline at end of file +#include "blBoundaryLayer.h" +#include "blCoupledAdjoint.h" +#include "blDriver.h" diff --git a/blast/_src/blastw.i b/blast/_src/blastw.i index 21a5c329a50c332fc799cd30c29d2b03e6bf2eaf..45c10f90891a67c12606f945a0aea891bcf0c035 100644 --- a/blast/_src/blastw.i +++ b/blast/_src/blastw.i @@ -26,7 +26,7 @@ threads="1" %{ #include "blast.h" -#include "DBoundaryLayer.h" +#include "blBoundaryLayer.h" #include "fwkw.h" #include "tboxw.h" @@ -44,7 +44,7 @@ threads="1" %include "blast.h" %shared_ptr(blast::BoundaryLayer); -%include "DBoundaryLayer.h" +%include "blBoundaryLayer.h" %shared_ptr(blast::Driver); %immutable blast::Driver::Re; // read-only variable (no setter) @@ -56,9 +56,9 @@ threads="1" %immutable blast::Driver::Cdp_sec; %immutable blast::Driver::CFL0; %immutable blast::Driver::verbose; -%include "DDriver.h" +%include "blDriver.h" %shared_ptr(blast::CoupledAdjoint); %immutable blast::CoupledAdjoint::tdCl_AoA; %immutable blast::CoupledAdjoint::tdCd_AoA; -%include "DCoupledAdjoint.h" +%include "blCoupledAdjoint.h" diff --git a/blast/api/blaster_api.py b/blast/api/blaster_api.py index 85fb54c968510dac49d7dd057eaf79396cc6c853..ef1d3bca7b18d54ec1cb9c2d7f0fa1a4e30b4784 100644 --- a/blast/api/blaster_api.py +++ b/blast/api/blaster_api.py @@ -54,13 +54,13 @@ def init_blaster(cfg, icfg, iSolverName='DART', task='analysis'): @todo: - Correctly handle 3D computation parameters. """ # Imports - from blast.coupler import Coupler + from blast.blCoupler import Coupler import blast if iSolverName not in AVAILABLE_SOLVERS: raise RuntimeError('BLASTERAPI: Invalid inviscid solver name', iSolverName) elif iSolverName == 'DART': - from blast.interfaces.dart.DartInterface import DartInterface as interface + from blast.interfaces.dart.blDartInterface import DartInterface as interface # Viscous solver if 'Re' not in cfg or cfg['Re'] <= 0.: diff --git a/blast/api/mda_api.py b/blast/api/mda_api.py index 6918badec5cb70d3bda498e102b197543c28bbf7..b69947c1856711356dbbd6198c5e076c2b816a15 100644 --- a/blast/api/mda_api.py +++ b/blast/api/mda_api.py @@ -23,7 +23,7 @@ import numpy as np from fwk.coloring import ccolors import openmdao.api as om import blast -import blast.utils as vutils +import blast.blUtils as vutils from pygeo import DVGeometryCST from scipy.optimize import least_squares import fwk @@ -57,7 +57,7 @@ class BlasterSolver(om.ExplicitComponent): self.tms = fwk.Timers() if iSolverName == 'DART': - from blast.interfaces.dart.DartInterface import DartInterface as interface + from blast.interfaces.dart.blDartInterface import DartInterface as interface else: raise RuntimeError('Solver '+iSolverName+' currently not implemented') @@ -69,7 +69,7 @@ class BlasterSolver(om.ExplicitComponent): self.isol = interface(icfg, self.vsol, cfg) # Coupler - import blast.coupler as blastCoupler + import blast.blCoupler as blastCoupler self.coupler = blastCoupler.Coupler(self.isol, self.vsol, _maxCouplIter=cfg['couplIter'], _couplTol=cfg['couplTol'], _iterPrint=cfg['iterPrint'], _resetInv=cfg['resetInv']) # Adjoint diff --git a/blast/coupler.py b/blast/blCoupler.py similarity index 99% rename from blast/coupler.py rename to blast/blCoupler.py index de1c0369c89aed1f3ba4ed26b1cb585c5cf62329..491c185013e0abec879e7eae465eee222c205f74 100644 --- a/blast/coupler.py +++ b/blast/blCoupler.py @@ -22,7 +22,7 @@ import fwk from fwk.coloring import ccolors import math import numpy as np -import blast.utils as vutils +import blast.blUtils as vutils class Coupler: def __init__(self, iSolverAPI, vSolver, _maxCouplIter=150, _couplTol=1e-4, _iterPrint=1, _resetInv=False, sfx=''): diff --git a/blast/utils.py b/blast/blUtils.py similarity index 98% rename from blast/utils.py rename to blast/blUtils.py index c7e36d6dbf6c01c9c9ab7dd9b6942c1f75030c72..2ff8b0ebfa6460cd8365adbb5643e28d000c6c55 100644 --- a/blast/utils.py +++ b/blast/blUtils.py @@ -79,14 +79,14 @@ def initBlast(iconfig, vconfig, iSolver='DART'): # Inviscid solver if iSolver == 'DART': - from blast.interfaces.dart.DartInterface import DartInterface as interface + from blast.interfaces.dart.blDartInterface import DartInterface as interface else: print(ccolors.ANSI_RED + 'Solver '+iSolver+' currently not implemented' + ccolors.ANSI_RESET) raise RuntimeError iSolverAPI = interface(iconfig, vSolver, vconfig) # Coupler - import blast.coupler as blastCoupler + import blast.blCoupler as blastCoupler coupler = blastCoupler.Coupler(iSolverAPI, vSolver, _maxCouplIter=vconfig['couplIter'], _couplTol=vconfig['couplTol'], _iterPrint=vconfig['iterPrint'], _resetInv=vconfig['resetInv'], sfx=vconfig['sfx']) return coupler, iSolverAPI, vSolver diff --git a/blast/interfaces/DDataStructure.py b/blast/interfaces/blDataStructure.py similarity index 100% rename from blast/interfaces/DDataStructure.py rename to blast/interfaces/blDataStructure.py diff --git a/blast/interfaces/DSolversInterface.py b/blast/interfaces/blSolversInterface.py similarity index 98% rename from blast/interfaces/DSolversInterface.py rename to blast/interfaces/blSolversInterface.py index 2e2e5e15a3b8c7e1645bf363d3da452bf2b92354..05e23dde69032394225ad42e634ab246a2736c23 100644 --- a/blast/interfaces/DSolversInterface.py +++ b/blast/interfaces/blSolversInterface.py @@ -2,7 +2,7 @@ import numpy as np import blast import fwk import tbox -from blast.interfaces.DDataStructure import Group +from blast.interfaces.blDataStructure import Group class SolversInterface: """ @@ -53,7 +53,7 @@ class SolversInterface: # Initialize interpolator and meshes self.getWing() if self.cfg['interpolator'] == 'Matching': - from blast.interfaces.interpolators.DMatchingInterpolator import MatchingInterpolator as interp + from blast.interfaces.interpolators.blMatchingInterpolator import MatchingInterpolator as interp # Initialize viscous structures for matching computations for iSec in range(len(self.vBnd)): for iReg, reg in enumerate(self.vBnd[iSec]): @@ -64,7 +64,7 @@ class SolversInterface: self.vBnd[iSec][iReg].connectListElems = self.iBnd[iReg].connectListElems.copy() elif self.cfg['interpolator'] == 'Rbf': - from blast.interfaces.interpolators.DRbfInterpolator import RbfInterpolator as interp + from blast.interfaces.interpolators.blRbfInterpolator import RbfInterpolator as interp print('Initializing RBF interpolator.') self.getVWing() else: diff --git a/blast/interfaces/dart/DartInterface.py b/blast/interfaces/dart/blDartInterface.py similarity index 99% rename from blast/interfaces/dart/DartInterface.py rename to blast/interfaces/dart/blDartInterface.py index 76406349bf22b0a053f8a24685c17068398e7536..49eac1ab388f4755b432ce99c4866eb7c95c0c98 100644 --- a/blast/interfaces/dart/DartInterface.py +++ b/blast/interfaces/dart/blDartInterface.py @@ -22,7 +22,7 @@ import numpy as np from fwk.coloring import ccolors -from blast.interfaces.DSolversInterface import SolversInterface +from blast.interfaces.blSolversInterface import SolversInterface class DartInterface(SolversInterface): """Interface to the Dart solver. diff --git a/blast/interfaces/interpolators/DMatchingInterpolator.py b/blast/interfaces/interpolators/blMatchingInterpolator.py similarity index 100% rename from blast/interfaces/interpolators/DMatchingInterpolator.py rename to blast/interfaces/interpolators/blMatchingInterpolator.py diff --git a/blast/interfaces/interpolators/DRbfInterpolator.py b/blast/interfaces/interpolators/blRbfInterpolator.py similarity index 100% rename from blast/interfaces/interpolators/DRbfInterpolator.py rename to blast/interfaces/interpolators/blRbfInterpolator.py diff --git a/blast/interfaces/su2/SU2Interface.py b/blast/interfaces/su2/blSU2Interface.py similarity index 99% rename from blast/interfaces/su2/SU2Interface.py rename to blast/interfaces/su2/blSU2Interface.py index b0c06cbb5353f0f112995e65bf2ccc584e9e7bca..fa07bf42e9844b553c2bb6b170422e5e47445f60 100644 --- a/blast/interfaces/su2/SU2Interface.py +++ b/blast/interfaces/su2/blSU2Interface.py @@ -20,7 +20,7 @@ # Paul Dechamps import numpy as np -from blast.interfaces.DSolversInterface import SolversInterface +from blast.interfaces.blSolversInterface import SolversInterface class SU2Interface(SolversInterface): def __init__(self, fileName, vSolver, cfg): diff --git a/blast/src/DBoundaryLayer.cpp b/blast/src/blBoundaryLayer.cpp similarity index 99% rename from blast/src/DBoundaryLayer.cpp rename to blast/src/blBoundaryLayer.cpp index d61d8c611789a10b34308466349b6fb8a28c4d4f..006c643cd49b00693a2851d04c19b3bb1a07237e 100644 --- a/blast/src/DBoundaryLayer.cpp +++ b/blast/src/blBoundaryLayer.cpp @@ -1,5 +1,5 @@ -#include "DBoundaryLayer.h" -#include "DClosures.h" +#include "blBoundaryLayer.h" +#include "blClosures.h" #include <cmath> #include <iomanip> #include <iostream> diff --git a/blast/src/DBoundaryLayer.h b/blast/src/blBoundaryLayer.h similarity index 98% rename from blast/src/DBoundaryLayer.h rename to blast/src/blBoundaryLayer.h index f8046be2c1e09a6bf18a036852feaf60e2ea47aa..185af55072ff2dbdb604d00ff83bcd0a11d8ecd1 100644 --- a/blast/src/DBoundaryLayer.h +++ b/blast/src/blBoundaryLayer.h @@ -1,7 +1,7 @@ -#ifndef DBOUNDARYLAYER_H -#define DBOUNDARYLAYER_H +#ifndef BLBOUNDARYLAYER_H +#define BLBOUNDARYLAYER_H -#include "DClosures.h" +#include "blClosures.h" #include "blast.h" #include "wObject.h" @@ -155,4 +155,4 @@ public: std::vector<std::vector<double>> evalGradwrtY(); }; } // namespace blast -#endif // DBOUNDARYLAYER_H +#endif // BLBOUNDARYLAYER_H diff --git a/blast/src/DClosures.cpp b/blast/src/blClosures.cpp similarity index 99% rename from blast/src/DClosures.cpp rename to blast/src/blClosures.cpp index 6e608589fa3ce0a3d31899bf6b87eee92818ad70..ab2a9fdbf0ad4d510f85da983a5bb35d7da9f581 100644 --- a/blast/src/DClosures.cpp +++ b/blast/src/blClosures.cpp @@ -1,4 +1,4 @@ -#include "DClosures.h" +#include "blClosures.h" #include <cmath> #include <iostream> diff --git a/blast/src/DClosures.h b/blast/src/blClosures.h similarity index 92% rename from blast/src/DClosures.h rename to blast/src/blClosures.h index f5ffe557dd4b3eae504646fd58b355f6fe2eefa9..42d48ecfcc1d61bf3267c3240ca156294b360a7a 100644 --- a/blast/src/DClosures.h +++ b/blast/src/blClosures.h @@ -1,5 +1,5 @@ -#ifndef DCLOSURES_H -#define DCLOSURES_H +#ifndef BLCLOSURES_H +#define BLCLOSURES_H #include "blast.h" #include <string> @@ -27,4 +27,4 @@ public: const std::string name); }; } // namespace blast -#endif // DCLOSURES_H +#endif // BLCLOSURES_H diff --git a/blast/src/DCoupledAdjoint.cpp b/blast/src/blCoupledAdjoint.cpp similarity index 99% rename from blast/src/DCoupledAdjoint.cpp rename to blast/src/blCoupledAdjoint.cpp index bdf2f5715fd020a195323f50e3c439d61cf7f004..16adf2b9b4a7ca7f9955b03a6ae5a78d1b71e70e 100644 --- a/blast/src/DCoupledAdjoint.cpp +++ b/blast/src/blCoupledAdjoint.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "DCoupledAdjoint.h" -#include "DDriver.h" +#include "blCoupledAdjoint.h" +#include "blDriver.h" #include "wAdjoint.h" #include "wBlowing.h" #include "wBlowingResidual.h" diff --git a/blast/src/DCoupledAdjoint.h b/blast/src/blCoupledAdjoint.h similarity index 99% rename from blast/src/DCoupledAdjoint.h rename to blast/src/blCoupledAdjoint.h index 3087e12d881179ffeb3c50ef6235e7fc99689106..220a0f4a0ca5d2a2c378c4c0aad1dfff5dfdaef0 100644 --- a/blast/src/DCoupledAdjoint.h +++ b/blast/src/blCoupledAdjoint.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef DCOUPLEDADJOINT_H -#define DCOUPLEDADJOINT_H +#ifndef BLCOUPLEDADJOINT_H +#define BLCOUPLEDADJOINT_H #include "blast.h" #include "dart.h" @@ -250,4 +250,4 @@ private: const std::string &filename); }; } // namespace blast -#endif // DDARTADJOINT +#endif // BLCOUPLEDADJOINT_H diff --git a/blast/src/DDriver.cpp b/blast/src/blDriver.cpp similarity index 99% rename from blast/src/DDriver.cpp rename to blast/src/blDriver.cpp index 8a0787c4411c9b480d2e5416ae11eb4d35f147f0..b2bd2cac43262467d4120c1a781a42cfc55fa378 100644 --- a/blast/src/DDriver.cpp +++ b/blast/src/blDriver.cpp @@ -1,6 +1,6 @@ -#include "DDriver.h" -#include "DBoundaryLayer.h" -#include "DSolver.h" +#include "blDriver.h" +#include "blBoundaryLayer.h" +#include "blSolver.h" #include <iomanip> #define ANSI_COLOR_RED "\x1b[1;31m" diff --git a/blast/src/DDriver.h b/blast/src/blDriver.h similarity index 96% rename from blast/src/DDriver.h rename to blast/src/blDriver.h index 07287d4587d0e8cdf6454d68ad09a5b40ae10a7d..b02f037c9dfa9b846f74bc115227c33c8bce874b 100644 --- a/blast/src/DDriver.h +++ b/blast/src/blDriver.h @@ -1,7 +1,7 @@ -#ifndef DDRIVER_H -#define DDRIVER_H +#ifndef BLDRIVER_H +#define BLDRIVER_H -#include "DBoundaryLayer.h" +#include "blBoundaryLayer.h" #include "blast.h" #include "wObject.h" #include "wTimers.h" @@ -69,4 +69,4 @@ private: int outputStatus(double maxMach) const; }; } // namespace blast -#endif // DDRIVER_H +#endif // BLDRIVER_H diff --git a/blast/src/DFluxes.cpp b/blast/src/blFluxes.cpp similarity index 99% rename from blast/src/DFluxes.cpp rename to blast/src/blFluxes.cpp index 73e89db8542c20ecbe4376ed4ab103ee3cf88b78..41c731b86f7f1544190a50e9611b9956d5e885de 100644 --- a/blast/src/DFluxes.cpp +++ b/blast/src/blFluxes.cpp @@ -1,5 +1,5 @@ -#include "DFluxes.h" -#include "DBoundaryLayer.h" +#include "blFluxes.h" +#include "blBoundaryLayer.h" #include <Eigen/Dense> using namespace blast; @@ -357,4 +357,4 @@ double Fluxes::amplificationRoutine(double Hk, double Ret, double theta) const } } return ax; -} \ No newline at end of file +} diff --git a/blast/src/DFluxes.h b/blast/src/blFluxes.h similarity index 89% rename from blast/src/DFluxes.h rename to blast/src/blFluxes.h index ef2f15f157bd7b024cb5138b595a9c736bf2fa57..452251e2d32df3692626484cb73c58458f52767d 100644 --- a/blast/src/DFluxes.h +++ b/blast/src/blFluxes.h @@ -1,7 +1,7 @@ -#ifndef DFLUXES_H -#define DFLUXES_H +#ifndef BLFLUXES_H +#define BLFLUXES_H -#include "DBoundaryLayer.h" +#include "blBoundaryLayer.h" #include "blast.h" #include <Eigen/Dense> @@ -31,4 +31,4 @@ private: double amplificationRoutine(double Hk, double Ret, double theta) const; }; } // namespace blast -#endif // DFLUXES_H +#endif // BLFLUXES_H diff --git a/blast/src/DSolver.cpp b/blast/src/blSolver.cpp similarity index 98% rename from blast/src/DSolver.cpp rename to blast/src/blSolver.cpp index 75fe55c4d55e2fe8de01120c7a1aa2cfe79ad2ce..f34e7981cf56ec50778577ce7bebce8f3999ea1f 100644 --- a/blast/src/DSolver.cpp +++ b/blast/src/blSolver.cpp @@ -1,6 +1,6 @@ -#include "DSolver.h" -#include "DBoundaryLayer.h" -#include "DFluxes.h" +#include "blSolver.h" +#include "blBoundaryLayer.h" +#include "blFluxes.h" #include <Eigen/Dense> #include <iostream> @@ -239,4 +239,4 @@ void Solver::setCFL0(double _CFL0) CFL0 = _CFL0; else throw std::runtime_error("Negative CFL numbers are not allowed.\n"); -} \ No newline at end of file +} diff --git a/blast/src/DSolver.h b/blast/src/blSolver.h similarity index 95% rename from blast/src/DSolver.h rename to blast/src/blSolver.h index 89c4b4175fb1ddff24e7e7886dc9c20dd132ae63..1572f35ff2b2f6b9f4b7348b6e438ae790ece4b6 100644 --- a/blast/src/DSolver.h +++ b/blast/src/blSolver.h @@ -1,7 +1,7 @@ -#ifndef DSOLVER_H -#define DSOLVER_H +#ifndef BLSOLVER_H +#define BLSOLVER_H -#include "DFluxes.h" +#include "blFluxes.h" #include "blast.h" namespace blast @@ -52,4 +52,4 @@ private: bool usePrevPoint = false); }; } // namespace blast -#endif // DSOLVER_H +#endif // BLSOLVER_H diff --git a/blast/tests/dart/adjoint_2D.py b/blast/tests/dart/adjoint_2D.py index 604019ff6534e7bd5f28c544d43c4c9cc5a22adc..d942f7b97a0ad0c09b55116773c3d63bb890d7c7 100644 --- a/blast/tests/dart/adjoint_2D.py +++ b/blast/tests/dart/adjoint_2D.py @@ -22,7 +22,7 @@ # Imports. -import blast.utils as vutils +import blast.blUtils as vutils import blast import numpy as np diff --git a/blast/tests/dart/naca0012_2D.py b/blast/tests/dart/naca0012_2D.py index b04f5e4e64b1631be2efc66e32694a92503c9176..5af9aa57f1f198a5ae9a30172fc9fa70b46275a0 100644 --- a/blast/tests/dart/naca0012_2D.py +++ b/blast/tests/dart/naca0012_2D.py @@ -34,7 +34,7 @@ # Imports. -import blast.utils as vutils +import blast.blUtils as vutils import numpy as np from fwk.wutils import parseargs diff --git a/blast/tests/dart/rae2822_3D.py b/blast/tests/dart/rae2822_3D.py index 40e3d06e6839da9f53318d35604fb96a6ae238c2..ab792d4b531c35853fd0662dd403abbb14866fe9 100644 --- a/blast/tests/dart/rae2822_3D.py +++ b/blast/tests/dart/rae2822_3D.py @@ -24,7 +24,7 @@ # Imports. -import blast.utils as vutils +import blast.blUtils as vutils import numpy as np import os.path diff --git a/blast/validation/agard_3D.py b/blast/validation/agard_3D.py index 02b1855921fabd0c658ece0add9c2957f7018b06..7e60cc8341d64b16bc495868b32afccd8d4f377d 100644 --- a/blast/validation/agard_3D.py +++ b/blast/validation/agard_3D.py @@ -22,7 +22,7 @@ # Imports. -import blast.utils as vutils +import blast.blUtils as vutils import numpy as np import os.path diff --git a/blast/validation/highlift_2D.py b/blast/validation/highlift_2D.py index 71003c779cbf0d4b200db46ce03e7a8933f7f8d1..4ceacb1d261da5636c5adf17c78b3ed1dc4999c5 100644 --- a/blast/validation/highlift_2D.py +++ b/blast/validation/highlift_2D.py @@ -21,7 +21,7 @@ # Imports. -import blast.utils as vutils +import blast.blUtils as vutils import numpy as np from fwk.wutils import parseargs diff --git a/blast/validation/lann_3D.py b/blast/validation/lann_3D.py index f1bd808ac437dbd565fef82eb6c8e12beed818c5..53002533d52011ffac9c507eacd5506da44af428 100644 --- a/blast/validation/lann_3D.py +++ b/blast/validation/lann_3D.py @@ -22,7 +22,7 @@ # Imports. -import blast.utils as vutils +import blast.blUtils as vutils import numpy as np import os.path diff --git a/blast/validation/oneraM6_3D.py b/blast/validation/oneraM6_3D.py index 8e2924f579ce260d84092da494c3f18177a3fbbc..9bdff1224567d85229703ceb7e8d75298eab0337 100644 --- a/blast/validation/oneraM6_3D.py +++ b/blast/validation/oneraM6_3D.py @@ -22,7 +22,7 @@ # Imports. -import blast.utils as vutils +import blast.blUtils as vutils import numpy as np import os.path diff --git a/blast/validation/rae2822_2D.py b/blast/validation/rae2822_2D.py index dfc077b11d0811347b61df507d7967c094a551a9..e812ca6ac4393cee6f0cc2138dcf9c43ba1ce405 100644 --- a/blast/validation/rae2822_2D.py +++ b/blast/validation/rae2822_2D.py @@ -26,7 +26,7 @@ # Imports. -import blast.utils as vutils +import blast.blUtils as vutils import numpy as np from fwk.wutils import parseargs