Skip to content
Merged
Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
4fcc4fd
Change file name.
ktbolt Sep 2, 2024
10f74dc
Merge remote-tracking branch 'upstream/main'
ktbolt Sep 3, 2024
289894f
Merge remote-tracking branch 'upstream/main'
ktbolt Sep 25, 2024
3d47500
Merge remote-tracking branch 'upstream/main'
ktbolt Sep 30, 2024
014ca26
Merge remote-tracking branch 'upstream/main'
ktbolt Oct 3, 2024
a05d464
Merge remote-tracking branch 'upstream/main'
ktbolt Oct 4, 2024
4e4f3c5
Merge remote-tracking branch 'upstream/main'
ktbolt Oct 4, 2024
1a7dc17
Merge remote-tracking branch 'upstream/main'
ktbolt Oct 7, 2024
7b46b9e
Merge remote-tracking branch 'upstream/main'
ktbolt Oct 16, 2024
a1c224f
Merge remote-tracking branch 'upstream/main'
ktbolt Nov 7, 2024
9b8ee4f
Merge remote-tracking branch 'upstream/main'
ktbolt Nov 20, 2024
c145165
Merge remote-tracking branch 'upstream/main'
ktbolt Dec 10, 2024
7721941
Merge remote-tracking branch 'upstream/main'
ktbolt Dec 17, 2024
be5200f
Merge remote-tracking branch 'upstream/main'
ktbolt Dec 18, 2024
ac04c94
Merge remote-tracking branch 'upstream/main'
ktbolt Dec 18, 2024
5091344
Merge remote-tracking branch 'upstream/main'
ktbolt Dec 28, 2024
16f1cf6
Merge remote-tracking branch 'upstream/main'
ktbolt Jan 8, 2025
9cba173
Merge remote-tracking branch 'upstream/main'
ktbolt Jan 8, 2025
029f52d
Merge remote-tracking branch 'upstream/main'
ktbolt Jan 9, 2025
66cec26
Merge remote-tracking branch 'upstream/main'
ktbolt Feb 7, 2025
4db5021
Merge remote-tracking branch 'upstream/main'
ktbolt Feb 11, 2025
31f9316
Merge remote-tracking branch 'upstream/main'
ktbolt Feb 12, 2025
bcdf223
Merge remote-tracking branch 'upstream/main'
ktbolt Apr 8, 2025
79b53f0
Merge remote-tracking branch 'upstream/main'
ktbolt May 17, 2025
ce6f824
Merge remote-tracking branch 'upstream/main'
ktbolt May 17, 2025
4d690b9
Merge remote-tracking branch 'upstream/main'
ktbolt May 19, 2025
b6f3ac5
Merge remote-tracking branch 'upstream/main'
ktbolt May 19, 2025
70efdc4
Merge remote-tracking branch 'upstream/main'
ktbolt May 23, 2025
7a24eac
Merge remote-tracking branch 'upstream/main'
ktbolt May 28, 2025
352b73c
Merge remote-tracking branch 'upstream/main'
ktbolt May 28, 2025
6917706
Merge remote-tracking branch 'upstream/main'
ktbolt Jun 4, 2025
a89d94c
Merge remote-tracking branch 'upstream/main'
ktbolt Jun 5, 2025
7f1c0d3
Merge remote-tracking branch 'upstream/main'
ktbolt Jun 6, 2025
0d6a46f
Merge remote-tracking branch 'upstream/main'
ktbolt Jun 6, 2025
9ba8ead
Merge remote-tracking branch 'upstream/main'
ktbolt Jun 11, 2025
a8c4b9b
Merge remote-tracking branch 'upstream/main'
ktbolt Jun 14, 2025
e2fc1be
Merge remote-tracking branch 'upstream/main'
ktbolt Jun 25, 2025
a59cef8
Merge remote-tracking branch 'upstream/main'
ktbolt Jul 17, 2025
cc21e19
Merge remote-tracking branch 'upstream/main'
ktbolt Jul 31, 2025
0273816
Merge remote-tracking branch 'upstream/main'
ktbolt Sep 9, 2025
3508003
Merge remote-tracking branch 'upstream/main'
ktbolt Sep 9, 2025
6ea5b5c
Merge remote-tracking branch 'upstream/main'
ktbolt Sep 12, 2025
84f2ea6
Fix some indexing and scope bugs.
ktbolt Sep 18, 2025
011eb23
Merge remote-tracking branch 'upstream/main' into Fiber_direction-spa…
ktbolt Sep 26, 2025
b1b37ce
Add the 'Fiber_direction' Output command to the solver.xml file and u…
ktbolt Sep 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions Code/Source/solver/post.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -681,27 +681,31 @@ void fib_dir_post(Simulation* simulation, const mshType& lM, const int nFn, Arra
int Ac = lM.IEN(a,e);
for (int i = 0; i < nsd; i++) {
xl(i,a) = com_mod.x(i,Ac);
}
for (int i = 0; i < tDof; i++) {
dl(i,a) = lD(i,Ac);
}
}

