Changeset 7698 for trunk/NEMOGCM/NEMO/OPA_SRC/ICB

Timestamp:

2017-02-18T10:02:03+01:00 (7 years ago)

Author:

mocavero

Message:

update trunk with OpenMP parallelization

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90

@@ -85 +85 @@
       first_width (:) = SQRT(  rn_initial_mass(:) / ( rn_LoW_ratio * rn_rho_bergs * rn_initial_thickness(:) )  )
       first_length(:) = rn_LoW_ratio * first_width(:)
-
-      berg_grid%calving      (:,:)   = 0._wp
-      berg_grid%calving_hflx (:,:)   = 0._wp
-      berg_grid%stored_heat  (:,:)   = 0._wp
-      berg_grid%floating_melt(:,:)   = 0._wp
-      berg_grid%maxclass     (:,:)   = nclasses
-      berg_grid%stored_ice   (:,:,:) = 0._wp
-      berg_grid%tmp          (:,:)   = 0._wp
-      src_calving            (:,:)   = 0._wp
-      src_calving_hflx       (:,:)   = 0._wp
-
+!$OMP PARALLEL
+!$OMP DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            berg_grid%calving      (ji,jj)   = 0._wp
+            berg_grid%calving_hflx (ji,jj)   = 0._wp
+            berg_grid%stored_heat  (ji,jj)   = 0._wp
+            berg_grid%floating_melt(ji,jj)   = 0._wp
+            berg_grid%maxclass     (ji,jj)   = nclasses
+            berg_grid%tmp          (ji,jj)   = 0._wp
+            src_calving            (ji,jj)   = 0._wp
+            src_calving_hflx       (ji,jj)   = 0._wp
+         END DO
+      END DO
+      DO jn = 1, nclasses
+!$OMP DO schedule(static) private(jj, ji)
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               berg_grid%stored_ice   (ji,jj,jn) = 0._wp
+            END DO
+         END DO
+      END DO
+!$OMP END PARALLEL
       !                          ! domain for icebergs
       IF( lk_mpp .AND. jpni == 1 )   CALL ctl_stop( 'icbinit: having ONE processor in x currently does not work' )
@@ -108 +120 @@
       nicbfldproc(:) = -1
 
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -218 +231 @@
          CALL flush(numicb)
       ENDIF
-      
-      src_calving     (:,:) = 0._wp
-      src_calving_hflx(:,:) = 0._wp
-
+!$OMP PARALLEL DO schedule(static) private(jj, ji)
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            src_calving     (ji,jj) = 0._wp
+            src_calving_hflx(ji,jj) = 0._wp
+         END DO
+      END DO
       ! assign each new iceberg with a unique number constructed from the processor number
       ! and incremented by the total number of processors
@@ -236 +252 @@
          IF( ivar > 0 ) THEN
             CALL iom_get  ( inum, jpdom_data, 'maxclass', src_calving )   ! read the max distribution array
-            berg_grid%maxclass(:,:) = INT( src_calving )
-            src_calving(:,:) = 0._wp
+!$OMP PARALLEL
+!$OMP DO schedule(static) private(jj, ji)
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  berg_grid%maxclass(ji,jj) = INT( src_calving(ji,jj) )
+               END DO
+            END DO
+!$OMP DO schedule(static) private(jj, ji)
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  src_calving(ji,jj) = 0._wp
+               END DO
+            END DO
+!$OMP END PARALLEL
          ENDIF
          CALL iom_close( inum )                                     ! close file