Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

S. Riette 21 Mar 2023: signed zero comparison #16

Merged
merged 2 commits into from
Apr 4, 2023
Merged

S. Riette 21 Mar 2023: signed zero comparison #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0c39f5
S. Riette 21 Mar 2023: signed zero comparison
SebastienRietteMTO Mar 21, 2023
2a8ce53
S. Riette 21 Mar 2023: remove do concurrent loop
SebastienRietteMTO Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/with_fcm/arch/arch-gnu9.2.0_belenos.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module load gcc/9.2.0
module load perl/5.30.3
26 changes: 26 additions & 0 deletions build/with_fcm/arch/arch-gnu9.2.0_belenos.fcm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Compilation
$FCOMPILER = gfortran
$BASE_FFLAGS = -c -fPIC -fdefault-real-8 -fdefault-double-8 -ffree-line-length-none -fopenmp -fconvert=swap
$PROD_FFLAGS = -O3
$DEV_FFLAGS = -O1
$DEBUG_FFLAGS = -O0 -g -fbounds-check -finit-real=snan -ffpe-trap=invalid,zero,overflow
$CCOMPILER = gcc
$BASE_CFLAGS = -c -fPIC -fopenmp
$PROD_CFLAGS = -O3
$DEV_CFLAGS = -O1
$DEBUG_CFLAGS = -fbounds-check
$OMP_FFLAGS =

# Preprocessor
$FPP_FLAGS = LINUX LITTLE_ENDIAN LITTLE REPRO48
$CPP_FLAGS = LINUX LITTLE_ENDIAN LITTLE

# Linker
$LINK = gfortran
$BASE_LD = -fPIC -fdefault-real-8 -fdefault-double-8 -fopenmp
$OMP_LD =
$LD_EXE_TO_SHARED = -shared

# Other
$AR = ar

2 changes: 2 additions & 0 deletions build/with_fcm/arch/arch-gnu9.2.0_nosignzero_belenos.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module load gcc/9.2.0
module load perl/5.30.3
26 changes: 26 additions & 0 deletions build/with_fcm/arch/arch-gnu9.2.0_nosignzero_belenos.fcm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Compilation
$FCOMPILER = gfortran
$BASE_FFLAGS = -c -fPIC -fdefault-real-8 -fdefault-double-8 -ffree-line-length-none -fopenmp -fconvert=swap -fno-sign-zero
$PROD_FFLAGS = -O3
$DEV_FFLAGS = -O1
$DEBUG_FFLAGS = -O0 -g -fbounds-check -finit-real=snan -ffpe-trap=invalid,zero,overflow
$CCOMPILER = gcc
$BASE_CFLAGS = -c -fPIC -fopenmp
$PROD_CFLAGS = -O3
$DEV_CFLAGS = -O1
$DEBUG_CFLAGS = -fbounds-check
$OMP_FFLAGS =

# Preprocessor
$FPP_FLAGS = LINUX LITTLE_ENDIAN LITTLE REPRO48
$CPP_FLAGS = LINUX LITTLE_ENDIAN LITTLE

# Linker
$LINK = gfortran
$BASE_LD = -fPIC -fdefault-real-8 -fdefault-double-8 -fopenmp
$OMP_LD =
$LD_EXE_TO_SHARED = -shared

# Other
$AR = ar

Empty file added build/with_fcm/arch/arch-gnu_nosignzero.env
View file
Open in desktop
Empty file.
26 changes: 26 additions & 0 deletions build/with_fcm/arch/arch-gnu_nosignzero.fcm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Compilation
$FCOMPILER = gfortran
$BASE_FFLAGS = -c -fPIC -fdefault-real-8 -fdefault-double-8 -ffree-line-length-none -fopenmp -fconvert=swap -fallow-argument-mismatch -fno-sign-zero
$PROD_FFLAGS = -O3
$DEV_FFLAGS = -O1
$DEBUG_FFLAGS = -O0 -g -fbounds-check -finit-real=snan -ffpe-trap=invalid,zero,overflow
$CCOMPILER = gcc
$BASE_CFLAGS = -c -fPIC -fopenmp
$PROD_CFLAGS = -O3
$DEV_CFLAGS = -O1
$DEBUG_CFLAGS = -fbounds-check
$OMP_FFLAGS =

# Preprocessor
$FPP_FLAGS = LINUX LITTLE_ENDIAN LITTLE REPRO48
$CPP_FLAGS = LINUX LITTLE_ENDIAN LITTLE

# Linker
$LINK = gfortran
$BASE_LD = -fPIC -fdefault-real-8 -fdefault-double-8 -fopenmp
$OMP_LD =
$LD_EXE_TO_SHARED = -shared

# Other
$AR = ar

2 changes: 1 addition & 1 deletion src/common/micro/rain_ice.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ SUBROUTINE RAIN_ICE ( D, CST, PARAMI, ICEP, ICED, BUCONF, &
!*** 6.1 total tendencies limited by available species
!
DO JK = IKTB, IKTE
DO CONCURRENT (JIJ=IIJB:IIJE)
DO JIJ=IIJB, IIJE
!LV/LS
ZZ_LSFACT(JIJ,JK)=ZZ_LSFACT(JIJ,JK)/PEXNREF(JIJ,JK)
ZZ_LVFACT(JIJ,JK)=ZZ_LVFACT(JIJ,JK)/PEXNREF(JIJ,JK)
Expand Down
4 changes: 2 additions & 2 deletions tools/check_commit_testprogs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ if [ $check -eq 1 ]; then
fi
if [ $te -eq 0 ]; then
set +e
mess=$(cmp <(cat $file1 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ') \
<(cat $file2 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ') 246 246 2>&1)
mess=$(cmp <(cat $file1 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ' | sed 's/-0.00000E+00|/ 0.00000E+00|/g' | sed 's/-0.00000E+00 / 0.00000E+00 /g' | sed 's/-0.00000E+00-/ 0.00000E+00-/g') \
<(cat $file2 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ' | sed 's/-0.00000E+00|/ 0.00000E+00|/g' | sed 's/-0.00000E+00 / 0.00000E+00 /g' | sed 's/-0.00000E+00-/ 0.00000E+00-/g') 246 246 2>&1)
te=$?
set -e
#The use of "<()" bash syntax replaces the actual file name seen by cmp
Expand Down