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

Jump to bottom

Remove workaround to PGI compiler bug #327

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Remove workaround to PGI compiler bug #327

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
f508f38
Remove workaround to PGI compiler bug
mnlevy1981 Nov 15, 2018
488a6a9
Use newer pgi compiler on hobart
mnlevy1981 Nov 27, 2018
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
11 changes: 1 addition & 10 deletions src/marbl_interface.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ end subroutine put_all_string

!***********************************************************************

subroutine put_input_file_line(this, line, pgi_bugfix_var)
subroutine put_input_file_line(this, line)

! This subroutine takes a single line from MARBL's default input file format,
! determines the variable name and whether the value is a scalar or an array,
Expand All @@ -555,21 +555,12 @@ subroutine put_input_file_line(this, line, pgi_bugfix_var)

class(marbl_interface_class), intent(inout) :: this
character(len=*), intent(in) :: line
! For some reason PGI doesn't like this particular interface to put_setting()
! --- Error from building stand-alone driver ---
! PGF90-S-0155-cannot access PRIVATE type bound procedure
! put_input_file_line$tbp (/NO_BACKUP/codes/marbl/tests/driver_src/marbl.F90: 239)
!
! But adding another variable to the interface makes it okay
logical, optional, intent(in) :: pgi_bugfix_var(0)

character(len=char_len), dimension(:), allocatable :: value, line_loc_arr
character(len=char_len) :: varname, var_loc, line_loc
integer(int_kind) :: n, char_ind

line_loc = ''
! The included PGI bugfix variable triggers a warning from gfortran unless it's used
if (present(pgi_bugfix_var)) line_loc=''
! Strip out comments (denoted by '!'); line_loc_arr(1) is the line to be processed
call marbl_utils_str_to_substrs(line, '!', line_loc_arr)
line_loc = line_loc_arr(1)
Expand Down
2 changes: 1 addition & 1 deletion tests/python_for_tests/machines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def machine_specific(mach, supported_compilers, module_names):
module_names['nag'] = 'compiler/nag/6.2'
module_names['intel'] = 'compiler/intel/18.0.3'
module_names['gnu'] = 'compiler/gnu/8.1.0'
module_names['pgi'] = 'compiler/pgi/18.1'
module_names['pgi'] = 'compiler/pgi/18.10'
return

if mach == 'edison':
Expand Down