Changeset 9616 for branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90

Timestamp:

2018-05-22T11:09:09+02:00 (6 years ago)

Author:

andmirek

Message:

#2001 few additionale changes

File:

• branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) (12 diffs)

branches/UKMO/dev_r5518_GO6_package_OMP/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90

@@ -153 +153 @@
       IF( lk_qsr_bio .AND. ln_qsr_bio ) THEN      !  bio-model fluxes  : all vertical coordinates  !
          !                                        ! ============================================== !
+!$OMP PARALLEL DO 
          DO jk = 1, jpkm1
             qsr_hc(:,:,jk) = r1_rau0_rcp * ( etot3(:,:,jk) - etot3(:,:,jk+1) )
          END DO
          !                                        Add to the general trend
+!$OMP PARALLEL DO PRIVATE (z1_e3t)
          DO jk = 1, jpkm1
             DO jj = 2, jpjm1 
@@ -198 +200 @@
                   !
                   CALL fld_read( kt, 1, sf_chl )            ! Read Chl data and provides it at the current time step
-!CDIR NOVERRCHK   !
+!$OMP PARALLEL DO PRIVATE(zchl, zCtot, zze, zlogc, zlogc2, zlogc3, zCb, zCmax, &
+!$OMP&                    zpsimax, zdelpsi, zCze, zpsi, jk) SHARED (nksr)
                   DO jj = 1, jpj
-!CDIR NOVERRCHK
                      DO ji = 1, jpi
                         zchl    = sf_chl(1)%fnow(ji,jj,1)
@@ -264 +266 @@
                END DO
                !
+!$OMP PARALLEL DO
                DO jk = 1, nksr                                        ! compute and add qsr trend to ta
                   qsr_hc(:,:,jk) = r1_rau0_rcp * ( zea(:,:,jk) - zea(:,:,jk+1) )
@@ -271 +274 @@
                !
                IF ( ln_qsr_ice ) THEN    ! store attenuation coefficient of the first ocean level
-!CDIR NOVERRCHK
                   DO jj = 1, jpj                                         ! Separation in R-G-B depending of the surface Chl
-!CDIR NOVERRCHK
                      DO ji = 1, jpi
                         zchl = MIN( 10. , MAX( 0.03, zchl3d(ji,jj,1) ) )
@@ -283 +284 @@
                   END DO
                   ! 
+!$OMP PARALLEL DO PRIVATE(zc0, zc1, zc2, zc3)
                   DO jj = 1, jpj
                      DO ji = 1, jpi
@@ -313 +315 @@
                zz0   =        rn_abs   * r1_rau0_rcp
                zz1   = ( 1. - rn_abs ) * r1_rau0_rcp
+!$OMP PARALLEL DO PRIVATE (zc0, zc1)
                DO jk = 1, nksr                    ! solar heat absorbed at T-point in the top 400m 
                   DO jj = 1, jpj
@@ -324 +327 @@
                ! clem: store attenuation coefficient of the first ocean level
                IF ( ln_qsr_ice ) THEN
+!$OMP PARALLEL DO PRIVATE (zc0, zc1)
                   DO jj = 1, jpj
                      DO ji = 1, jpi
@@ -333 +337 @@
                ENDIF
             ELSE                                               !* constant volume: coef. computed one for all
+!$OMP PARALLEL DO
                DO jk = 1, nksr
                   DO jj = 2, jpjm1
@@ -351 +356 @@
          !
          !                                        Add to the general trend
+!$OMP PARALLEL DO PRIVATE (z1_e3t)
          DO jk = 1, nksr
             DO jj = 2, jpjm1 
@@ -538 +544 @@
                   ze3(:,:,1) = zcoef
                   zea(:,:,1) = tmask(:,:,1)                   ! = ( ze0+ze1+z2+ze3 ) * tmask
-               
+!$OMP PARALLEL DO PRIVATE(zc0, zc1, zc2, zc3)
                   DO jk = 2, nksr+1
-!CDIR NOVERRCHK
                      DO jj = 1, jpj
-!CDIR NOVERRCHK   
                         DO ji = 1, jpi
                            zc0 = ze0(ji,jj,jk-1) * EXP( - e3t_0(ji,jj,jk-1) * xsi0r     )
@@ -557 +561 @@
                   END DO 
                   !
+!$OMP PARALLEL DO
                   DO jk = 1, nksr
                      ! (ISF) no light penetration below the ice shelves
@@ -582 +587 @@
                zz0 =        rn_abs   * r1_rau0_rcp
                zz1 = ( 1. - rn_abs ) * r1_rau0_rcp
+!$OMP PARALLEL DO PRIVATE(zc0, zc1)
                DO jk = 1, nksr                    !*  solar heat absorbed at T-point computed once for all
                   DO jj = 1, jpj                              ! top 400 meters