Changeset 9872


Ignore:
Timestamp:
2018-07-04T10:48:01+02:00 (2 years ago)
Author:
clem
Message:

removing the very last bits (I hope) of LIM references in the code

Location:
NEMO/trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/ICE/icestp.F90

    r9866 r9872  
    137137         !                          !==  AGRIF Parent to Child  ==! 
    138138#if defined key_agrif 
    139          !                              ! lim_nbstep ranges from 1 to the nb of child ocean steps inside one parent ice step 
    140          IF( .NOT. Agrif_Root() )       lim_nbstep = MOD( lim_nbstep, Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) + 1 
     139         !                              ! nbstep_ice ranges from 1 to the nb of child ocean steps inside one parent ice step 
     140         IF( .NOT. Agrif_Root() )       nbstep_ice = MOD( nbstep_ice, Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) + 1 
    141141         !                              ! these calls must remain here for restartability purposes 
    142142                                        CALL agrif_interp_ice( 'T' )  
  • NEMO/trunk/src/NST/agrif_ice.F90

    r9656 r9872  
    1616 
    1717   INTEGER, PUBLIC ::  u_ice_id, v_ice_id, tra_ice_id 
    18    INTEGER, PUBLIC ::  lim_nbstep = 0    ! child time position in sea-ice model 
     18   INTEGER, PUBLIC ::  nbstep_ice = 0    ! child time position in sea-ice model 
    1919 
    2020   !!---------------------------------------------------------------------- 
  • NEMO/trunk/src/NST/agrif_ice_interp.F90

    r9656 r9872  
    5757      CASE('U','V') 
    5858         IF( PRESENT( kiter ) ) THEN  ! interpolation at the child ice sub-time step (only for ice rheology) 
    59             zbeta = ( REAL(lim_nbstep) - REAL(kitermax - kiter) / REAL(kitermax) ) /  & 
     59            zbeta = ( REAL(nbstep_ice) - REAL(kitermax - kiter) / REAL(kitermax) ) /  & 
    6060               &    ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) ) 
    6161         ELSE                         ! interpolation at the child ice time step 
    62             zbeta = REAL(lim_nbstep) / ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) ) 
     62            zbeta = REAL(nbstep_ice) / ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) ) 
    6363         ENDIF 
    6464      CASE('T') 
    65             zbeta = REAL(lim_nbstep) / ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) ) 
     65            zbeta = REAL(nbstep_ice) / ( Agrif_Rhot() * REAL(Agrif_Parent(nn_fsbc)) / REAL(nn_fsbc) ) 
    6666      END SELECT 
    6767      ! 
  • NEMO/trunk/src/NST/agrif_user.F90

    r9788 r9872  
    483483      CALL ctl_stop('rhot * nn_fsbc(parent) /= N * nn_fsbc(child), therefore nn_fsbc(child) should be set to 1 or nn_fsbc(parent)') 
    484484   ENDIF 
    485    ! First Interpolations (using "after" ice subtime step => lim_nbstep=1) 
     485   ! First Interpolations (using "after" ice subtime step => nbstep_ice=1) 
    486486   !---------------------------------------------------------------------- 
    487    lim_nbstep = ( Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) ! clem: to have calledweight=1 in interp (otherwise the western border of the zoom is wrong) 
     487   nbstep_ice = ( Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) ! clem: to have calledweight=1 in interp (otherwise the western border of the zoom is wrong) 
    488488   CALL agrif_interp_ice('U') ! interpolation of ice velocities 
    489489   CALL agrif_interp_ice('V') ! interpolation of ice velocities 
    490490   CALL agrif_interp_ice('T') ! interpolation of ice tracers  
    491    lim_nbstep = 0 
     491   nbstep_ice = 0 
    492492    
    493493   ! 
  • NEMO/trunk/src/OCE/SBC/sbccpl.F90

    r9767 r9872  
    13521352      IF( srcv(jpr_ocx1)%laction ) THEN                      ! received by sas in case of opa <-> sas coupling 
    13531353         ssu_m(:,:) = frcv(jpr_ocx1)%z3(:,:,1) 
    1354          ub (:,:,1) = ssu_m(:,:)                             ! will be used in icestp in the call of lim_sbc_tau 
     1354         ub (:,:,1) = ssu_m(:,:)                             ! will be used in icestp in the call of ice_forcing_tau 
    13551355         un (:,:,1) = ssu_m(:,:)                             ! will be used in sbc_cpl_snd if atmosphere coupling 
    13561356         CALL iom_put( 'ssu_m', ssu_m ) 
     
    13581358      IF( srcv(jpr_ocy1)%laction ) THEN 
    13591359         ssv_m(:,:) = frcv(jpr_ocy1)%z3(:,:,1) 
    1360          vb (:,:,1) = ssv_m(:,:)                             ! will be used in icestp in the call of lim_sbc_tau 
     1360         vb (:,:,1) = ssv_m(:,:)                             ! will be used in icestp in the call of ice_forcing_tau 
    13611361         vn (:,:,1) = ssv_m(:,:)                             ! will be used in sbc_cpl_snd if atmosphere coupling 
    13621362         CALL iom_put( 'ssv_m', ssv_m ) 
Note: See TracChangeset for help on using the changeset viewer.