From a8bea6102f362b62d83fc323fc118d412e8e0329 Mon Sep 17 00:00:00 2001 From: JGonzalez Date: Sat, 24 Dec 2022 11:41:12 +0100 Subject: [PATCH] Final commit for volume nodes 1D Rad is fixed. Still there might be an issue with the triangles in 2D Cyl. --- src/modules/mesh/1DRad/moduleMesh1DRad.f90 | 11 +++++++++-- src/modules/mesh/2DCyl/moduleMesh2DCyl.f90 | 6 +++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/modules/mesh/1DRad/moduleMesh1DRad.f90 b/src/modules/mesh/1DRad/moduleMesh1DRad.f90 index 57619ee..660a313 100644 --- a/src/modules/mesh/1DRad/moduleMesh1DRad.f90 +++ b/src/modules/mesh/1DRad/moduleMesh1DRad.f90 @@ -260,10 +260,17 @@ MODULE moduleMesh1DRad Xii = 0.D0 fPsi = self%fPsi(Xii) detJ = self%detJac(Xii) + !Computes total volume of the cell r = DOT_PRODUCT(fPsi, self%r) l = 2.D0*detJ - self%volume = r*l - self%arNodes = fPsi*r*l + self%volume = r*l + !Computes volume per node + xi = (/-5.D-1, 0.D0, 0.D0/) + r = DOT_PRODUCT(self%fPsi(xi),self%r) + self%arNodes(1) = fPsi(1)*r*l + xi = (/ 5.D-1, 0.D0, 0.D0/) + r = DOT_PRODUCT(self%fPsi(xi),self%r) + self%arNodes(2) = fPsi(2)*r*l END SUBROUTINE areaRad diff --git a/src/modules/mesh/2DCyl/moduleMesh2DCyl.f90 b/src/modules/mesh/2DCyl/moduleMesh2DCyl.f90 index 0ac01f3..c576c71 100644 --- a/src/modules/mesh/2DCyl/moduleMesh2DCyl.f90 +++ b/src/modules/mesh/2DCyl/moduleMesh2DCyl.f90 @@ -318,8 +318,10 @@ MODULE moduleMesh2DCyl xi = 0.D0 detJ = self%detJac(xi)*PI8 !4*2*pi fPsi = self%fPsi(xi) + !Computes total volume of the cell r = DOT_PRODUCT(fPsi,self%r) - self%volume = r*detJ + self%volume = r*detJ + !Computes volume per node xi = (/-5.D-1, -5.D-1, 0.D0/) r = DOT_PRODUCT(self%fPsi(xi),self%r) self%arNodes(1) = fPsi(1)*r*detJ @@ -712,8 +714,10 @@ MODULE moduleMesh2DCyl xi = (/1.D0/3.D0, 1.D0/3.D0, 0.D0 /) detJ = self%detJac(xi)*PI !2PI*1/2 fPsi = self%fPsi(xi) + !Computes total volume of the cell r = DOT_PRODUCT(fPsi,self%r) self%volume = r*detJ + !Computes volume per node self%arNodes = fPsi*r*detJ END SUBROUTINE areaTria