Skip to content

Commit 257ed2e

Browse files
committed
Merge branch 'gfortran-non-determinism-repeat'
2 parents 7cc561c + d4b0025 commit 257ed2e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

prerequisites/install-functions/report_results.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ report_results()
6060
echo "else " >> setup.sh
6161
echo " export PATH=\"${compiler_install_root%/}/bin:\${PATH}\" " >> setup.sh
6262
echo "fi " >> setup.sh
63-
echo "set path (\"${compiler_install_root%/}\"/bin \$path) " >> setup.csh
63+
echo "set path = (\"${compiler_install_root%/}\"/bin \$path) " >> setup.csh
6464
fi
6565
LD_LIB_P_VAR=LD_LIBRARY_PATH
6666
if [[ "${OSTYPE:-}" =~ [Dd]arwin ]]; then

src/extensions/opencoarrays.F90

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,13 +581,15 @@ subroutine co_broadcast_c_char(a,source_image,stat,errmsg)
581581
character(kind=1,len=*), intent(out), optional :: errmsg
582582
! Local variables and constants:
583583
integer(c_int), allocatable :: a_cast_to_integer_array(:)
584+
character(len=len(a)) :: dummy
584585

585586
! Convert "a" to an integer(c_int) array where each 32-bit integer element holds four 1-byte characters
586587
a_cast_to_integer_array = transfer(a,[0_c_int])
587588
! Broadcast the integer(c_int) array
588589
call co_broadcast_c_int(a_cast_to_integer_array,source_image, stat, errmsg)
589590
! Recover the characters from the broadcasted integer(c_int) array
590-
a = transfer(a_cast_to_integer_array,repeat(' ',len(a)))
591+
dummy = ' '
592+
a = transfer(a_cast_to_integer_array,dummy)
591593

592594
end subroutine
593595

0 commit comments

Comments
 (0)