Changeset 9104 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90

Timestamp:

2017-12-15T18:56:13+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: ZDF: timing + lnk_multi + namelist cfg ctl

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90 (modified) (3 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90

@@ -1280 +1280 @@
          END DO
      END DO
-
-
-     CALL lbc_lnk( p_avt, 'W', 1. )                      ! Lateral boundary conditions on p_avt  (sign unchanged)
-     CALL lbc_lnk( p_avm, 'W', 1. )                      ! Lateral boundary conditions on p_avm  (sign unchanged)
-
       ! Lateral boundary conditions on ghamu and ghamv, currently on W-grid  (sign unchanged), needed to caclulate gham[uv] on u and v grids
-      CALL lbc_lnk( ghamu(:,:,:), 'W', 1. )
-      CALL lbc_lnk( ghamv(:,:,:), 'W', 1. )
+     CALL lbc_lnk_multi( p_avt, 'W', 1. , p_avm, 'W', 1.   &
+      &                  ghamu, 'W', 1. , ghamv, 'W', 1. )
        DO jk = 2, jpkm1
            DO jj = 2, jpjm1
@@ -1303 +1298 @@
         END DO
         ! Lateral boundary conditions on final outputs for gham[ts],  on W-grid  (sign unchanged)
-       CALL lbc_lnk( ghamt(:,:,:), 'W', 1. )
-       CALL lbc_lnk( ghams(:,:,:), 'W', 1. )
-      ! Lateral boundary conditions on final outputs for gham[uv],  on [UV]-grid  (sign unchanged)
-       CALL lbc_lnk( ghamu(:,:,:), 'U', 1. )
-       CALL lbc_lnk( ghamv(:,:,:), 'V', 1. )
+        ! Lateral boundary conditions on final outputs for gham[uv],  on [UV]-grid  (sign unchanged)
+        CALL lbc_lnk_multi( ghamt, 'W', 1. , ghams, 'W', 1.   &
+         &                  ghamu, 'U', 1. , ghamv, 'V', 1. )
 
        IF(ln_dia_osm) THEN
@@ -1374 +1367 @@
      REWIND( numnam_ref )              ! Namelist namzdf_osm in reference namelist : Osmosis ML model
      READ  ( numnam_ref, namzdf_osm, IOSTAT = ios, ERR = 901)
-901    IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_osm in reference namelist', lwp )
+901  IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_osm in reference namelist', lwp )
 
      REWIND( numnam_cfg )              ! Namelist namzdf_tke in configuration namelist : Turbulent Kinetic Energy
      READ  ( numnam_cfg, namzdf_osm, IOSTAT = ios, ERR = 902 )
-902    IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_osm in configuration namelist', lwp )
+902  IF( ios >  0 ) CALL ctl_nam ( ios , 'namzdf_osm in configuration namelist', lwp )
      IF(lwm) WRITE ( numond, namzdf_osm )