Skip to content

Bugfix/gmake endian #721

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

Merged
JessicaMeixner-NOAA merged 4 commits into from
May 31, 2022
Merged

Bugfix/gmake endian #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89541f7
Added alternaive endian support to gmake build
ukmo-ccbunney May 25, 2022
f814558
Fix bad indent and add comment
ukmo-ccbunney May 25, 2022
dddcb71
Fix multi input check in run_test (as per run_cmake_test)
ukmo-ccbunney May 26, 2022
b2a3244
Merge branch 'NOAA-EMC:develop' into bugfix/gmake_endian
ukmo-ccbunney May 26, 2022
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
3 changes: 3 additions & 0 deletions model/bin/ad3.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@

CPPFLAGS+=("-D__WW3_SWITCHES__='$sw_str'")

# Also set endianness:
CPPFLAGS+=("-DENDIANNESS='<endian>'")

<comp_seq> "${CPPFLAGS[@]}" <cppad3procflag> <cppad3flag2> $path_i/$name.F90 <cppad3flag3> $name.F90
<cppad3flag4> mv $name.i $name.F90

Expand Down
15 changes: 12 additions & 3 deletions model/bin/cmplr.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
err_pattern='[[:space:]]error[[:space:]]'
warn_pattern='warn'

# Binary I/O defaults to native endian:
endian='native'

# disable listing done by the compiler
list='no'

Expand Down Expand Up @@ -63,9 +66,11 @@ if [ "$cmplr" == "mpt" ] || [ "$cmplr" == "mpt_debug" ] || [ "$cmplr" == "mpt_pr
# OPTIONS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

# common options
optc='-c -module $path_m -no-fma -ip -g -i4 -real-size 32 -fp-model precise -assume byterecl -convert big_endian -fno-alias -fno-fnalias'
optc='-c -module $path_m -no-fma -ip -g -i4 -real-size 32 -fp-model precise -assume byterecl -fno-alias -fno-fnalias'
optl='-o $prog -g'

endian='big_endian'

# list options
if [ "$list" == 'yes' ] ; then optc="$optc -list"; fi

Expand Down Expand Up @@ -145,9 +150,11 @@ if [ "$cmplr" == "intel" ] || [ "$cmplr" == "intel_debug" ] || [ "$c
# OPTIONS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

# common options
optc='-c -module $path_m -no-fma -ip -g -traceback -i4 -real-size 32 -fp-model precise -assume byterecl -convert big_endian -fno-alias -fno-fnalias -sox'
optc='-c -module $path_m -no-fma -ip -g -traceback -i4 -real-size 32 -fp-model precise -assume byterecl -fno-alias -fno-fnalias -sox'
optl='-o $prog -g'

endian='big_endian'

# list options
if [ "$list" == 'yes' ] ; then optc="$optc -list"; fi

Expand Down Expand Up @@ -252,9 +259,11 @@ if [ "$cmplr" == "gnu" ] || [ "$cmplr" == "gnu_debug" ] || [ "$cmplr" == "gnu_pr
# OPTIONS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

# common options
optc='-c -J$path_m -g -fno-second-underscore -ffree-line-length-none -fconvert=big-endian'
optc='-c -J$path_m -g -fno-second-underscore -ffree-line-length-none'
optl='-o $prog -g'

endian='big_endian'

# omp options
optomp='-fopenmp'

Expand Down
2 changes: 1 addition & 1 deletion model/bin/w3_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ then
[ "$cmplr" == "ukmo_cray_gnu" ] || [ "$cmplr" == "ukmo_cray_gnu_debug" ] || \
[ "$cmplr" == "ukmo_cray_intel" ] || [ "$cmplr" == "ukmo_cray_intel_debug" ]; then
source $path_b/cmplr.env
sed -e "s/<comp_seq>/$comp_seq/" -e "s/<cppad3procflag>/$cppad3procflag/" -e "s/<cppad3flag2>/$cppad3flag2/" -e "s/<cppad3flag3>/$cppad3flag3/" -e "s/<cppad3flag4>/$cppad3flag4/" $path_b/ad3.tmpl > $path_b/ad3
sed -e "s/<comp_seq>/$comp_seq/" -e "s/<cppad3procflag>/$cppad3procflag/" -e "s/<cppad3flag2>/$cppad3flag2/" -e "s/<cppad3flag3>/$cppad3flag3/" -e "s/<cppad3flag4>/$cppad3flag4/" -e "s/<endian>/${endian}/" $path_b/ad3.tmpl > $path_b/ad3
echo " sed $path_b/ad3.tmpl => $path_b/ad3"
else
errmsg "$path_b/ad3.$cmplr not found"
Expand Down
9 changes: 8 additions & 1 deletion regtests/bin/run_test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,14 @@ then
else
inputs="`ls $path_i/$prog*.inp 2>/dev/null`"
fi
inputs_tmp=`( ls ${path_i}/${prog}${gu}* )`

if [ $nml_input ] && [ ! -z "`ls ${path_i}/${prog}*.nml 2>/dev/null`" ]
then
inputs_tmp=`( ls ${path_i}/${prog}${gu}*nml)`
else
inputs_tmp=`( ls ${path_i}/${prog}${gu}*inp)`
fi

if [ ! -z "$inputs_tmp" ];then
inputs=$inputs_tmp
fi
Expand Down