Changeset 11908


Ignore:
Timestamp:
2019-11-14T20:20:07+01:00 (2 months ago)
Author:
mathiot
Message:

ENHANCE-02_ISF_nemo: fix issue initialisation after ice sheet coupling step

Location:
NEMO/branches/2019/ENHANCE-02_ISF_nemo
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/ENHANCE-02_ISF_nemo/cfgs/SHARED/field_def_nemo-oce.xml

    r11835 r11908  
    264264 
    265265          <!-- * variable related to ice shelf forcing * --> 
    266           <field id="isfdebug3d2"                                                                                grid_ref="grid_T_3D" /> 
    267           <field id="isfdebug3d1"                                                                                grid_ref="grid_T_3D" /> 
    268           <field id="isfdebug2d"                                                                                /> 
     266          <field id="isftfrz_par"     long_name="fzp temperature at ocean/isf interface"        unit="degC"     /> 
     267          <field id="isftfrz_cav"     long_name="fzp temperature at ocean/isf interface"        unit="degC"     /> 
    269268          <field id="fwfisf_cav"      long_name="Ice shelf melting"                             unit="kg/m2/s"  /> 
    270269          <field id="fwfisf_par"      long_name="Ice shelf melting"                             unit="kg/m2/s"  /> 
  • NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcpl.F90

    r11902 r11908  
    6161      ! check presence of variable needed for coupling 
    6262      ! iom_varid return 0 if not found 
    63       id = 0 
     63      id = 1 
    6464      id = id * iom_varid(numror, 'ssmask', ldstop = .false.) 
    6565      id = id * iom_varid(numror, 'tmask' , ldstop = .false.) 
     
    145145      !!---------------------------------------------------------------------- 
    146146      !! 
    147       INTEGER :: ji, jj, jd          !! loop index 
     147      INTEGER :: ji, jj, jd, jk      !! loop index 
    148148      INTEGER :: jip1, jim1, jjp1, jjm1 
    149149      !! 
     
    195195      ! 
    196196      ! recompute the vertical scale factor, depth and water thickness 
     197      IF(lwp) write(numout,*) 'isfcpl_ssh : recompute scale factor from sshn (new wet cell)' 
     198      IF(lwp) write(numout,*) '~~~~~~~~~~~' 
     199      DO jk = 1, jpk 
     200         e3t_n(:,:,jk) =  e3t_0(:,:,jk) * ( ht_0(:,:) + sshn(:,:) ) & 
     201             &                          / ( ht_0(:,:) + 1._wp - ssmask(:,:) ) * tmask(:,:,jk)   & 
     202             &          + e3t_0(:,:,jk)                               * (1._wp -tmask(:,:,jk)) 
     203      END DO 
     204      e3t_b(:,:,:) = e3t_n(:,:,:) 
    197205      CALL dom_vvl_zgr() 
    198206      ! 
  • NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/TRA/traisf.F90

    r11902 r11908  
    6868         ! ensure 0 trend due to unconservation of the ice shelf coupling 
    6969         IF ( ln_isfcpl_cons ) CALL tra_isf_cpl(risfcpl_cons_tsc, tsa) 
     70 
     71         IF ( ln_isfdebug ) THEN 
     72            CALL debug('tra_isf: risfcpl_tsc T',risfcpl_tsc(:,:,1)) 
     73            CALL debug('tra_isf: risfcpl_tsc S',risfcpl_tsc(:,:,2)) 
     74         END IF 
    7075         ! 
    7176      END IF 
    7277      ! 
    7378      IF ( ln_isfdebug ) THEN 
    74          CALL debug('tra_isf: risfcpl_tsc T',risfcpl_tsc(:,:,1)) 
    75          CALL debug('tra_isf: risfcpl_tsc S',risfcpl_tsc(:,:,2)) 
    7679         CALL debug('tra_isf: tsa T'        ,tsa(:,:,:,1)) 
    7780         CALL debug('tra_isf: tsa S'        ,tsa(:,:,:,2)) 
  • NEMO/branches/2019/ENHANCE-02_ISF_nemo/tests/ISOMIP+/MY_SRC/isfstp.F90

    r11889 r11908  
    145145         !--------------------------------------------------------------------------------------------------------------------- 
    146146         ! initialisation ice sheet coupling 
    147          IF( ln_isfcpl ) CALL isfcpl_init() 
     147         IF ( ln_isfcpl ) CALL isfcpl_init() 
    148148         ! 
    149149      END IF 
  • NEMO/branches/2019/ENHANCE-02_ISF_nemo/tests/ISOMIP+/MY_SRC/sbcfwb.F90

    r11896 r11908  
    8484            IF( kn_fwb == 2 )   WRITE(numout,*) '          adjusted from previous year budget' 
    8585            IF( kn_fwb == 3 )   WRITE(numout,*) '          fwf set to zero and spread out over erp area' 
     86            IF( kn_fwb == 4 )   WRITE(numout,*) '          instantaneously set to zero with heat and salt flux correction (ISOMIP+)' 
    8687         ENDIF 
    8788         ! 
     
    120121            zcoef = z_fwf * rcp 
    121122            emp(:,:) = emp(:,:) - z_fwf            * tmask(:,:,1) ! (Eq. 34 AD2015) 
    122             qns(:,:) = qns(:,:) + zcoef * ( -1.9 ) * tmask(:,:,1) ! (Eq. 35 AD2015) ! could be sst_m if we don't want any bouyancy fluxes 
    123             sfx(:,:) = sfx(:,:) + z_fwf * ( 33.8 ) * tmask(:,:,1) ! (Eq. 36 AD2015) ! could be sss_m if we don't want any bouyancy fluxes 
     123            qns(:,:) = qns(:,:) + zcoef * sst_m(:,:) * tmask(:,:,1) ! (Eq. 35 AD2015) ! could be sst_m if we don't want any bouyancy fluxes 
     124            sfx(:,:) = sfx(:,:) + z_fwf * sss_m(:,:) * tmask(:,:,1) ! (Eq. 36 AD2015) ! could be sss_m if we don't want any bouyancy fluxes 
     125            !qns(:,:) = qns(:,:) + zcoef * ( -1.9 ) * tmask(:,:,1) ! (Eq. 35 AD2015) ! could be sst_m if we don't want any bouyancy fluxes 
     126            !sfx(:,:) = sfx(:,:) + z_fwf * ( 33.8 ) * tmask(:,:,1) ! (Eq. 36 AD2015) ! could be sss_m if we don't want any bouyancy fluxes 
    124127         ENDIF 
    125128         ! 
Note: See TracChangeset for help on using the changeset viewer.