From 1e287ae545c4f8837c01850fbddd08e7d6477c57 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 7 Oct 2024 18:05:00 -0400 Subject: [PATCH] Removed debugging for PPM_CW --- src/ALE/MOM_remapping.F90 | 2 +- src/ALE/Recon1d_PPM_CW.F90 | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/ALE/MOM_remapping.F90 b/src/ALE/MOM_remapping.F90 index 9ac6496849..dea748cd33 100644 --- a/src/ALE/MOM_remapping.F90 +++ b/src/ALE/MOM_remapping.F90 @@ -2032,7 +2032,7 @@ logical function remapping_unit_tests(verbose, num_comp_samp) type(PPM_CW) :: PPM_CW call test%set( verbose=verbose ) ! Sets the verbosity flag in test - call test%set( stop_instantly=.true. ) ! While debugging +! call test%set( stop_instantly=.true. ) ! While debugging answer_date = 20190101 ! 20181231 h_neglect = hNeglect_dflt diff --git a/src/ALE/Recon1d_PPM_CW.F90 b/src/ALE/Recon1d_PPM_CW.F90 index 4c1b06aae2..f55796ee46 100644 --- a/src/ALE/Recon1d_PPM_CW.F90 +++ b/src/ALE/Recon1d_PPM_CW.F90 @@ -157,14 +157,14 @@ subroutine reconstruct(this, h, u) this%ur(k) = u1 elseif ( du * a6 > du * du ) then ! Extrema on right edge = 3.0 * u1 - 2.0 * this%ur(k) ! Subject to round off - edge = u1 + 2.0 * ( u1 - this%ur(k) ) + edge = u1 + 2.0 * ( u1 - this%ur(k) ) ! Passes consistency tests - AJA ! u_min = min( u0, u1 ) ! u_max = max( u0, u1 ) ! edge = max( min( edge, u_max), u_min ) this%ul(k) = edge elseif ( du * a6 < - du * du ) then ! Extrema on left edge = 3.0 * u1 - 2.0 * this%ul(k) ! Subject to round off - edge = u1 + 2.0 * ( u1 - this%ul(k) ) + edge = u1 + 2.0 * ( u1 - this%ul(k) ) ! Passes consistency tests - AJA ! u_min = min( u1, u2 ) ! u_max = max( u1, u2 ) ! edge = max( min( edge, u_max), u_min ) @@ -286,37 +286,27 @@ logical function check_reconstruction(this, h, u) ! If (u - ul) has the opposite sign from (ur - u), then this cell has an interior extremum do k = 1, this%n if ( ( this%u_mean(k) - this%ul(k) ) * ( this%ur(k) - this%u_mean(k) ) < 0. ) check_reconstruction = .true. - if ( ( this%u_mean(k) - this%ul(k) ) * ( this%ur(k) - this%u_mean(k) ) < 0. ) print *,'C',k enddo ! Check bounding of right edges, w.r.t. the cell means do K = 1, this%n-1 if ( ( this%ur(k) - this%u_mean(k) ) * ( this%u_mean(k+1) - this%ur(k) ) < 0. ) check_reconstruction = .true. - if ( ( this%ur(k) - this%u_mean(k) ) * ( this%u_mean(k+1) - this%ur(k) ) < 0. ) print *,'R',k enddo ! Check bounding of left edges, w.r.t. the cell means do K = 2, this%n if ( ( this%u_mean(k) - this%ul(k) ) * ( this%ul(k) - this%u_mean(k-1) ) < 0. ) check_reconstruction = .true. - if ( ( this%u_mean(k) - this%ul(k) ) * ( this%ul(k) - this%u_mean(k-1) ) < 0. ) print *,'L',k enddo ! Check bounding of right edges, w.r.t. this cell mean and the next cell left edge do K = 1, this%n-1 if ( ( this%ur(k) - this%u_mean(k) ) * ( this%ul(k+1) - this%ur(k) ) < 0. ) check_reconstruction = .true. - if ( ( this%ur(k) - this%u_mean(k) ) * ( this%ul(k+1) - this%ur(k) ) < 0. ) print *,'r',k enddo ! Check bounding of left edges, w.r.t. this cell mean and the previous cell right edge do K = 2, this%n if ( ( this%u_mean(k) - this%ul(k) ) * ( this%ul(k) - this%ur(k-1) ) < 0. ) check_reconstruction = .true. - if ( ( this%u_mean(k) - this%ul(k) ) * ( this%ul(k) - this%ur(k-1) ) < 0. ) print *,'l',k enddo -if (check_reconstruction) then -do k = 1, this%n -print *,k,this%ul(k),this%u_mean(k),this%ur(k) -enddo -endif end function check_reconstruction