Changeset 13553 for NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/SAS/nemogcm.F90

Timestamp:

2020-10-01T13:33:30+02:00 (4 years ago)

Author:

hadcv

Message:

Merge in trunk up to [13550]

File:

• NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/SAS/nemogcm.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/SAS/nemogcm.F90

@@ -355 +355 @@
       !
       !                                      ! General initialization
-      IF( ln_timing    )   CALL timing_init     ! timing
+      IF( ln_timing    )   CALL timing_init ( 'timing_sas.output' )
       IF( ln_timing    )   CALL timing_start( 'nemo_init')
 
@@ -371 +371 @@
 
       !                                      ! external forcing 
+#if defined key_agrif
+      uu(:,:,:,:) = 0.0_wp   ;   vv(:,:,:,:) = 0.0_wp   ;   ts(:,:,:,:,:) = 0.0_wp   ! needed for interp done at initialization phase
+#endif 
                            CALL sbc_init( Nbb, Nnn, Naa )  ! Forcings : surface module 
 
@@ -480 +483 @@
       ierr =        dia_wri_alloc()
       ierr = ierr + dom_oce_alloc()          ! ocean domain
-      ierr = ierr + oce_alloc    ()          ! (tsn...) needed for agrif and/or SI3 and bdy
+      ierr = ierr + oce_alloc    ()          ! (ts...) needed for agrif and/or SI3 and bdy
       ierr = ierr + bdy_oce_alloc()          ! bdy masks (incl. initialization)
       !