Changeset 7037 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

Timestamp:

2016-10-18T15:32:04+02:00 (8 years ago)

Author:

mocavero

Message:

ORCA2_LIM_PISCES hybrid version update

File:

• branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 (modified) (9 diffs)

branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -124 +124 @@
          !                                                     ! set temperature & salinity content of runoffs
          IF( ln_rnf_tem ) THEN                                       ! use runoffs temperature data
+!$OMP PARALLEL WORKSHARE
             rnf_tsc(:,:,jp_tem) = ( sf_t_rnf(1)%fnow(:,:,1) ) * rnf(:,:) * r1_rau0
+!$OMP END PARALLEL WORKSHARE
             CALL eos_fzp( sss_m(:,:), ztfrz(:,:) )
+!$OMP PARALLEL WORKSHARE
             WHERE( sf_t_rnf(1)%fnow(:,:,1) == -999._wp )             ! if missing data value use SST as runoffs temperature
                rnf_tsc(:,:,jp_tem) = sst_m(:,:) * rnf(:,:) * r1_rau0
@@ -132 +135 @@
                rnf_tsc(:,:,jp_tem) = ztfrz(:,:) * rnf(:,:) * r1_rau0 - rnf(:,:) * rlfusisf * r1_rau0_rcp
             END WHERE
+!$OMP END PARALLEL WORKSHARE
          ELSE                                                        ! use SST as runoffs temperature
+!$OMP PARALLEL WORKSHARE
             rnf_tsc(:,:,jp_tem) = sst_m(:,:) * rnf(:,:) * r1_rau0
+!$OMP END PARALLEL WORKSHARE
          ENDIF
          !                                                           ! use runoffs salinity data
-         IF( ln_rnf_sal )   rnf_tsc(:,:,jp_sal) = ( sf_s_rnf(1)%fnow(:,:,1) ) * rnf(:,:) * r1_rau0
+         IF( ln_rnf_sal ) THEN
+!$OMP PARALLEL WORKSHARE
+            rnf_tsc(:,:,jp_sal) = ( sf_s_rnf(1)%fnow(:,:,1) ) * rnf(:,:) * r1_rau0
+!$OMP END PARALLEL WORKSHARE
+         END IF
          !                                                           ! else use S=0 for runoffs (done one for all in the init)
          CALL iom_put( "runoffs", rnf )         ! output runoffs arrays
@@ -152 +162 @@
          ELSE                                                   !* no restart: set from nit000 values
             IF(lwp) WRITE(numout,*) '          nit000-1 runoff forcing fields set to nit000'
+!$OMP PARALLEL WORKSHARE
             rnf_b    (:,:  ) = rnf    (:,:  )
             rnf_tsc_b(:,:,:) = rnf_tsc(:,:,:)
+!$OMP END PARALLEL WORKSHARE
          ENDIF
       ENDIF
@@ -197 +209 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
+!$OMP PARALLEL DO schedule(static) private(jk)
                   DO jk = 1, nk_rnf(ji,jj)
                      phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - ( rnf(ji,jj) + rnf_b(ji,jj) ) * zfact * r1_rau0 / h_rnf(ji,jj)
@@ -203 +216 @@
             END DO
          ELSE                    !* variable volume case
+!$OMP PARALLEL
             DO jj = 1, jpj                   ! update the depth over which runoffs are distributed
                DO ji = 1, jpi
                   h_rnf(ji,jj) = 0._wp
+!$OMP DO schedule(static) private(jk)
                   DO jk = 1, nk_rnf(ji,jj)                           ! recalculates h_rnf to be the depth in metres
                      h_rnf(ji,jj) = h_rnf(ji,jj) + e3t_n(ji,jj,jk)   ! to the bottom of the relevant grid box
                   END DO
                   !                          ! apply the runoff input flow
+!$OMP DO schedule(static) private(jk)
                   DO jk = 1, nk_rnf(ji,jj)
                      phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - ( rnf(ji,jj) + rnf_b(ji,jj) ) * zfact * r1_rau0 / h_rnf(ji,jj)
                   END DO
+!$OMP END DO NOWAIT
                END DO
             END DO
+!$OMP END PARALLEL
          ENDIF
       ELSE                       !==   runoff put only at the surface   ==!
+!$OMP PARALLEL WORKSHARE
          h_rnf (:,:)   = e3t_n (:,:,1)        ! update h_rnf to be depth of top box
          phdivn(:,:,1) = phdivn(:,:,1) - ( rnf(:,:) + rnf_b(:,:) ) * zfact * r1_rau0 / e3t_n(:,:,1)
+!$OMP END PARALLEL WORKSHARE
       ENDIF
       !
@@ -256 +276 @@
          ln_rnf_mouth  = .FALSE.                   ! default definition needed for example by sbc_ssr or by tra_adv_muscl
          nkrnf         = 0
+!$OMP PARALLEL WORKSHARE
          rnf     (:,:) = 0.0_wp
          rnf_b   (:,:) = 0.0_wp
          rnfmsk  (:,:) = 0.0_wp
          rnfmsk_z(:)   = 0.0_wp
+!$OMP END PARALLEL WORKSHARE
          RETURN
       ENDIF
@@ -357 +379 @@
             DO ji = 1, jpi
                h_rnf(ji,jj) = 0._wp
+!$OMP PARALLEL DO schedule(static) private(jk)
                DO jk = 1, nk_rnf(ji,jj)
                   h_rnf(ji,jj) = h_rnf(ji,jj) + e3t_n(ji,jj,jk)
@@ -415 +438 @@
             DO ji = 1, jpi
                h_rnf(ji,jj) = 0._wp
+!$OMP PARALLEL DO schedule(static) private(jk)
                DO jk = 1, nk_rnf(ji,jj)
                   h_rnf(ji,jj) = h_rnf(ji,jj) + e3t_n(ji,jj,jk)
@@ -432 +456 @@
       ENDIF
       !
+!$OMP PARALLEL WORKSHARE
       rnf(:,:) =  0._wp                         ! runoff initialisation
       rnf_tsc(:,:,:) = 0._wp                    ! runoffs temperature & salinty contents initilisation
+!$OMP END PARALLEL WORKSHARE
       !
       !                                   ! ========================