Remove vector directives. (CICE-Consortium#453)

* Remove vector directives * Remove diag disable in Macros
DeniseWorthen · May 28, 2020 · 2054d09 · 2054d09
1 parent 0a95509
commit 2054d09
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 59 deletions.
diff --git a/cicecore/cicedynB/dynamics/ice_dyn_eap.F90 b/cicecore/cicedynB/dynamics/ice_dyn_eap.F90
@@ -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)

diff --git a/cicecore/cicedynB/dynamics/ice_dyn_evp.F90 b/cicecore/cicedynB/dynamics/ice_dyn_evp.F90
@@ -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)

diff --git a/cicecore/cicedynB/dynamics/ice_transport_remap.F90 b/cicecore/cicedynB/dynamics/ice_transport_remap.F90
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)

diff --git a/cicecore/cicedynB/general/ice_flux.F90 b/cicecore/cicedynB/general/ice_flux.F90
@@ -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
@@ -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

diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90
@@ -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)

diff --git a/cicecore/cicedynB/general/ice_step_mod.F90 b/cicecore/cicedynB/general/ice_step_mod.F90
@@ -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)

diff --git a/cicecore/cicedynB/infrastructure/ice_restoring.F90 b/cicecore/cicedynB/infrastructure/ice_restoring.F90
@@ -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)

diff --git a/configuration/scripts/machines/Macros.banting_intel b/configuration/scripts/machines/Macros.banting_intel
@@ -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)

diff --git a/configuration/scripts/machines/Macros.cesium_intel b/configuration/scripts/machines/Macros.cesium_intel
@@ -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
 

diff --git a/configuration/scripts/machines/Macros.daley_intel b/configuration/scripts/machines/Macros.daley_intel
@@ -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)

diff --git a/configuration/scripts/machines/Macros.millikan_intel b/configuration/scripts/machines/Macros.millikan_intel
@@ -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