Changeset 14588

Timestamp:

2021-03-05T08:42:07+01:00 (3 years ago)

Author:

clem

Message:

solve ticket #2562

Location:

NEMO/releases/r4.0/r4.0-HEAD/src

Files:

• ICE/icewri.F90 (modified) (2 diffs)
• OCE/DYN/dynvor.F90 (modified) (3 diffs)
• OCE/SBC/sbcwave.F90 (modified) (1 diff)
• TOP/PISCES/P4Z/p4zsed.F90 (modified) (1 diff)
• TOP/trc.F90 (modified) (1 diff)

NEMO/releases/r4.0/r4.0-HEAD/src/ICE/icewri.F90

@@ -253 +253 @@
       CALL iom_rstput( 0, 0, kid, 'sisali', sm_i         )   ! Ice salinity
       CALL iom_rstput( 0, 0, kid, 'sivolu', vt_i         )   ! Ice volume
-      CALL iom_rstput( 0, 0, kid, 'sidive', divu_i*1.0e8 )   ! Ice divergence
       CALL iom_rstput( 0, 0, kid, 'si_amp', at_ip        )   ! Melt pond fraction
       CALL iom_rstput( 0, 0, kid, 'si_vmp', vt_ip        )   ! Melt pond volume
@@ -260 +259 @@
       CALL iom_rstput( 0, 0, kid, 'sisalcat', s_i        )   ! Ice salinity
       CALL iom_rstput( 0, 0, kid, 'snthicat', h_s        )   ! Snw thickness
+      IF( ln_icedyn ) THEN
+         CALL iom_rstput( 0, 0, kid, 'sidive', divu_i*1.e8 ) ! Ice divergence
+      ENDIF
 
     END SUBROUTINE ice_wri_state

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/DYN/dynvor.F90

@@ -222 +222 @@
       ENDIF
       !
+      zwz(:,:,jpk) = 0._wp
       !
       SELECT CASE( kvor )                 !==  volume weighted vorticity considered  ==!
@@ -349 +350 @@
       INTEGER  ::   ji, jj, jk           ! dummy loop indices
       REAL(wp) ::   zx1, zy1, zx2, zy2   ! local scalars
-      REAL(wp), DIMENSION(jpi,jpj) ::   zwx, zwy, zwz   ! 2D workspace
+      REAL(wp), DIMENSION(jpi,jpj) ::   zwx, zwy, zwz   ! 1D workspace
       !!----------------------------------------------------------------------
       !
@@ -731 +732 @@
       ENDIF
       !
+      zwz(:,:,jpk) = 0._wp
       !                                                ! ===============
       DO jk = 1, jpkm1                                 ! Horizontal slab

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC/sbcwave.F90

@@ -220 +220 @@
       !                       !==  vertical Stokes Drift 3D velocity  ==!
       !
+      ze3divh(:,:,jpk) = 0._wp
       DO jk = 1, jpkm1               ! Horizontal e3*divergence
          DO jj = 2, jpj

NEMO/releases/r4.0/r4.0-HEAD/src/TOP/PISCES/P4Z/p4zsed.F90

@@ -492 +492 @@
       IF( p4z_sed_alloc /= 0 )   CALL ctl_stop( 'STOP', 'p4z_sed_alloc: failed to allocate arrays' )
       !
+      nitrpot(:,:,jpk) = 0._wp ! initialization 
+      !
    END FUNCTION p4z_sed_alloc
 

NEMO/releases/r4.0/r4.0-HEAD/src/TOP/trc.F90

@@ -25 +25 @@
    INTEGER, PUBLIC ::   numonr     = -1   !: reference passive tracer namelist output output.namelist.top
    INTEGER, PUBLIC ::   numstr            !: tracer statistics
-   INTEGER, PUBLIC ::   numrtr            !: trc restart (read )
+   INTEGER, PUBLIC ::   numrtr     = -1   !: trc restart (read )
    INTEGER, PUBLIC ::   numrtw            !: trc restart ( write )