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 4263 for branches/2013 – NEMO

Changeset 4263 for branches/2013


Ignore:
Timestamp:
2013-11-19T17:57:17+01:00 (10 years ago)
Author:
acc
Message:

Branch 2013/dev_r3858_NOC_ZTC, #863. Fixes to allow successful compilation of ORCA2_LIM with key_dynspg_ts

Location:
branches/2013/dev_r3858_NOC_ZTC/NEMOGCM
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm

    r4258 r4263  
    4747%LD                  ifort 
    4848%FPPFLAGS            -P -C -traditional 
    49 %LDFLAGS             -lmpi -lstdc++ 
     49%LDFLAGS             -lmpi -lstdc++ -lcurl 
    5050%AR                  ar  
    5151%ARFLAGS             -r 
  • branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90

    r4254 r4263  
    599599      WRITE(*,*) 'bdytide_update: You should not have seen this print! error?', kt, jit 
    600600   END SUBROUTINE bdytide_update 
    601    SUBROUTINE bdy_dta_tides( kt, jit )   ! Empty routine 
     601   SUBROUTINE bdy_dta_tides( kt, kit, time_offset )     ! Empty routine 
     602      INTEGER, INTENT( in )            ::   kt          ! Dummy argument empty routine       
     603      INTEGER, INTENT( in ),OPTIONAL   ::   kit         ! Dummy argument empty routine 
     604      INTEGER, INTENT( in ),OPTIONAL   ::   time_offset ! Dummy argument empty routine 
    602605      WRITE(*,*) 'bdy_dta_tides: You should not have seen this print! error?', kt, jit 
    603606   END SUBROUTINE bdy_dta_tides 
  • branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

    r4254 r4263  
    7474   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  ftsw, ftse   ! (only used with een vorticity scheme) 
    7575 
    76    ! Would be convenient to have arrays below defined whatever the free surface option ? 
    77    ! These could be computed once for all at the beginning of the each baroclinic time step 
    78    ! and eventually swapped at the end 
    79    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ua_b, va_b     ! after  averaged velocities 
    80    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   un_b, vn_b     ! now    averaged velocities 
    81    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ub_b, vb_b     ! before averaged velocities 
    82  
    83    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   un_adv, vn_adv ! Advection vel. at "now" barocl. step 
    84    REAL(wp), PRIVATE,ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ub2_b,  vb2_b  ! Advection vel. at "now-0.5" barocl. step 
    85  
    8676   ! Arrays below are saved to allow testing of the "no time averaging" option 
    8777   ! If this option is not retained, these could be replaced by temporary arrays 
  • branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

    r4194 r4263  
    2626   USE timing          ! Timing 
    2727   USE dynadv          ! dynamics: vector invariant versus flux form 
    28    USE dynspg_oce, ONLY: lk_dynspg_ts 
     28   USE dynspg_oce, ONLY: lk_dynspg_ts, ua_b, va_b 
    2929   USE dynspg_ts 
    3030 
  • branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

    r4254 r4263  
    3636   USE iom 
    3737   USE sbcrnf, ONLY: h_rnf, nk_rnf, sbc_rnf_div   ! River runoff  
    38    USE dynspg_ts,  ONLY: un_b, vn_b, un_adv, vn_adv, ln_bt_fw 
     38   USE dynspg_oce,  ONLY: un_b, vn_b, un_adv, vn_adv 
     39   USE dynspg_ts,   ONLY: ln_bt_fw 
    3940   USE dynspg_oce, ONLY: lk_dynspg_ts 
    4041#if defined key_agrif 
  • branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90

    r3865 r4263  
    2424   PRIVATE 
    2525 
    26    PUBLIC   sbc_ssm    ! routine called by step.F90 
     26   PUBLIC   sbc_ssm         ! routine called by step.F90 
     27   PUBLIC   sbc_ssm_init    ! routine called by sbcmod.F90 
    2728 
    2829   LOGICAL, SAVE  ::   l_ssm_mean = .FALSE.       ! keep track of whether means have been read 
Note: See TracChangeset for help on using the changeset viewer.