Changeset 15548 for NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/ICE/icedyn_rdgrft.F90

Timestamp:

2021-11-28T18:59:49+01:00 (3 years ago)

Author:

gsamson

Message:

update branch to the head of the trunk (r15547); ticket #2632

Location:

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

Files:

• . (modified) (1 prop)
• src/ICE/icedyn_rdgrft.F90 (modified) (10 diffs)

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/ticket2632_r14588_theta_sbcblk/src/ICE/icedyn_rdgrft.F90

@@ -57 +57 @@
    !
    ! ** namelist (namdyn_rdgrft) **
-   LOGICAL  ::   ln_str_H79       ! ice strength parameterization (Hibler79)
-   REAL(wp) ::   rn_pstar         ! determines ice strength, Hibler JPO79
    REAL(wp) ::   rn_csrdg         ! fraction of shearing energy contributing to ridging
    LOGICAL  ::   ln_partf_lin     ! participation function linear (Thorndike et al. (1975))
@@ -162 +160 @@
       npti = 0   ;   nptidx(:) = 0
       ipti = 0   ;   iptidx(:) = 0
-      DO_2D( 1, 1, 1, 1 )
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
          IF ( at_i(ji,jj) > epsi10 ) THEN
             npti           = npti + 1
@@ -272 +270 @@
 
       ! controls
-      IF( sn_cfctl%l_prtctl )   CALL ice_prt3D   ('icedyn_rdgrft')                                                        ! prints
+      IF( sn_cfctl%l_prtctl )   CALL ice_prt3D('icedyn_rdgrft')                                                           ! prints
       IF( ln_icectl    )   CALL ice_prt     (kt, iiceprt, jiceprt,-1, ' - ice dyn rdgrft - ')                             ! prints
       IF( ln_icediachk )   CALL ice_cons_hsm(1, 'icedyn_rdgrft', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation
@@ -520 +518 @@
       !
       INTEGER , DIMENSION(jpij) ::   itest_rdg, itest_rft   ! test for conservation
+      LOGICAL , DIMENSION(jpij) ::   ll_shift         ! logical for doing calculation or not
       !!-------------------------------------------------------------------
       !
@@ -540 +539 @@
          DO ji = 1, npti
 
-            IF( apartf(ji,jl1) > 0._wp .AND. closing_gross(ji) > 0._wp ) THEN   ! only if ice is ridging
+            ! set logical to true when ridging
+            IF( apartf(ji,jl1) > 0._wp .AND. closing_gross(ji) > 0._wp ) THEN   ;   ll_shift(ji) = .TRUE.
+            ELSE                                                                ;   ll_shift(ji) = .FALSE.
+            ENDIF
+            
+            IF( ll_shift(ji) ) THEN   ! only if ice is ridging
 
                IF( a_i_2d(ji,jl1) > epsi10 ) THEN   ;   z1_ai(ji) = 1._wp / a_i_2d(ji,jl1)
@@ -630 +634 @@
          DO jk = 1, nlay_s
             DO ji = 1, npti
-               IF( apartf(ji,jl1) > 0._wp .AND. closing_gross(ji) > 0._wp ) THEN
+               IF( ll_shift(ji) ) THEN
                   ! Compute ridging /rafting fractions
                   afrdg = aridge(ji,jl1) * closing_gross(ji) * rDt_ice * z1_ai(ji)
@@ -651 +655 @@
          DO jk = 1, nlay_i
             DO ji = 1, npti
-               IF( apartf(ji,jl1) > 0._wp .AND. closing_gross(ji) > 0._wp ) THEN
+               IF( ll_shift(ji) ) THEN
                   ! Compute ridging /rafting fractions
                   afrdg = aridge(ji,jl1) * closing_gross(ji) * rDt_ice * z1_ai(ji)
@@ -674 +678 @@
             DO ji = 1, npti
 
-               IF( apartf(ji,jl1) > 0._wp .AND. closing_gross(ji) > 0._wp ) THEN
+               IF( ll_shift(ji) ) THEN
 
                   ! Compute the fraction of ridged ice area and volume going to thickness category jl2
@@ -731 +735 @@
             DO jk = 1, nlay_s
                DO ji = 1, npti
-                  IF( apartf(ji,jl1) > 0._wp .AND. closing_gross(ji) > 0._wp )   &
+                  IF( ll_shift(ji) )   &
                      &   ze_s_2d(ji,jk,jl2) = ze_s_2d(ji,jk,jl2) + ( esrdg(ji,jk) * rn_fsnwrdg * fvol(ji)  +  &
                      &                                               esrft(ji,jk) * rn_fsnwrft * zswitch(ji) )
@@ -740 +744 @@
             DO jk = 1, nlay_i
                DO ji = 1, npti
-                  IF( apartf(ji,jl1) > 0._wp .AND. closing_gross(ji) > 0._wp )   &
+                  IF( ll_shift(ji) )   &
                      &   ze_i_2d(ji,jk,jl2) = ze_i_2d(ji,jk,jl2) + eirdg(ji,jk) * fvol(ji) + eirft(ji,jk) * zswitch(ji)
                END DO

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+