Ignore:
Timestamp:
2019-05-20T10:27:28+02:00 (22 months ago)
Author:
davestorkey
Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : ICE changes. Passess non-AGRIF sette tests apart from ORCA2_SAS_ICE which doesn't seem to work for me at the moment.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/ICE/icestp.F90

    r10535 r10998  
    9595CONTAINS 
    9696 
    97    SUBROUTINE ice_stp( kt, ksbc ) 
     97   SUBROUTINE ice_stp( kt, Kbb, ksbc ) 
    9898      !!--------------------------------------------------------------------- 
    9999      !!                  ***  ROUTINE ice_stp  *** 
     
    115115      !!                utau, vtau, taum, wndm, qns , qsr, emp , sfx 
    116116      !!--------------------------------------------------------------------- 
    117       INTEGER, INTENT(in) ::   kt      ! ocean time step 
    118       INTEGER, INTENT(in) ::   ksbc    ! flux formulation (user defined, bulk, or Pure Coupled) 
     117      INTEGER, INTENT(in) ::   kt     ! ocean time step 
     118      INTEGER, INTENT(in) ::   Kbb    ! ocean time level index 
     119      INTEGER, INTENT(in) ::   ksbc   ! flux formulation (user defined, bulk, or Pure Coupled) 
    119120      ! 
    120121      INTEGER ::   jl   ! dummy loop index 
     
    209210      ! --- Ocean time step --- ! 
    210211      !-------------------------! 
    211       IF( ln_icedyn )                   CALL ice_update_tau( kt, ub(:,:,1), vb(:,:,1) )   ! -- update surface ocean stresses 
     212      IF( ln_icedyn )                   CALL ice_update_tau( kt, uu(:,:,1,Kbb), vv(:,:,1,Kbb) )   ! -- update surface ocean stresses 
    212213!!gm   remark, the ocean-ice stress is not saved in ice diag call above .....  find a solution!!! 
    213214      ! 
     
    217218 
    218219 
    219    SUBROUTINE ice_init 
     220   SUBROUTINE ice_init( Kbb, Kmm, Kaa ) 
    220221      !!---------------------------------------------------------------------- 
    221222      !!                  ***  ROUTINE ice_init  *** 
     
    223224      !! ** purpose :   Initialize sea-ice parameters 
    224225      !!---------------------------------------------------------------------- 
     226      INTEGER, INTENT(in) :: Kbb, Kmm, Kaa 
     227      ! 
    225228      INTEGER :: ji, jj, ierr 
    226229      !!---------------------------------------------------------------------- 
     
    254257      IF( .NOT. ln_rstart ) THEN              ! start from rest: sea-ice deduced from sst 
    255258         CALL ice_istate_init 
    256          CALL ice_istate 
     259         CALL ice_istate( Kbb, Kmm, Kaa ) 
    257260      ELSE                                    ! start from a restart file 
    258261         CALL ice_rst_read 
Note: See TracChangeset for help on using the changeset viewer.