New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 12724 for NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/ISF/isfcav.F90 – NEMO

Ignore:
Timestamp:
2020-04-08T21:37:59+02:00 (4 years ago)
Author:
techene
Message:

branch KERNEL-06 : merge with trunk@12698 #2385 - in duplcated files : changes to comply to the new trunk variables and some loop bug fixes

Location:
NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3

    • Property svn:externals
      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 
         8 
         9# SETTE 
         10^/utils/CI/sette@HEAD         sette 
  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/ISF/isfcav.F90

    r12343 r12724  
    2424   USE oce      , ONLY: ts                              ! ocean tracers 
    2525   USE par_oce  , ONLY: jpi,jpj                         ! ocean space and time domain 
    26    USE phycst   , ONLY: grav,rau0,rau0_rcp,r1_rau0_rcp  ! physical constants 
     26   USE phycst   , ONLY: grav,rho0,rho0_rcp,r1_rho0_rcp  ! physical constants 
    2727   USE eosbn2   , ONLY: ln_teos10                       ! use ln_teos10 or not 
    2828   ! 
     
    8585      ! 
    8686      ! initialisation 
    87       IF (TRIM(cn_gammablk) == 'vel_stab' ) zqoce_b (:,:) = ptsc(:,:,jp_tem) * rau0_rcp ! last time step total heat fluxes (to speed up convergence) 
     87      IF (TRIM(cn_gammablk) == 'vel_stab' ) zqoce_b (:,:) = ptsc(:,:,jp_tem) * rho0_rcp ! last time step total heat fluxes (to speed up convergence) 
    8888      ! 
    8989      ! compute ice shelf melting 
     
    142142      ! 
    143143      ! set temperature content 
    144       ptsc(:,:,jp_tem) = - zqh(:,:) * r1_rau0_rcp 
     144      ptsc(:,:,jp_tem) = - zqh(:,:) * r1_rho0_rcp 
    145145      ! 
    146146      ! write restart variables (qoceisf, qhcisf, fwfisf for now and before) 
     
    215215            risf_lamb1 =-0.0564_wp 
    216216            risf_lamb2 = 0.0773_wp 
    217             risf_lamb3 =-7.8633e-8 * grav * rau0 
     217            risf_lamb3 =-7.8633e-8 * grav * rho0 
    218218         ELSE                  ! linearisation from table 4 (Asay-Davis et al., 2015) 
    219219            risf_lamb1 =-0.0573_wp 
    220220            risf_lamb2 = 0.0832_wp 
    221             risf_lamb3 =-7.5300e-8 * grav * rau0 
     221            risf_lamb3 =-7.5300e-8 * grav * rho0 
    222222         ENDIF 
    223223 
Note: See TracChangeset for help on using the changeset viewer.