From 20b53cb77488601331e43048648cc1d760043add Mon Sep 17 00:00:00 2001 From: Manas Rachh Date: Sat, 1 Oct 2022 15:32:11 -0400 Subject: [PATCH] updating test script --- examples/test_surfsmooth.f90 | 24 ++++++++++++++++++------ src/cisurf_loadmsh.f90 | 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/examples/test_surfsmooth.f90 b/examples/test_surfsmooth.f90 index 694eb0c..2203077 100644 --- a/examples/test_surfsmooth.f90 +++ b/examples/test_surfsmooth.f90 @@ -47,7 +47,7 @@ program smoother ! the go3 format ! ! - nrefine = 0 + nrefine = 2 ! nrefine=1 ! this is to enable adaptativity (otherwise sigma is constant) @@ -63,7 +63,7 @@ program smoother ! in relation to triangle diameter ! \sigma_{j} = D_{j}/rlam ! - rlam = 2.5d0 !(usual value) + rlam = 10.0d0 !(usual value) !rlam = .5d0 !rlam = 1 @@ -105,7 +105,7 @@ program smoother nombre='./geometries/cuboid_a1_b2_c1p3.tri' - filename='./Geometries_go3/cuboid_a1_b2_c1p3' + filename='./geometries_go3/cuboid_a1_b2_c1p3' !!! point inside to check Gauss integral ! x0=0.0d0 ! y0=0.0d0 @@ -122,9 +122,9 @@ program smoother ! nombre='./geometries/goyle.tri' ! filename='./geometries_go3/goyle_smooth' !!! point inside to check Gauss integral - x0=0.0d0 - y0=0.0d0 - z0=1.5d0 + x0=0.1d0 + y0=0.1d0 + z0=0.1d0 ! nombre = './geometries/FORK.a.tri' ! filename= './geometries_go3/fork_smooth' @@ -424,6 +424,18 @@ program smoother call prin2('error_report=*',error_report,nrefine+1) write (*,*) 'error_report final: ',error_report + ifplot = 1 + if (ifplot .eq. 1) then + print * + print * + print *, '. . . plotting vtk smoothed geometry' + + plot_name = 'smoothed_final.vtk' + call plotsmoothgeometryvtk(Geometry1, plot_name) + print *, '. . . finished plotting vtk smoothed geometry' + end if + +! write (*,*) 'Empezando la parte critica de refinar' write (*,*) 'FINAL REPORT' do count=0,nrefine diff --git a/src/cisurf_loadmsh.f90 b/src/cisurf_loadmsh.f90 index 28d1cb2..4c18e4f 100644 --- a/src/cisurf_loadmsh.f90 +++ b/src/cisurf_loadmsh.f90 @@ -791,7 +791,7 @@ subroutine readtri(Geometry1,filename, norder_skel, norder_smooth) do j=1,m read(8,*) Geometry1%Points(1,j),Geometry1%Points(2,j),Geometry1%Points(3,j) - Geometry1%Points(1:3,j) = Geometry1%Points(1:3,j)*1.0d7 + Geometry1%Points(1:3,j) = Geometry1%Points(1:3,j) enddo