From ea1bb8b8f4d5d284828c71dd0dc745ee1f36e0f6 Mon Sep 17 00:00:00 2001
From: Paul Dechamps <paul.dechamps@uliege.be>
Date: Tue, 7 Jan 2025 16:59:04 +0100
Subject: [PATCH] (fix) modifs due to dart update
---
blast/interfaces/DSolversInterface.py | 13 +++++++------
blast/src/DCoupledAdjoint.cpp | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/blast/interfaces/DSolversInterface.py b/blast/interfaces/DSolversInterface.py
index b7542bc..17cf147 100644
--- a/blast/interfaces/DSolversInterface.py
+++ b/blast/interfaces/DSolversInterface.py
@@ -1,5 +1,6 @@
import numpy as np
import blast
+import fwk
import tbox
from blast.interfaces.DDataStructure import Group
@@ -165,13 +166,13 @@ class SolversInterface:
connectElems.push_back(int(0))
# x, y, z
- xv = tbox.std_vector_double()
+ xv = fwk.std_vector_double()
for val in self.vBnd[iSec][iReg].getNodesCoord(reg.name, xIdx):
xv.push_back(val)
- yv = tbox.std_vector_double()
+ yv = fwk.std_vector_double()
for val in self.vBnd[iSec][iReg].getNodesCoord(reg.name, yIdx):
yv.push_back(val)
- zv = tbox.std_vector_double()
+ zv = fwk.std_vector_double()
for val in self.vBnd[iSec][iReg].getNodesCoord(reg.name, zIdx):
zv.push_back(val)
@@ -264,13 +265,13 @@ class SolversInterface:
connectElems.push_back(int(0))
# x, y, z
- xv = tbox.std_vector_double()
+ xv = fwk.std_vector_double()
for val in self.vBnd[iSec][iReg].getNodesCoord(reg.name, xIdx):
xv.push_back(val)
- yv = tbox.std_vector_double()
+ yv = fwk.std_vector_double()
for val in self.vBnd[iSec][iReg].getNodesCoord(reg.name, yIdx):
yv.push_back(val)
- zv = tbox.std_vector_double()
+ zv = fwk.std_vector_double()
for val in self.vBnd[iSec][iReg].getNodesCoord(reg.name, zIdx):
zv.push_back(val)
diff --git a/blast/src/DCoupledAdjoint.cpp b/blast/src/DCoupledAdjoint.cpp
index 47c564e..3d29fdd 100644
--- a/blast/src/DCoupledAdjoint.cpp
+++ b/blast/src/DCoupledAdjoint.cpp
@@ -851,7 +851,7 @@ void CoupledAdjoint::gradientswrtBlowingVelocity() {
dart::BlowingResidual::buildGradientBlowing(*blowingElement);
for (size_t ii = 0; ii < blowingElement->nodes.size(); ii++) {
tbox::Node *nodi = blowingElement->nodes[ii];
- T.push_back(Eigen::Triplet<double>(isol->rows[nodi->row], jj, be(ii)));
+ T.push_back(Eigen::Triplet<double>(isol->getRow(nodi->row), jj, be(ii)));
}
++jj;
}
--
GitLab