diff --git a/dart/_src/dartw.i b/dart/_src/dartw.i index dcc60d19a6358e746204d67ae88709500ae731f2..e16e83975d1e51bdb49efa367eb14f935deb0e43 100644 --- a/dart/_src/dartw.i +++ b/dart/_src/dartw.i @@ -85,6 +85,11 @@ threads="1" %immutable dart::Solver::pbl; // read-only variable (no setter) %immutable dart::Solver::linsol; +%immutable dart::Solver::relTol; +%immutable dart::Solver::absTol; +%immutable dart::Solver::maxIt; +%immutable dart::Solver::nthreads; +%immutable dart::Solver::verbose; %immutable dart::Solver::nIt; %immutable dart::Solver::phi; %immutable dart::Solver::rPhi; diff --git a/dart/api/core.py b/dart/api/core.py index 64cc2cf395825799606854cc9790c428a1bc574b..952af16bb815ae2540eed427a20d5362f9837670 100644 --- a/dart/api/core.py +++ b/dart/api/core.py @@ -54,6 +54,7 @@ def initDart(params, scenario='aerodynamic', task='analysis'): """ # Imports import math + import fwk.wutils as wu import tbox import tbox.gmsh as gmsh import dart @@ -100,6 +101,7 @@ def initDart(params, scenario='aerodynamic', task='analysis'): nthrd = params['Threads'] else: nthrd = 1 + wu.initMkl(nthrd) # initialize threading layer and number of threads # verbosity if 'Verb' in params: verb = params['Verb'] @@ -144,8 +146,7 @@ def initDart(params, scenario='aerodynamic', task='analysis'): # Mesh morpher creation if scenario == 'aerostructural' or task == 'optimization': - _mrf = tbox.MshDeform(_msh, _dim) - _mrf.nthreads = nthrd + _mrf = tbox.MshDeform(_msh, _dim, nthrds=nthrd) _mrf.setField(params['Fluid']) _mrf.addFixed(params['Farfield']) if _dim == 2: diff --git a/dart/src/wBody.cpp b/dart/src/wBody.cpp index de6f024bd6e142640142bfaa0bee3fbc9a3d9383..511e9bea683bcfd6d3a338b3ae06431d4358a567 100644 --- a/dart/src/wBody.cpp +++ b/dart/src/wBody.cpp @@ -185,7 +185,7 @@ void Body::save(std::string const &name, Results const &res) outfile << std::endl; // Close file outfile.close(); - std::cout << "done!" << std::endl; + std::cout << "done" << std::endl; } void Body::write(std::ostream &out) const