Skip to content

Commit ca653bb

Browse files
author
shiyi
committed
Fix the function signature gnnb at nn.cpp to make Dn and Do not take default value nullptr
1 parent ec07838 commit ca653bb

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

‎Code/Source/solver/all_fun.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ double integ(const ComMod& com_mod, const CmMod& cm_mod, const faceType& lFa, co
803803
if (!isIB) {
804804
// Get normal vector in cfg configuration
805805
auto Nx = fs.Nx.slice(g);
806-
nn::gnnb(com_mod, lFa, e, g, nsd, insd, fs.eNoN, Nx, n, cfg, Dn, Do);
806+
nn::gnnb(com_mod, lFa, e, g, nsd, insd, fs.eNoN, Nx, n, Dn, Do, cfg);
807807
}
808808

809809
// Calculating the Jacobian (encodes area of face element)
@@ -923,7 +923,7 @@ double integ(const ComMod& com_mod, const CmMod& cm_mod, const faceType& lFa,
923923
if (!isIB) {
924924
// Get normal vector in cfg configuration
925925
auto Nx = lFa.Nx.slice(g);
926-
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, lFa.eNoN, Nx, n, cfg, Dn, Do);
926+
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, lFa.eNoN, Nx, n, Dn, Do, cfg);
927927
//CALL GNNB(lFa, e, g, nsd-1, lFa.eNoN, lFa.Nx(:,:,g), n)
928928
} else {
929929
//CALL GNNIB(lFa, e, g, n)

‎Code/Source/solver/baf_ini.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ void face_ini(Simulation* simulation, mshType& lM, faceType& lFa, Array<double>&
478478

479479
for (int g = 0; g < lFa.nG; g++) {
480480
auto Nx = lFa.Nx.slice(g);
481-
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, lFa.eNoN, Nx, nV, consts::MechanicalConfigurationType::reference, nullptr, &Do);
481+
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, lFa.eNoN, Nx, nV, nullptr, &Do, consts::MechanicalConfigurationType::reference);
482482

483483
for (int a = 0; a < lFa.eNoN; a++) {
484484
int Ac = lFa.IEN(a,e);
@@ -728,7 +728,7 @@ void fsi_ls_ini(ComMod& com_mod, const CmMod& cm_mod, bcType& lBc, const faceTyp
728728
for (int g = 0; g < lFa.nG; g++) {
729729
Vector<double> n(nsd);
730730
auto Nx = lFa.Nx.slice(g);
731-
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, lFa.eNoN, Nx, n, consts::MechanicalConfigurationType::reference, nullptr, &Do);
731+
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, lFa.eNoN, Nx, n, nullptr, &Do, consts::MechanicalConfigurationType::reference);
732732

733733
for (int a = 0; a < lFa.eNoN; a++) {
734734
int Ac = lFa.IEN(a,e);

‎Code/Source/solver/cmm.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ void cmm_b(ComMod& com_mod, const faceType& lFa, const int e, const Array<double
282282
for (int g = 0; g < lFa.nG; g++) {
283283
Vector<double> nV(nsd);
284284
auto Nx = lFa.Nx.slice(g);
285-
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, 3, Nx, nV, consts::MechanicalConfigurationType::reference, nullptr, &Do);
285+
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, 3, Nx, nV, nullptr, &Do, consts::MechanicalConfigurationType::reference);
286286
double Jac = sqrt(utils::norm(nV));
287287
nV = nV / Jac;
288288
double w = lFa.w(g)*Jac;

‎Code/Source/solver/eq_assem.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void b_assem_neu_bc(ComMod& com_mod, const faceType& lFa, const Vector<double>&
7676
for (int g = 0; g < lFa.nG; g++) {
7777
Vector<double> nV(nsd);
7878
auto Nx = lFa.Nx.rslice(g);
79-
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, eNoN, Nx, nV, consts::MechanicalConfigurationType::reference, nullptr, &Do);
79+
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, eNoN, Nx, nV, nullptr, &Do, consts::MechanicalConfigurationType::reference);
8080
double Jac = sqrt(utils::norm(nV));
8181
nV = nV / Jac;
8282
double w = lFa.w(g)*Jac;
@@ -245,7 +245,7 @@ void b_neu_folw_p(ComMod& com_mod, const bcType& lBc, const faceType& lFa, const
245245
// Get surface normal vector
246246
Vector<double> nV(nsd);
247247
auto Nx_g = lFa.Nx.rslice(g);
248-
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, eNoNb, Nx_g, nV, consts::MechanicalConfigurationType::reference, nullptr, &Do);
248+
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, eNoNb, Nx_g, nV, nullptr, &Do, consts::MechanicalConfigurationType::reference);
249249
Jac = sqrt(utils::norm(nV));
250250
nV = nV / Jac;
251251
double w = lFa.w(g)*Jac;
@@ -322,7 +322,7 @@ void fsi_ls_upd(ComMod& com_mod, const bcType& lBc, const faceType& lFa, const A
322322

323323
auto cfg = MechanicalConfigurationType::new_timestep;
324324

325-
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, lFa.eNoN, Nx, n, cfg, &Dn, &Do);
325+
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, lFa.eNoN, Nx, n, &Dn, &Do, cfg);
326326
//
327327
for (int a = 0; a < lFa.eNoN; a++) {
328328
int Ac = lFa.IEN(a,e);

‎Code/Source/solver/nn.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ void gnn(const int eNoN, const int nsd, const int insd, Array<double>& Nxi, Arra
523523
/// Reproduce Fortran 'GNNB'.
524524
//
525525
void gnnb(const ComMod& com_mod, const faceType& lFa, const int e, const int g, const int nsd, const int insd,
526-
const int eNoNb, const Array<double>& Nx, Vector<double>& n, MechanicalConfigurationType cfg, const Array<double>* Dn, const Array<double>* Do)
526+
const int eNoNb, const Array<double>& Nx, Vector<double>& n, const Array<double>* Dn, const Array<double>* Do, MechanicalConfigurationType cfg)
527527
{
528528
auto& cm = com_mod.cm;
529529

‎Code/Source/solver/nn.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace nn {
3838
double& Jac, Array<double>& ks);
3939

4040
void gnnb(const ComMod& com_mod, const faceType& lFa, const int e, const int g, const int nsd, const int insd,
41-
const int eNoNb, const Array<double>& Nx, Vector<double>& n, consts::MechanicalConfigurationType cfg=consts::MechanicalConfigurationType::reference, const Array<double>* Dn=nullptr, const Array<double>* Do=nullptr);
41+
const int eNoNb, const Array<double>& Nx, Vector<double>& n, const Array<double>* Dn, const Array<double>* Do, consts::MechanicalConfigurationType cfg=consts::MechanicalConfigurationType::reference);
4242

4343
void gnns(const int nsd, const int eNoN, const Array<double>& Nxi, Array<double>& xl, Vector<double>& nV,
4444
Array<double>& gCov, Array<double>& gCnv);

‎Code/Source/solver/set_bc.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ void set_bc_dir_wl(ComMod& com_mod, const bcType& lBc, const mshType& lM, const
12511251
for (int g = 0; g < lFa.nG; g++) {
12521252
Vector<double> nV(nsd);
12531253
auto Nx = lFa.Nx.slice(g);
1254-
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, eNoNb, Nx, nV, consts::MechanicalConfigurationType::reference, nullptr, &Do);
1254+
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, eNoNb, Nx, nV, nullptr, &Do, consts::MechanicalConfigurationType::reference);
12551255
double Jac = sqrt(utils::norm(nV));
12561256
nV = nV / Jac;
12571257
double w = lFa.w(g) * Jac;
@@ -1504,7 +1504,7 @@ void set_bc_rbnl(ComMod& com_mod, const faceType& lFa, const RobinBoundaryCondit
15041504
for (int g = 0; g < lFa.nG; g++) {
15051505
Vector<double> nV(nsd);
15061506
auto Nx = lFa.Nx.slice(g);
1507-
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, eNoN, Nx, nV, consts::MechanicalConfigurationType::reference, nullptr, &Do);
1507+
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, eNoN, Nx, nV, nullptr, &Do, consts::MechanicalConfigurationType::reference);
15081508
double Jac = sqrt(utils::norm(nV));
15091509
nV = nV / Jac;
15101510
double w = lFa.w(g) * Jac;
@@ -1784,7 +1784,7 @@ void set_bc_trac_l(ComMod& com_mod, const CmMod& cm_mod, const bcType& lBc, cons
17841784
for (int g = 0; g < lFa.nG; g++) {
17851785
Vector<double> nV(nsd);
17861786
auto Nx = lFa.Nx.slice(g);
1787-
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, eNoN, Nx, nV, consts::MechanicalConfigurationType::reference, nullptr, &Do);
1787+
nn::gnnb(com_mod, lFa, e, g, nsd, nsd-1, eNoN, Nx, nV, nullptr, &Do, consts::MechanicalConfigurationType::reference);
17881788
double Jac = sqrt(utils::norm(nV));
17891789
double w = lFa.w(g)*Jac;
17901790
N = lFa.N.col(g);

0 commit comments

Comments
 (0)