From 12d15c3bc2ad35128a019e8afa263dd937b3bb2c Mon Sep 17 00:00:00 2001 From: David A Minton Date: Mon, 23 Oct 2023 13:03:52 -0400 Subject: [PATCH] Updated the crater size message (though this still needs to be improved further) --- src/crater/crater_populate.f90 | 4 ++-- src/globals/module_globals.f90 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crater/crater_populate.f90 b/src/crater/crater_populate.f90 index 3c3ef7e7..2c42e765 100644 --- a/src/crater/crater_populate.f90 +++ b/src/crater/crater_populate.f90 @@ -221,7 +221,7 @@ subroutine crater_populate(user,surf,crater,domain,prod,production_list,vdist,nt ! generate random crater call crater_generate(user,crater,domain,prod,production_list,vdist,surf) if (user%testflag) then - write(message,'("Dc=",F8.1," Dt=",F8.1)') crater%fcrat, crater%rad*2 + write(message,'("Dc=",ES11.4," Dt=",ES11.4)') crater%fcrat, crater%rad*2 call io_updatePbar(message) end if if (crater%fcrat > domain%biggest_crater) then ! End the run if the crater is too big @@ -229,7 +229,7 @@ subroutine crater_populate(user,surf,crater,domain,prod,production_list,vdist,nt if (user%killatmaxcrater) then fracdone = real(icrater,kind=DP) / real(ntotcrat,kind=DP) write(*,*) - write(*,'("Ended run at ",F7.2,"% due to crater of size: ",ES13.4)') fracdone * 100,crater%fcrat + write(*,'("Ended run at ",ES11.4,"% due to crater of size: ",ES11.4)') fracdone * 100,crater%fcrat exit else makecrater = .false. ! Ignore this big crater diff --git a/src/globals/module_globals.f90 b/src/globals/module_globals.f90 index 999fc5b7..3ce3f5cd 100644 --- a/src/globals/module_globals.f90 +++ b/src/globals/module_globals.f90 @@ -305,7 +305,7 @@ module module_globals ! Progress bar variables integer(I4B),parameter :: PBARRES = 100 integer(I4B),parameter :: PBARSIZE = 50 -integer(I4B),parameter :: MESSAGESIZE = 32 +integer(I4B),parameter :: MESSAGESIZE = 48 integer(I4B) :: pbarival integer(I4B) :: pbarpos character(len=PBARSIZE) :: pbarchar