gkowal/amun-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into gem-reconnection-challenge

Browse Source
This commit is contained in:
Grzegorz Kowal 2023-04-03 18:17:55 -03:00
commit 6380561de3
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -19,13 +19,13 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
endif()
if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
add_compile_options("$<$<CONFIG:RELEASE>:-march=native;-pipe;-fno-tree-vectorize;-fno-unsafe-math-optimizations;-frounding-math;-fsignaling-nans;-finline-limit=10000;-fdiagnostics-color=always>")
add_compile_options("$<$<CONFIG:RELEASE>:-pipe;-fno-tree-vectorize;-fno-unsafe-math-optimizations;-frounding-math;-fsignaling-nans;-finline-limit=10000;-fdiagnostics-color=always>")
add_compile_options("$<$<CONFIG:DEBUG>:-Og;-pedantic;-fcheck=all;-W;-Wall;-Wno-unused-dummy-argument>")
endif()
if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
add_compile_options("$<$<CONFIG:RELEASE>:-xHost;-fp-model=source;-heap-arrays;-ip;-unroll-aggressive;-simd;-qopt-prefetch;-use-intel-optimized-headers;-finline-limit=1000;-fno-omit-frame-pointer>")
add_compile_options("$<$<CONFIG:RELEASE>:-fp-model=source;-heap-arrays;-ip;-unroll-aggressive;-simd;-qopt-prefetch;-use-intel-optimized-headers;-finline-limit=1000;-fno-omit-frame-pointer>")
add_compile_options("$<$<CONFIG:DEBUG>:-O>")
add_compile_options(-assume byterecl)
add_compile_options("-assume byterecl")
endif()
if(CMAKE_Fortran_COMPILER_ID MATCHES "PGI")
add_compile_options("$<$<CONFIG:RELEASE>:-fastsse;-O4;-Mvect=simd;-Minline=maxsize:1000>")

21
sources/forcing.F90
View File

@ -995,7 +995,12 @@ module forcing
!-------------------------------------------------------------------------------
!
if (t < tinj_start .or. t > tinj_stop) return
if (t < tinj_start .or. t > tinj_stop) then
arms = 0.0d+00
dinj = 0.0d+00
rinj = 0.0d+00
return
end if
! calculate the number of eddies to be injected during this interval
!
@ -1079,7 +1084,12 @@ module forcing
!-------------------------------------------------------------------------------
!
if (t < tinj_start .or. t > tinj_stop) return
if (t < tinj_start .or. t > tinj_stop) then
arms = 0.0d+00
dinj = 0.0d+00
rinj = 0.0d+00
return
end if
! calculate drift and diffusion coefficients
!
@ -1166,7 +1176,12 @@ module forcing
!-------------------------------------------------------------------------------
!
if (t < tinj_start .or. t > tinj_stop) return
if (t < tinj_start .or. t > tinj_stop) then
arms = 0.0d+00
dinj = 0.0d+00
rinj = 0.0d+00
return
end if
! determine velocify coefficients in Fourier space
!