Changeset 13159 for NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement/src/ICE/iceistate.F90

Timestamp:

2020-06-26T10:26:32+02:00 (4 years ago)

Author:

gsamson

Message:

merge trunk@r13136 into ASINTER-06 branch; pass all SETTE tests; results identical to trunk@r13136; ticket #2419

Location:

NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement

Files:

• . (modified) (1 prop)
• src/ICE/iceistate.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@12931        sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@12931        sette

NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement/src/ICE/iceistate.F90

@@ -179 +179 @@
             !
             ! -- mandatory fields -- !
-            zht_i_ini(:,:) = si(jp_hti)%fnow(:,:,1)
-            zht_s_ini(:,:) = si(jp_hts)%fnow(:,:,1)
-            zat_i_ini(:,:) = si(jp_ati)%fnow(:,:,1)
+            zht_i_ini(:,:) = si(jp_hti)%fnow(:,:,1) * tmask(:,:,1)
+            zht_s_ini(:,:) = si(jp_hts)%fnow(:,:,1) * tmask(:,:,1)
+            zat_i_ini(:,:) = si(jp_ati)%fnow(:,:,1) * tmask(:,:,1)
 
             ! -- optional fields -- !
@@ -219 +219 @@
                &     si(jp_hpd)%fnow(:,:,1) = ( rn_hpd_ini_n * zswitch + rn_hpd_ini_s * (1._wp - zswitch) ) * tmask(:,:,1)
             !
-            zsm_i_ini(:,:) = si(jp_smi)%fnow(:,:,1)
-            ztm_i_ini(:,:) = si(jp_tmi)%fnow(:,:,1)
-            zt_su_ini(:,:) = si(jp_tsu)%fnow(:,:,1)
-            ztm_s_ini(:,:) = si(jp_tms)%fnow(:,:,1)
-            zapnd_ini(:,:) = si(jp_apd)%fnow(:,:,1)
-            zhpnd_ini(:,:) = si(jp_hpd)%fnow(:,:,1)
+            zsm_i_ini(:,:) = si(jp_smi)%fnow(:,:,1) * tmask(:,:,1)
+            ztm_i_ini(:,:) = si(jp_tmi)%fnow(:,:,1) * tmask(:,:,1)
+            zt_su_ini(:,:) = si(jp_tsu)%fnow(:,:,1) * tmask(:,:,1)
+            ztm_s_ini(:,:) = si(jp_tms)%fnow(:,:,1) * tmask(:,:,1)
+            zapnd_ini(:,:) = si(jp_apd)%fnow(:,:,1) * tmask(:,:,1)
+            zhpnd_ini(:,:) = si(jp_hpd)%fnow(:,:,1) * tmask(:,:,1)
             !
             ! change the switch for the following
@@ -436 +436 @@
 !!clem: output of initial state should be written here but it is impossible because
 !!      the ocean and ice are in the same file
-!!      CALL dia_wri_state( 'output.init' )
+!!      CALL dia_wri_state( Kmm, 'output.init' )
       !
    END SUBROUTINE ice_istate

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@HEAD         sette
+^/utils/CI/sette@12931        sette