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 13885 for NEMO/branches/2020 – NEMO

Changeset 13885 for NEMO/branches/2020


Ignore:
Timestamp:
2020-11-26T15:01:11+01:00 (3 years ago)
Author:
acc
Message:

Branch dev_r13787_OSMOSIS_IMMERSE. Fix SETTE restartability issue with ln_zdfosm activated

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE/src/OCE/ZDF/zdfosm.F90

    r13867 r13885  
    639639      CALL zdf_osm_calculate_dhdt( zdhdt, zddhdt ) 
    640640      DO_2D( 0, 0, 0, 0 ) 
    641        zhbl_t(ji,jj) = hbl(ji,jj) + (zdhdt(ji,jj) - ww(ji,jj,ibld(ji,jj)))* rn_Dt ! certainly need wn here, so subtract it 
     641       zhbl_t(ji,jj) = hbl(ji,jj) + (zdhdt(ji,jj) - ww(ji,jj,ibld(ji,jj)))* rn_Dt ! certainly need ww here, so subtract it 
    642642            ! adjustment to represent limiting by ocean bottom 
    643643       IF ( zhbl_t(ji,jj) >= gdepw(ji, jj, mbkt(ji,jj) + 1, Kmm ) ) THEN 
     
    27132713        IF( id1 > 0 ) THEN                       ! 'wn' exists; read 
    27142714           CALL iom_get( numror, jpdom_auto, 'wn', ww, ldxios = lrxios ) 
    2715            WRITE(numout,*) ' ===>>>> :  ww read from restart file' 
     2715           WRITE(numout,*) ' ===>>>> :  wn read from restart file' 
    27162716        ELSE 
    27172717           ww(:,:,:) = 0._wp 
    2718            WRITE(numout,*) ' ===>>>> :  ww not in restart file, set to zero initially' 
     2718           WRITE(numout,*) ' ===>>>> :  wn not in restart file, set to zero initially' 
    27192719        END IF 
    27202720 
     
    27462746     IF( TRIM(cdrw) == 'WRITE') THEN     !* Write hbl into the restart file, then return 
    27472747        IF(lwp) WRITE(numout,*) '---- osm-rst ----' 
    2748          CALL iom_rstput( kt, nitrst, numrow, 'ww'     , ww,   ldxios = lwxios ) 
     2748         CALL iom_rstput( kt, nitrst, numrow, 'wn'     , ww,   ldxios = lwxios ) 
    27492749         CALL iom_rstput( kt, nitrst, numrow, 'hbl'    , hbl,  ldxios = lwxios ) 
    27502750         CALL iom_rstput( kt, nitrst, numrow, 'dh'     , dh,   ldxios = lwxios ) 
Note: See TracChangeset for help on using the changeset viewer.