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 5501 for trunk/NEMOGCM/NEMO/OPA_SRC – NEMO

Ignore:
Timestamp:
2015-06-29T12:08:15+02:00 (9 years ago)
Author:
deazer
Message:

Adjusted small Bugfix to retain orginal order of statements in step.F90
Requires use of key_bdy.
Passes Sette
See Ticket: 1521
set dyn_apr to false in AMM12 for now before forcing files are updated on ftp site
to allow AMM12 sette to pass.

Location:
trunk/NEMOGCM/NEMO/OPA_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r5431 r5501  
    5353   USE timing           ! Timing 
    5454   USE sbcwave          ! Wave module 
     55   USE bdy_par          ! Require lk_bdy 
    5556 
    5657   IMPLICIT NONE 
     
    343344      !                                            ! ---------------------------------------- ! 
    344345      ! 
    345       IF( ln_apr_dyn ) CALL sbc_apr( kt )                ! atmospheric pressure provided at kt+0.5*nn_fsbc 
     346      IF ( .NOT. lk_bdy ) then 
     347         IF( ln_apr_dyn ) CALL sbc_apr( kt )                ! atmospheric pressure provided at kt+0.5*nn_fsbc 
     348      ENDIF 
    346349                                                         ! (caution called before sbc_ssm) 
    347350      ! 
  • trunk/NEMOGCM/NEMO/OPA_SRC/step.F90

    r5456 r5501  
    101101      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    102102      IF( lk_tide    )   CALL sbc_tide( kstp ) 
     103      IF( lk_bdy     )  THEN 
     104         IF( ln_apr_dyn)     CALL sbc_apr( kstp )   ! bdy_dta needs ssh_ib  
     105                         CALL bdy_dta ( kstp, time_offset=+1 )   ! update dynamic & tracer data at open boundaries 
     106      ENDIF 
    103107                         CALL sbc    ( kstp )         ! Sea Boundary Condition (including sea-ice) 
    104108                                                      ! clem: moved here for bdy ice purpose 
    105       IF( lk_bdy     )   CALL bdy_dta ( kstp, time_offset=+1 )   ! update dynamic & tracer data at open boundaries 
    106109      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    107110      ! Update stochastic parameters and random T/S fluctuations 
  • trunk/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

    r5329 r5501  
    2727   USE sbc_oce          ! surface boundary condition: ocean 
    2828   USE sbctide          ! Tide initialisation 
     29   USE sbcapr           ! surface boundary condition: ssh_ib required by bdydta  
    2930 
    3031   USE traqsr           ! solar radiation penetration      (tra_qsr routine) 
Note: See TracChangeset for help on using the changeset viewer.