Changeset 12747 for NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/src/OCE/DYN/dynnxt.F90

Timestamp:

2020-04-15T13:57:58+02:00 (4 years ago)

Author:

mathiot

Message:

NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo: fix compilation issue

Location:

NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo

Files:

• . (modified) (1 prop)
• src/OCE/DYN/dynnxt.F90 (modified) (5 diffs)

NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo

@@ -6 +6 @@
 ^/vendors/FCM@10134           ext/FCM
 ^/vendors/IOIPSL@9655         ext/IOIPSL
+^/utils/CI/sette@12135        sette

@@ -6 +6 @@
 ^/vendors/FCM@10134           ext/FCM
 ^/vendors/IOIPSL@9655         ext/IOIPSL
+^/utils/CI/sette@12135        sette

NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/src/OCE/DYN/dynnxt.F90

@@ -29 +29 @@
    USE sbc_oce        ! Surface boundary condition: ocean fields
    USE sbcrnf         ! river runoffs
-   USE sbcisf         ! ice shelf
    USE phycst         ! physical constants
    USE dynadv         ! dynamics: vector invariant versus flux form
@@ -35 +34 @@
    USE domvvl         ! variable volume
    USE bdy_oce   , ONLY: ln_bdy
+   USE isf_oce        ! ice shelf
    USE bdydta         ! ocean open boundary conditions
    USE bdydyn         ! ocean open boundary conditions
@@ -98 +98 @@
       REAL(wp) ::   zue3a, zue3n, zue3b, zuf, zcoef    ! local scalars
       REAL(wp) ::   zve3a, zve3n, zve3b, zvf, z1_2dt   !   -      -
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:)   ::   zue, zve
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:)   ::   zue, zve, zfwf
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   ze3u_f, ze3v_f, zua, zva 
       !!----------------------------------------------------------------------
       !
       IF( ln_timing    )   CALL timing_start('dyn_nxt')
-      IF( ln_dynspg_ts )   ALLOCATE( zue(jpi,jpj)     , zve(jpi,jpj)     )
+      IF( ln_dynspg_ts )   ALLOCATE( zue(jpi,jpj)     , zve(jpi,jpj)    , zfwf(jpi,jpj))
       IF( l_trddyn     )   ALLOCATE( zua(jpi,jpj,jpk) , zva(jpi,jpj,jpk) )
       !
@@ -237 +237 @@
             ENDIF
 
-            IF ( ln_isf ) THEN
-               DO jk = 1, jpkm1
-                  e3t_b(:,:,jk) = e3t_b(:,:,jk) - zcoef * ( fwfisf_b(:,:) - fwfisf(:,:) ) * tmask(:,:,jk) & 
-                                &                       * e3t_n(:,:,jk) /  ( ht_n(:,:) + 1._wp - ssmask(:,:) )
-               END DO
-            ENDIF
+            IF ( ln_isf ) THEN 
+               IF ( ln_isfpar_mlt ) THEN
+                  DO jk = 1, jpkm1
+                     e3t_b(:,:,jk) = e3t_b(:,:,jk) - zcoef * ( fwfisf_cav_b(:,:) - fwfisf_cav(:,:) ) * tmask(:,:,jk) & 
+                                   &                       * e3t_n(:,:,jk) /  ( ht_n(:,:) + 1._wp - ssmask(:,:) )
+                  END DO
+               END IF
+               IF ( ln_isfpar_mlt ) THEN
+                  DO jk = 1, jpkm1
+                     e3t_b(:,:,jk) = e3t_b(:,:,jk) - zcoef * ( fwfisf_par_b(:,:) - fwfisf_par(:,:) ) * tmask(:,:,jk) & 
+                                   &                       * e3t_n(:,:,jk) /  ( ht_n(:,:) + 1._wp - ssmask(:,:) )
+                  END DO
+               END IF
+               IF ( ln_isfcpl .AND. ln_rstart .AND. kt == nit000+1 ) THEN
+                  ! risfcpl_vol in m3/s
+                  zfwf(:,:) = SUM(risfcpl_vol,DIM=3)
+                  DO jk = 1, jpkm1
+                     e3t_b(:,:,jk) =   e3t_b(:,:,jk) - zcoef * zfwf(:,:) * r1_e1e2t(:,:) * r1_rau0 * tmask(:,:,jk) &
+                                   &                         * e3t_n(:,:,jk) / ( ht_n(:,:) + 1._wp - ssmask(:,:) )
+                  END DO
+               END IF
+            END IF
             !
             IF( ln_dynadv_vec ) THEN      ! Asselin filter applied on velocity
@@ -357 +373 @@
          &                       tab3d_2=vn, clinfo2=' Vn: '       , mask2=vmask )
       ! 
-      IF( ln_dynspg_ts )   DEALLOCATE( zue, zve )
+      IF( ln_dynspg_ts )   DEALLOCATE( zue, zve, zfwf )
       IF( l_trddyn     )   DEALLOCATE( zua, zva )
       IF( ln_timing    )   CALL timing_stop('dyn_nxt')

@@ -6 +6 @@
 ^/vendors/FCM@10134           ext/FCM
 ^/vendors/IOIPSL@9655         ext/IOIPSL
+^/utils/CI/sette@12135        sette