Changeset 14901 for NEMO/branches/2021

Timestamp:

2021-05-25T23:02:44+02:00 (3 years ago)

Author:

smueller

Message:

Supplement to changeset [14900] that accomplishes the enabling of the tiling option in the OSMOSIS boundary-layer scheme implementation (ticket #2353)

File:

• NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/OCE/ZDF/zdfosm.F90 (modified) (4 diffs)

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/OCE/ZDF/zdfosm.F90

@@ -655 +655 @@
       jk_ext(:,:) = nbld(A2D((nn_hls-1))) - nmld(A2D((nn_hls-1))) + jk_ext(:,:) + 1   ! ag 19/03
       CALL zdf_osm_vertical_average( Kbb,                       Kmm,                         &
-         &                           nmld - 1,                  av_t_ml(A2D((nn_hls-1))),    &
+         &                           nmld(A2D((nn_hls-1))) - 1, av_t_ml(A2D((nn_hls-1))),    &
          &                           av_s_ml(A2D((nn_hls-1))),  av_b_ml(A2D((nn_hls-1))),    &
          &                           av_u_ml(A2D((nn_hls-1))),  av_v_ml(A2D((nn_hls-1))),    &
@@ -950 +950 @@
             CALL zdf_osm_iomput( "wmp_NP", ( 2.0_wp * rpi * 1.026_wp / ( 0.877_wp * grav ) ) *   &   ! Wave mean period from NP
                &                           wndm(A2D(0)) * tmask(A2D(0),1) )                          !    spectrum
-            CALL zdf_osm_iomput( "hsw_NP", ( 0.22_wp / grav ) * wndm**2 * tmask(A2D(0),1) )          ! Significant wave height from
+            CALL zdf_osm_iomput( "hsw_NP", ( 0.22_wp / grav ) * wndm(A2D(0))**2 * tmask(A2D(0),1) )  ! Significant wave height from
             !                                                                                        !    NP spectrum
             CALL zdf_osm_iomput( "wndm",   wndm(A2D(0)) * tmask(A2D(0),1) )                          ! U_10
@@ -2370 +2370 @@
       !
       IF ( ln_dia_osm ) THEN
-         CALL iom_put( "zwth_ent", tmask(A2D(0),1) * zwth_ent(A2D(0)) )   ! Upward turb. temperature entrainment flux
-         CALL iom_put( "zws_ent",  tmask(A2D(0),1) * zws_ent(A2D(0))  )   ! Upward turb. salinity entrainment flux
+         CALL zdf_osm_iomput( "zwth_ent", tmask(A2D(0),1) * zwth_ent(A2D(0)) )   ! Upward turb. temperature entrainment flux
+         CALL zdf_osm_iomput( "zws_ent",  tmask(A2D(0),1) * zws_ent(A2D(0))  )   ! Upward turb. salinity entrainment flux
       END IF
       !
@@ -2432 +2432 @@
       !
       IF ( ln_dia_osm ) THEN
-         CALL iom_put( "ghamu_0",    wmask(A2D(0),:) * ghamu(A2D(0),:)  )
-         CALL iom_put( "zsc_uw_1_0", tmask(A2D(0),1) * zsc_uw_1(A2D(0)) )
+         CALL zdf_osm_iomput( "ghamu_0",    wmask(A2D(0),:) * ghamu(A2D(0),:)  )
+         CALL zdf_osm_iomput( "zsc_uw_1_0", tmask(A2D(0),1) * zsc_uw_1(A2D(0)) )
       END IF
       !