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 13816 for NEMO – NEMO

Changeset 13816 for NEMO


Ignore:
Timestamp:
2020-11-18T18:35:27+01:00 (3 years ago)
Author:
laurent
Message:

Keep up with trunk "r13815".

Location:
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/C1D/step_c1d.F90

    r13237 r13816  
    122122                        CALL dyn_atf    ( kstp, Nbb, Nnn, Naa , uu, vv, e3t, e3u, e3v )  ! time filtering of "now" fields 
    123123      IF(.NOT.ln_linssh)CALL ssh_atf    ( kstp, Nbb, Nnn, Naa , ssh )                    ! time filtering of "now" sea surface height 
     124      IF( kstp == nit000 .AND. ln_linssh) THEN 
     125         ssh(:,:,Naa) = ssh(:,:,Nnn)  ! init ssh after in ln_linssh case 
     126      ENDIF 
    124127      ! 
    125128      ! Swap time levels 
  • NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/MY_SRC/step_c1d.F90

    r13655 r13816  
    77   !!             3.0  !  2008-04  (G. Madec)  redo the adaptation to include SBC 
    88   !!             4.1  !  2019-08  (A. Coward, D. Storkey) rewrite in preparation for new timestepping scheme 
    9    !!             4.x  !  2020-09  (L. Brodeau) STATION_ASF test-case 
     9   !!             4.x  !  2020-11  (L. Brodeau) STATION_ASF test-case 
    1010   !!---------------------------------------------------------------------- 
    1111#if defined key_c1d 
     
    2626   !!---------------------------------------------------------------------- 
    2727   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    28    !! $Id: step_c1d.F90 13237 2020-07-03 09:12:53Z smasson $ 
     28   !! $Id: step_c1d.F90 13802 2020-11-17 09:21:55Z gsamson $ 
    2929   !! Software governed by the CeCILL license (see ./LICENSE) 
    3030   !!---------------------------------------------------------------------- 
     
    5454      IF( kstp == nit000 )   CALL iom_init( "nemo")   ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 
    5555      IF( kstp /= nit000 )   CALL day( kstp )         ! Calendar (day was already called at nit000 in day_init) 
    56       CALL iom_setkt( kstp - nit000 + 1, "nemo" )   ! say to iom that we are at time step kstp 
     56                             CALL iom_setkt( kstp - nit000 + 1, "nemo" )   ! say to iom that we are at time step kstp 
    5757 
    5858      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    5959      ! Update data, open boundaries, surface boundary condition (including sea-ice) 
    6060      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    61       CALL sbc    ( kstp, Nbb, Nnn )  ! Sea Boundary Condition (including sea-ice) 
    62       !                  #LB:  ==> calls 'sbc_ssm()' ! 
     61                         CALL sbc    ( kstp, Nbb, Nnn )  ! Sea Boundary Condition (including sea-ice) 
     62 
    6363      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    6464      ! diagnostics and outputs 
    6565      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    66       CALL dia_wri( kstp, Nnn )  ! ocean model: outputs 
     66                         CALL dia_wri( kstp, Nnn )  ! ocean model: outputs 
    6767 
    6868      ! Swap time levels 
     
    7575      ! Control and restarts 
    7676      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    77       CALL stp_ctl( kstp, Nnn ) 
     77                             CALL stp_ctl( kstp, Nnn ) 
    7878      IF( kstp == nit000 )   CALL iom_close( numror )          ! close input  ocean restart file 
    7979      IF( lrst_oce       )   CALL rst_write( kstp, Nbb, Nnn )  ! write output ocean restart file 
Note: See TracChangeset for help on using the changeset viewer.