Changeset 8577


Ignore:
Timestamp:
2017-10-02T12:05:28+02:00 (3 years ago)
Author:
clem
Message:

bug fixes to start passing all the magnificient sette tests

Location:
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90

    r7753 r8577  
    236236      ENDIF 
    237237      ! 
    238       IF( .NOT. l_ssm_mean ) THEN   ! default initialisation. needed by lim_istate 
     238      IF( .NOT. l_ssm_mean ) THEN   ! default initialisation. needed by iceistate 
    239239         ! 
    240240         IF(lwp) WRITE(numout,*) '   default initialisation of ss._m arrays' 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/step.F90

    r7753 r8577  
    6161      !!                     ***  ROUTINE stp  *** 
    6262      !! 
    63       !! ** Purpose : - Time stepping of OPA (momentum and active tracer eqs.) 
    64       !!              - Time stepping of LIM (dynamic and thermodynamic eqs.) 
    65       !!              - Tme stepping  of TRC (passive tracer eqs.) 
     63      !! ** Purpose : - Time stepping of OPA  (momentum and active tracer eqs.) 
     64      !!              - Time stepping of ESIM (dynamic and thermodynamic eqs.) 
     65      !!              - Time stepping of TRC (passive tracer eqs.) 
    6666      !! 
    6767      !! ** Method  : -1- Update forcings and data 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/SAS_SRC/diawri.F90

    r8316 r8577  
    3939   USE ioipsl 
    4040#if defined key_lim3 
    41    USE limwri 
     41   USE icewri 
    4242#endif 
    4343   USE lib_mpp         ! MPP library 
     
    397397#if defined key_lim3 
    398398      IF( nn_ice == 2 ) THEN   ! clem2017: condition in case agrif + lim but no-ice in child grid 
    399          CALL lim_wri_state( kt, id_i, nh_i ) 
     399         CALL ice_wri_state( kt, id_i, nh_i ) 
    400400      ENDIF 
    401401#else 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

    r8306 r8577  
    510510      ierr =        dia_wri_alloc   () 
    511511      ierr = ierr + dom_oce_alloc   ()          ! ocean domain 
    512       ierr = ierr + oce_alloc       ()          ! (tsn...) needed for agrif and/or lim3 and bdy 
     512      ierr = ierr + oce_alloc       ()          ! (tsn...) needed for agrif and/or ESIM and bdy 
    513513      ierr = ierr + bdy_oce_alloc   ()          ! bdy masks (incl. initialization) 
    514514      ! 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90

    r8291 r8577  
    313313   ENDIF 
    314314  
    315       CALL sbc_ssm( nit000 )   ! need to define ss?_m arrays used in limistate 
     315      CALL sbc_ssm( nit000 )   ! need to define ss?_m arrays used in iceistate 
    316316      l_initdone = .TRUE. 
    317317      ! 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/SAS_SRC/step.F90

    r7761 r8577  
    2424   USE diawri           ! Standard run outputs             (dia_wri routine) 
    2525   USE bdy_oce   , ONLY: ln_bdy 
    26    USE bdydta           ! clem: mandatory for LIM3 
     26   USE bdydta           ! clem: mandatory for ESIM 
    2727   USE stpctl           ! time stepping control            (stp_ctl routine) 
    2828   ! 
     
    8989                             CALL iom_setkt( kstp - nit000 + 1, cxios_context )   ! tell iom we are at time step kstp 
    9090 
    91       ! ==> clem: open boundaries is mandatory for LIM3 because ice BDY is not decoupled from   
     91      ! ==> clem: open boundaries is mandatory for ESIM because ice BDY is not decoupled from   
    9292      !           the environment of ocean BDY. Therefore bdy is called in both OPA and SAS modules. 
    9393      !           From SAS: ocean bdy data are wrong  (but we do not care) and ice bdy data are OK.   
Note: See TracChangeset for help on using the changeset viewer.