Skip to content

Remove vector directives. #453

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
apcraig merged 3 commits into from
May 28, 2020
Merged

Remove vector directives. #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ef39c2
Remove vector directives
dabail10 May 27, 2020
4e3a4f5
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 May 28, 2020
0de56a2
Remove diag disable in Macros
dabail10 May 28, 2020
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: 0 additions & 3 deletions cicecore/cicedynB/dynamics/ice_dyn_eap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,9 +1293,6 @@ subroutine stress_eap (nx_block, ny_block, &

strtmp(:,:,:) = c0

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icellt
i = indxti(ij)
j = indxtj(ij)
Expand Down
3 changes: 0 additions & 3 deletions cicecore/cicedynB/dynamics/ice_dyn_evp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,9 +668,6 @@ subroutine stress (nx_block, ny_block, &

str(:,:,:) = c0

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icellt
i = indxti(ij)
j = indxtj(ij)
Expand Down
34 changes: 0 additions & 34 deletions cicecore/cicedynB/dynamics/ice_transport_remap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,9 +1248,6 @@ subroutine construct_fields (nx_block, ny_block, &
enddo
enddo

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells ! Note: no tx or ty in ghost cells
! (bound calls are later)
i = indxi(ij)
Expand Down Expand Up @@ -3133,10 +3130,6 @@ subroutine triangle_coordinates (nx_block, ny_block, &

elseif (integral_order == 2) then ! quadratic (3-point formula)

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu

do ng = 1, ngroups
do ij = 1, icells(ng)
i = indxi(ij,ng)
Expand Down Expand Up @@ -3164,9 +3157,6 @@ subroutine triangle_coordinates (nx_block, ny_block, &

else ! cubic (4-point formula)

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ng = 1, ngroups
do ij = 1, icells(ng)
i = indxi(ij,ng)
Expand Down Expand Up @@ -3298,9 +3288,6 @@ subroutine transport_integrals (nx_block, ny_block, &

if (integral_order == 1) then ! linear (1-point formula)

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells(ng)
i = indxi(ij,ng)
j = indxj(ij,ng)
Expand All @@ -3326,9 +3313,6 @@ subroutine transport_integrals (nx_block, ny_block, &

elseif (integral_order == 2) then ! quadratic (3-point formula)

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells(ng)
i = indxi(ij,ng)
j = indxj(ij,ng)
Expand Down Expand Up @@ -3373,9 +3357,6 @@ subroutine transport_integrals (nx_block, ny_block, &

else ! cubic (4-point formula)

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells(ng)
i = indxi(ij,ng)
j = indxj(ij,ng)
Expand Down Expand Up @@ -3433,9 +3414,6 @@ subroutine transport_integrals (nx_block, ny_block, &
do nt = 1, ntrace
if (tracer_type(nt)==1) then ! does not depend on another tracer

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells(ng)
i = indxi(ij,ng)
j = indxj(ij,ng)
Expand Down Expand Up @@ -3464,9 +3442,6 @@ subroutine transport_integrals (nx_block, ny_block, &
elseif (tracer_type(nt)==2) then ! depends on another tracer
nt1 = depend(nt)

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells(ng)
i = indxi(ij,ng)
j = indxj(ij,ng)
Expand All @@ -3486,9 +3461,6 @@ subroutine transport_integrals (nx_block, ny_block, &
elseif (tracer_type(nt)==3) then ! depends on two tracers
nt1 = depend(nt)

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells(ng)
i = indxi(ij,ng)
j = indxj(ij,ng)
Expand Down Expand Up @@ -3690,9 +3662,6 @@ subroutine update_fields (nx_block, ny_block, &
elseif (tracer_type(nt)==2) then ! depends on another tracer
nt1 = depend(nt)

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells
i = indxi(ij)
j = indxj(ij)
Expand All @@ -3710,9 +3679,6 @@ subroutine update_fields (nx_block, ny_block, &
nt1 = depend(nt)
nt2 = depend(nt1)

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells
i = indxi(ij)
j = indxj(ij)
Expand Down
6 changes: 0 additions & 6 deletions cicecore/cicedynB/general/ice_flux.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,9 +1071,6 @@ subroutine scale_fluxes (nx_block, ny_block, &
if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
file=__FILE__, line=__LINE__)

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do j = 1, ny_block
do i = 1, nx_block
if (tmask(i,j) .and. aice(i,j) > c0) then
Expand Down Expand Up @@ -1139,9 +1136,6 @@ subroutine scale_fluxes (nx_block, ny_block, &
! Scale fluxes for history output
if (present(fsurf) .and. present(fcondtop) ) then

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do j = 1, ny_block
do i = 1, nx_block
if (tmask(i,j) .and. aice(i,j) > c0) then
Expand Down
3 changes: 0 additions & 3 deletions cicecore/cicedynB/general/ice_init.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1866,9 +1866,6 @@ subroutine set_state_var (nx_block, ny_block, &
do n = 1, ncat

! ice volume, snow volume
!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells
i = indxi(ij)
j = indxj(ij)
Expand Down
3 changes: 0 additions & 3 deletions cicecore/cicedynB/general/ice_step_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1284,9 +1284,6 @@ subroutine ocean_mixed_layer (dt, iblk)
! Compute ocean fluxes and update SST
!-----------------------------------------------------------------

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells
i = indxi(ij)
j = indxj(ij)
Expand Down
3 changes: 0 additions & 3 deletions cicecore/cicedynB/infrastructure/ice_restoring.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,9 +499,6 @@ subroutine set_restore_var (nx_block, ny_block, &

do n = 1, ncat

!DIR$ CONCURRENT !Cray
!cdir nodep !NEC
!ocl novrec !Fujitsu
do ij = 1, icells
i = indxi(ij)
j = indxj(ij)
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.banting_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CFLAGS := -c -O2 -fp-model precise
#-xHost

FREEFLAGS := -FR
FFLAGS := -fp-model source -convert big_endian -assume byterecl -ftz -traceback -diag-disable 5140
FFLAGS := -fp-model source -convert big_endian -assume byterecl -ftz -traceback
#-xHost

ifeq ($(ICE_BLDDEBUG), true)
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.cesium_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CFLAGS := -c -O2 -fp-model precise

FIXEDFLAGS := -132
FREEFLAGS := -FR
FFLAGS := -fp-model source -convert big_endian -assume byterecl -ftz -traceback -diag-disable 5140
FFLAGS := -fp-model source -convert big_endian -assume byterecl -ftz -traceback
#-xHost
FFLAGS_NOOPT:= -O0

Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.daley_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CFLAGS := -c -O2 -fp-model precise
#-xHost

FREEFLAGS := -FR
FFLAGS := -fp-model source -convert big_endian -assume byterecl -ftz -traceback -diag-disable 5140
FFLAGS := -fp-model source -convert big_endian -assume byterecl -ftz -traceback
#-xHost

ifeq ($(ICE_BLDDEBUG), true)
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.millikan_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CFLAGS := -c -O2 -fp-model precise

FIXEDFLAGS := -132
FREEFLAGS := -FR
FFLAGS := -fp-model source -convert big_endian -assume byterecl -ftz -traceback -diag-disable 5140
FFLAGS := -fp-model source -convert big_endian -assume byterecl -ftz -traceback
#-xHost
FFLAGS_NOOPT:= -O0

Expand Down