From 68f09b7e621e56e5b995d5721e2d583c63688305 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 28 Oct 2021 16:58:16 -0400 Subject: [PATCH] Updated compiler flags and made some minor adjustments --- .gitignore | 1 + src/Makefile.am | 6 +++--- src/ejecta/ejecta_blanket.f90 | 4 ---- src/ejecta/ejecta_table_define.f90 | 7 +------ 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 2a75f137..578215c1 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ examples/global-lunar-bombardment/CTEM examples/*/*.o* *.out +.vscode/* diff --git a/src/Makefile.am b/src/Makefile.am index 74f5392e..1eaeb9e2 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,12 +1,12 @@ bin_PROGRAMS = CTEM #ifort optimized flags -#AM_FCFLAGS = -O3 -qopenmp -parallel -xHost -ipo -assume byterecl -m64 -heap-arrays -FR -#AM_FCFLAGS = -O3 -openmp -parallel -assume byterecl -m64 -heap-arrays -FR +AM_FCFLAGS = -O3 -qopenmp -parallel -xHost -assume byterecl -m64 -heap-arrays -FR +#AM_FCFLAGS = -O3 -qopenmp -parallel -assume byterecl -m64 -heap-arrays -FR #ifort debug flags #AM_FCFLAGS = -O3 -p -g -openmp -debug all -traceback -CB -assume byterecl -m64 -heap-arrays -FR #gfortran optimized flags -AM_FCFLAGS = -O3 -fopenmp -ffree-form -g -fbounds-check -fbacktrace +#AM_FCFLAGS = -O3 -fopenmp -ffree-form -g -fbounds-check -fbacktrace #gfortran debug flags #AM_FCFLAGS = -O0 -g -fopenmp -fbounds-check -Wall -Warray-bounds -Warray-temporaries -Wimplicit-interface -ffree-form diff --git a/src/ejecta/ejecta_blanket.f90 b/src/ejecta/ejecta_blanket.f90 index 8776fc1d..3d16599c 100644 --- a/src/ejecta/ejecta_blanket.f90 +++ b/src/ejecta/ejecta_blanket.f90 @@ -76,10 +76,6 @@ subroutine ejecta_blanket(user,crater,domain,erad,lrad,vejsq,ejang,firstrun) vej1sq = max(ce1sq * abs(user%gaccel * crater%grad) * (crater%grad / erad)**p,0._DP) gterm = ce1sq * (user%gaccel * erad) vejsq = max(vej1sq - gterm - yterm,0._DP) - !if (vejsq >= domain%vescsq) then - ! lrad = VBIG - ! return - !end if ! Ejection angle ejang=DEG2RAD * (55._DP - 20 * (erad / crater%grad)) diff --git a/src/ejecta/ejecta_table_define.f90 b/src/ejecta/ejecta_table_define.f90 index 8f4aa22e..744b0da8 100644 --- a/src/ejecta/ejecta_table_define.f90 +++ b/src/ejecta/ejecta_table_define.f90 @@ -47,7 +47,7 @@ subroutine ejecta_table_define(user,crater,domain,ejb,ejtble,melt) crater%ejdis = DISEJB * crater%continuous ! We go out a factor of 3 to get the discontinuous ejecta thickness domain%ejbres = (log(crater%ejdis) - log(crater%ejrad)) / EJBTABSIZE - lrad = crater%ejrad !exp(log(crater%rad) !+ domain%ejbres) + lrad = crater%ejrad erad = crater%ejrad ejtble = EJBTABSIZE firstrun = .true. @@ -67,12 +67,9 @@ subroutine ejecta_table_define(user,crater,domain,ejb,ejtble,melt) call regolith_melt_zone(user,crater,dimp,vimp,rmelt,depthb) end if - !write(*,*) ' lrad/Df vej ebh melt & - ! fraction melt thickness' do k = 0,EJBTABSIZE call ejecta_rootfind(user,crater,domain,erad,lrad,vejsq,ejang,firstrun) if (k >= 1) then - !call ejecta_thickness(user,crater,eradold,erad,lrad - domain%ejbres,lrad,thick) ejb(k)%lrad = log(lrad) ! This will be replaced @@ -90,7 +87,6 @@ subroutine ejecta_table_define(user,crater,domain,ejb,ejtble,melt) call regolith_melt_fraction(dimp,depthb,erad,eradold,rmelt,melt) ejb(k)%meltfrac = melt end if - !write(*,*) lrad/crater%rad,erad/crater%rad,sqrt(vejsq),thick !,melt,thick*melt if ((thick <= VSMALL) .or. (abs(eradold - erad) < VSMALL)) then ejtble = k crater%ejdis = lrad @@ -100,7 +96,6 @@ subroutine ejecta_table_define(user,crater,domain,ejb,ejtble,melt) lrad = exp(log(lrad) + domain%ejbres) eradold = erad end do - !write(*,*) 'A MELT ZONE of ',crater%frad,' meter-sized crater: ',rmelt,'at a rim',ejb(1)%meltfrac ! Get pixel space distance crater%ejdispx = nint(crater%ejdis / user%pix)