for (int iFn = 0; iFn < lM.nFn; iFn++) {
for (int i = 0; i < nsd; i++) {
fN(i,iFn) = lM.fN(iFn*nsd,e);
fN(i,iFn) = lM.fN(i+iFn*nsd,e);
}
}

Array<double> F;
Array<double> F(nsd,nsd);
Array<double> Nx(nsd,eNoN);
double Jac = 0.0;

for (int g = 0; g < lM.nG; g++) {
double Jac = 0.0;
if (g == 0 || !lM.lShpF) {
auto Nx = lM.Nx.slice(g);
nn::gnn(eNoN, nsd, nsd, Nx, xl, Nx, Jac, F);
auto Nxi = lM.Nx.slice(g);
nn::gnn(eNoN, nsd, nsd, Nxi, xl, Nx, Jac, F);
}

double w = lM.w(g) * Jac;
auto F = mat_fun::mat_id(nsd);
N = lM.N.col(g);
F = mat_fun::mat_id(nsd);

for (int a = 0; a < eNoN; a++) {
if (nsd == 3) {
Expand Down Expand Up @@ -749,11 +753,12 @@ void fib_dir_post(Simulation* simulation, const mshType& lM, const int nFn, Arra
for (int a = 0; a < lM.nNo; a++) {
int Ac = lM.gN(a);
if (!utils::is_zero(sA(Ac))) {
for (int i = 0; i < nsd; i++) {
for (int i = 0; i < nFn*nsd; i++) {
res(i,a) = res(i,a) + sF(i,Ac) / sA(Ac);
}
}
}
}

}

/// @brief Compute fiber stretch based on 4th invariant: I_{4,f}
Expand Down
17 changes: 2 additions & 15 deletions Code/Source/solver/vtk_xml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ void do_test()
}
}

std::cout << "Num dupe: " << num_dupe << std::endl;

vtkSmartPointer<vtkUnstructuredGrid> mesh;

std::string fileName = "mesh-complete/mesh-complete.mesh.vtu";
Expand All @@ -98,8 +96,6 @@ void do_test()

vtkIdType m_NumPoints = mesh->GetNumberOfPoints();
vtkIdType m_NumCells = mesh->GetNumberOfCells();
std::cout << " Number of points: " << m_NumPoints << std::endl;
std::cout << " Number of cells: " << m_NumCells << std::endl;

auto numPoints = mesh->GetNumberOfPoints();
auto points = mesh->GetPoints();
Expand Down Expand Up @@ -138,10 +134,6 @@ void do_test()
}
}

std::cout << "num_found_1: " << num_found_1 << std::endl;
std::cout << "num_found_2: " << num_found_2 << std::endl;

//exit(0);
}

/// @brief This routine prepares data array of a regular mesh
Expand Down Expand Up @@ -1171,11 +1163,11 @@ void write_vtus(Simulation* simulation, const Array<double>& lA, const Array<dou
post::fib_dir_post(simulation, msh, nFn, tmpV, lD, iEq);
}
for (int iFn = 0; iFn < nFn; iFn++) {
cOut = cOut + 1;
is = outS[cOut];
ie = is + l - 1;
outS[cOut+1] = ie + 1;
outNames[cOut] = eq.output[iOut].name + std::to_string(iFn);
cOut = cOut + 1;
outNames[cOut] = eq.output[iOut].name + std::to_string(iFn+1);

for (int a = 0; a < msh.nNo; a++) {
for (int i = 0; i < l; i++) {
Expand Down Expand Up @@ -1414,8 +1406,6 @@ void write_vtus(Simulation* simulation, const Array<double>& lA, const Array<dou
nSh = nSh + d[iM].nNo;
}

// std::cout << "nOut: " << nOut << std::endl;

// Writing all solutions
//
for (int iOut = 1; iOut < nOut; iOut++) {
Expand All @@ -1436,9 +1426,6 @@ void write_vtus(Simulation* simulation, const Array<double>& lA, const Array<dou
nSh = nSh + d[iM].nNo;
}

// std::cout << "iOut: " << iOut << std::endl;
// std::cout << "outName: " << outNames[iOut] << std::endl;

vtk_writer->set_point_data(outNames[iOut], tmpV);
}

Expand Down