Changeset 11581 for NEMO/branches

Timestamp:

2019-09-20T11:40:13+02:00 (5 years ago)

Author:

dancopsey

Message:

Create nn_iceini_file=2 option that loads sea ice restart file.

Location:

NEMO/branches/UKMO/NEMO_4.0_init_ice/src/ICE

Files:

• iceistate.F90 (modified) (5 diffs)
• icestp.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0_init_ice/src/ICE/iceistate.F90

@@ -48 +48 @@
    !                             !! ** namelist (namini) **
    LOGICAL  ::   ln_iceini        ! initialization or not
-   LOGICAL  ::   ln_iceini_file   ! Ice initialization state from 2D netcdf file
+   INTEGER  ::   nn_iceini_file   ! Ice initialization:
+                                  !        0 = Initialise sea ice based on SSTs
+                                  !        1 = Initialise sea ice from single category netcdf file
+                                  !        2 = Initialise sea ice from multi category restart file
    REAL(wp) ::   rn_thres_sst     ! threshold water temperature for initial sea ice
    REAL(wp) ::   rn_hts_ini_n     ! initial snow thickness in the north
@@ -125 +128 @@
          !
          !                             !---------------!
-         IF( ln_iceini_file )THEN      ! Read a file   !
+         IF( nn_iceini_file == 1 )THEN      ! Read a file   !
             !                          !---------------!
             !
@@ -512 +515 @@
       TYPE(FLD_N), DIMENSION(jpfldi) ::   slf_i                 ! array of namelist informations on the fields to read
       !
-      NAMELIST/namini/ ln_iceini, ln_iceini_file, rn_thres_sst, rn_hts_ini_n, rn_hts_ini_s,  &
+      NAMELIST/namini/ ln_iceini, nn_iceini_file, rn_thres_sst, rn_hts_ini_n, rn_hts_ini_s,  &
          &             rn_hti_ini_n, rn_hti_ini_s, rn_ati_ini_n, rn_ati_ini_s, rn_smi_ini_n, &
          &             rn_smi_ini_s, rn_tmi_ini_n, rn_tmi_ini_s,                             &
@@ -536 +539 @@
          WRITE(numout,*) '   Namelist namini:'
          WRITE(numout,*) '      initialization with ice (T) or not (F)                 ln_iceini       = ', ln_iceini
-         WRITE(numout,*) '      ice initialization from a netcdf file                  ln_iceini_file  = ', ln_iceini_file
+         WRITE(numout,*) '      ice initialization from a netcdf file                  nn_iceini_file  = ', nn_iceini_file
          WRITE(numout,*) '      max delta ocean temp. above Tfreeze with initial ice   rn_thres_sst    = ', rn_thres_sst
          WRITE(numout,*) '      initial snow thickness in the north                    rn_hts_ini_n    = ', rn_hts_ini_n
@@ -550 +553 @@
       ENDIF
       !
-      IF( ln_iceini_file ) THEN                      ! Ice initialization using input file
+      IF( nn_iceini_file == 1 ) THEN                      ! Ice initialization using input file
          !
          ! set si structure

NEMO/branches/UKMO/NEMO_4.0_init_ice/src/ICE/icestp.F90

@@ -252 +252 @@
       !
       !                                ! Initial sea-ice state
-      IF( .NOT. ln_rstart ) THEN              ! start from rest: sea-ice deduced from sst
+      IF( .NOT. ln_rstart .AND. nn_iceini_file /= 2 ) THEN              ! start from rest: sea-ice deduced from sst
          CALL ice_istate_init
          CALL ice_istate