Changeset 13449

Timestamp:

2020-09-03T16:40:10+02:00 (4 years ago)

Author:

gsamson

Message:

add sst_m & sss_m init in ice_rst_read when using SAS + simplified ice restart; ticket #2518

File:

• NEMO/releases/r4.0/r4.0-HEAD/src/ICE/icerst.F90 (modified) (3 diffs)

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

@@ -18 +18 @@
    USE phycst  , ONLY : rt0
    USE sbc_oce , ONLY : nn_fsbc, ln_cpl
+   USE sbc_oce , ONLY : nn_components, jp_iam_sas   ! SAS ss[st]_m init
+   USE sbc_oce , ONLY : sst_m, sss_m                ! SAS ss[st]_m init
+   USE oce     , ONLY : tsn                         ! SAS ss[st]_m init
+   USE eosbn2  , ONLY : l_useCT, eos_pt_from_ct     ! SAS ss[st]_m init
    USE iceistate      ! sea-ice: initial state
    USE icectl         ! sea-ice: control
@@ -280 +284 @@
          CALL ctl_warn('ice_rst_read: you are attempting to use an unsuitable ice restart')
          !
-         IF( .NOT. ln_iceini ) THEN
+         IF( .NOT. ln_iceini .OR. nn_iceini_file == 2 ) THEN
             CALL ctl_stop('STOP', 'ice_rst_read: you need ln_ice_ini=T and nn_iceini_file=0 or 1')
          ELSE
@@ -286 +290 @@
          ENDIF
          !
+         IF( nn_components == jp_iam_sas ) THEN   ! SAS case: ss[st]_m were not initialized by sbc_ssm_init
+            !
+            IF(lwp) WRITE(numout,*) '  SAS: default initialisation of ss[st]_m arrays used in ice_istate'
+            IF( l_useCT )  THEN    ;   sst_m(:,:) = eos_pt_from_ct( tsn(:,:,1,jp_tem), tsn(:,:,1,jp_sal) )
+            ELSE                   ;   sst_m(:,:) = tsn(:,:,1,jp_tem)
+            ENDIF
+            sss_m(:,:) = tsn(:,:,1,jp_sal)
+         ENDIF
+         !
          CALL ice_istate( nit000 )
          !