Skip to content

Commit

Permalink
Updated compiler flags and made some minor adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
daminton committed Oct 28, 2021
1 parent a3c606f commit 68f09b7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ examples/global-lunar-bombardment/CTEM
examples/*/*.o*

*.out
.vscode/*
6 changes: 3 additions & 3 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 0 additions & 4 deletions src/ejecta/ejecta_blanket.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
7 changes: 1 addition & 6 deletions src/ejecta/ejecta_table_define.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)

Expand Down

0 comments on commit 68f09b7

Please sign in to comment.