Changeset 10555

Timestamp:

2019-01-22T12:36:01+01:00 (6 years ago)

Author:

clem

Message:

choose to update ice velocity every sub-iteration in rheology or not (temporary logical has been added in icedyn_rhg_evp.F90). For now it has been set to false, so there is no update at each sub-iteration

Location:

NEMO/trunk/src/ICE

Files:

• icedyn_rhg_evp.F90 (modified) (6 diffs)
• icevar.F90 (modified) (1 diff)

NEMO/trunk/src/ICE/icedyn_rhg_evp.F90

@@ -112 +112 @@
       REAL(wp), DIMENSION(:,:), INTENT(  out) ::   pshear_i  , pdivu_i   , pdelta_i      !
       !!
+      LOGICAL, PARAMETER ::   ll_bdy_substep = .FALSE. ! temporary option to call bdy at each sub-time step (T)
+      !                                                                              or only at the main time step (F)
       INTEGER ::   ji, jj       ! dummy loop indices
       INTEGER ::   jter         ! local integers
@@ -535 +537 @@
             CALL agrif_interp_ice( 'V' )
 #endif
-            IF( ln_bdy ) CALL bdy_ice_dyn( 'V' )
+            IF( ln_bdy .AND. ll_bdy_substep ) CALL bdy_ice_dyn( 'V' )
             !
             DO jj = 2, jpjm1
@@ -583 +585 @@
             CALL agrif_interp_ice( 'U' )
 #endif
-            IF( ln_bdy ) CALL bdy_ice_dyn( 'U' )
+            IF( ln_bdy .AND. ll_bdy_substep ) CALL bdy_ice_dyn( 'U' )
             !
          ELSE ! odd iterations
@@ -633 +635 @@
             CALL agrif_interp_ice( 'U' )
 #endif
-            IF( ln_bdy ) CALL bdy_ice_dyn( 'U' )
+            IF( ln_bdy .AND. ll_bdy_substep ) CALL bdy_ice_dyn( 'U' )
             !
             DO jj = 2, jpjm1
@@ -681 +683 @@
             CALL agrif_interp_ice( 'V' )
 #endif
-            IF( ln_bdy ) CALL bdy_ice_dyn( 'V' )
+            IF( ln_bdy .AND. ll_bdy_substep ) CALL bdy_ice_dyn( 'V' )
             !
          ENDIF
@@ -696 +698 @@
       END DO                                              !  end loop over jter  !
       !                                                   ! ==================== !
+      !
+      IF( ln_bdy .AND. .NOT.ll_bdy_substep ) THEN
+         CALL bdy_ice_dyn( 'U' )
+         CALL bdy_ice_dyn( 'V' )
+      ENDIF
       !
       !------------------------------------------------------------------------------!

NEMO/trunk/src/ICE/icevar.F90

@@ -567 +567 @@
                DO ji = 1 , jpi
                   IF( pe_i(ji,jj,jk,jl) < 0._wp .OR. pa_i(ji,jj,jl) < 0._wp ) THEN
-                     hfx_res(ji,jj)   = hfx_res(ji,jj) - pe_i(ji,jj,jk,jl) * r1_rdtice ! W.m-2 <0
+                     hfx_res(ji,jj)   = hfx_res(ji,jj) - pe_i(ji,jj,jk,jl) * r1_rdtice ! W.m-2 >0
                      pe_i(ji,jj,jk,jl) = 0._wp
                   ENDIF