diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95539fc2ff9df6838143616df39cc1424c88478f..145b1b260c5d46ea38fcf0f8dfafa5fba0bc1397 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,9 @@
default:
image: rboman/waves-py3:2020.3
before_script:
+ - wget https://bootstrap.pypa.io/get-pip.py
+ - python3 get-pip.py
+ - python3 -m pip install scipy==1.10.1 --user
- source /opt/intel/mkl/bin/mklvars.sh intel64
- source /opt/intel/tbb/bin/tbbvars.sh intel64
- echo $(nproc)
diff --git a/README.md b/README.md
index 4b37f4a5aeb354af7e6755ab076cfae4a13e54c2..c63bc3007fc32d2a9393b44ce8039dc2913e50f1 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,15 @@
## BLASTER
-BLASTER (Boundary-Layer Adjoint Solver for Transonic External and high Reynolds number flow) is an open-source boundary layer solver written in C++ and python. It is designed to work in a viscous-inviscid interaction (VII) scheme. Blaster is developed at the University of Liège by Paul Dechamps with the active collaboration of Adrien Crovato and the help of Amaury Bilocq and Romain Boman, and under the supervision of Vincent Terrapon and Grigorios Dimitriadis, since 2022.
+BLASTER (Boundary-Layer Adjoint Solver for Transonic External and high Reynolds number flow) is an open-source boundary layer solver written in C++ and python.
+
+
+
+It is designed to work in a viscous-inviscid interaction (VII) scheme. Blaster is developed at the University of Liège by Paul Dechamps with the active collaboration of Adrien Crovato and Amaury Bilocq and the help of Romain Boman, and under the supervision of Vincent E. Terrapon and Grigorios Dimitriadis, since 2022.
# Working with
-Blaster is curently interfaced with different inviscid flow solvers in order to perform the viscous-inviscid interaction algorithm
+Blaster is currently interfaced with different inviscid flow solvers in order to perform the viscous-inviscid interaction algorithm
-- dartflo, a full potential transonic solver [DARTFlo] (git@gitlab.uliege.be:am-dept/dartflo.git) developed by A. Crovato [Steady Transonic Aerodynamic and Aeroelastic Modeling for Preliminary Aircraft Design](http://hdl.handle.net/2268/251906), PhD thesis, University of Liège, 2020.
+- dartflo, a full potential transonic solver [DARTFlo](https://gitlab.uliege.be/am-dept/dartflo) developed by A. Crovato [Steady Transonic Aerodynamic and Aeroelastic Modeling for Preliminary Aircraft Design](http://hdl.handle.net/2268/251906), PhD thesis, University of Liège, 2020.
-- SU2 (The Euler solver), developed at Standford University [SU2] (https://github.com/su2code/SU2.git). It is recommended to use our own fork of the project as different tools to have a correct interface have been implemented there [SU2 FORK] (https://github.com/Paul-Dech/SU2.git).
+- SU2 (The Euler solver), developed at Stanford University [SU2](https://github.com/su2code/SU2.git). It is recommended to use our own fork of the project as different tools to have a correct interface have been implemented there [SU2 FORK](https://github.com/Paul-Dech/SU2.git).
diff --git a/blast/interfaces/dart/DartInterface.py b/blast/interfaces/dart/DartInterface.py
index 92c7919afdff7b9478245e10bf995fdf90d215ef..da0809b6b8d09b3a9cfc9659106d7699f6d4a797 100644
--- a/blast/interfaces/dart/DartInterface.py
+++ b/blast/interfaces/dart/DartInterface.py
@@ -28,15 +28,15 @@ class DartInterface(SolversInterface):
def __init__(self, dartCfg, vSolver, _cfg):
try:
from modules.dartflo.dart.api.core import initDart
- argOut = initDart(dartCfg, viscous=True)
- self.solver = argOut.get('sol') # Solver
- self.wrt = argOut.get('wrt') # Writer
- self.blw = [argOut.get('blwb'), argOut.get('blww')]
+ self.argOut = initDart(dartCfg, viscous=True)
+ self.solver = self.argOut.get('sol') # Solver
+ self.blw = [self.argOut.get('blwb'), self.argOut.get('blww')]
print('Dart successfully loaded.')
except:
print(ccolors.ANSI_RED, 'Could not load DART. Make sure it is installed.', ccolors.ANSI_RESET)
raise RuntimeError('Import error')
+ _cfg['Format'] = dartCfg['Format']
if 'iMsh' not in _cfg:
_cfg['iMsh'] = self.blw
SolversInterface.__init__(self, vSolver, _cfg)
@@ -48,32 +48,52 @@ class DartInterface(SolversInterface):
""" Write Cp distribution around the airfoil on file.
"""
# Extract Cp on elements
- vElems = self.blw[0].tag.elems
- vData = self.solver.Cp
- if isinstance(vData[0], float):
- size = 1
- elif vData[0].size() == 3:
- size = 3
- else:
- raise RuntimeError('unrecognized format for vData!')
- # store data (not efficient, but OK since only meant for small 2D cases)
- data = np.zeros((vElems.size()+1,3+size))
- i = 0
- while i < vElems.size()+1:
- data[i,0] = vElems[i%vElems.size()].nodes[0].pos[0]
- data[i,1] = vElems[i%vElems.size()].nodes[0].pos[1]
- data[i,2] = vElems[i%vElems.size()].nodes[0].pos[2]
- if size == 1:
- data[i,3] = vData[vElems[i%vElems.size()].nodes[0].row]
+ self.save(sfx=sfx)
+ # 2D Case
+ if self.cfg['nDim'] == 2:
+ vElems = self.blw[0].tag.elems
+ vData = self.solver.Cp
+ if isinstance(vData[0], float):
+ size = 1
+ elif vData[0].size() == 3:
+ size = 3
else:
- for j in range(size):
- data[i,3+j] = vData[vElems[i%vElems.size()].nodes[0].row][j]
- i += 1
- print('writing data file ' + 'Cp' +sfx + '.dat')
- np.savetxt('Cp'+sfx+'.dat', data, fmt='%1.6e', delimiter=', ', header='x, y, z, Cp', comments='')
+ raise RuntimeError('unrecognized format for vData!')
+ # store data (not efficient, but OK since only meant for small 2D cases)
+ data = np.zeros((vElems.size()+1,3+size))
+ i = 0
+ while i <