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 719 for trunk/NEMO/OPA_SRC/DYN – NEMO

Changeset 719 for trunk/NEMO/OPA_SRC/DYN


Ignore:
Timestamp:
2007-10-16T16:59:56+02:00 (17 years ago)
Author:
ctlod
Message:

get back to the nemo_v2_3 version for trunk

Location:
trunk/NEMO/OPA_SRC/DYN
Files:
29 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMO/OPA_SRC/DYN/divcur.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    2727   !!---------------------------------------------------------------------- 
    2828   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    29    !! $Id$ 
     29   !! $Header$  
    3030   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3131   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynadv.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    3535   !!---------------------------------------------------------------------- 
    3636   !!   OPA 9.0 , LOCEAN-IPSL (2006)  
    37    !! $Id$ 
     37   !! $Header$  
    3838   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    3939   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynadv_cen2.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    2929   !!---------------------------------------------------------------------- 
    3030   !!   OPA 9.0 , LODYC-IPSL  (2006) 
    31    !! $Id$ 
     31   !! $Header$ 
    3232   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)  
    3333   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynadv_ubs.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    3434   !!---------------------------------------------------------------------- 
    3535   !!   OPA 9.0 , LODYC-IPSL  (2006) 
    36    !! $Id$ 
     36   !! $Header$ 
    3737   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)  
    3838   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynhpg.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    7575   !!---------------------------------------------------------------------- 
    7676   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    77    !! $Id$ 
     77   !! $Header$  
    7878   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    7979   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynhpg_jki.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    3333   !!---------------------------------------------------------------------- 
    3434   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    35    !! $Id$ 
     35   !! $Header$ 
    3636   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    3737   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynkeg.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    2828   !!---------------------------------------------------------------------- 
    2929   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    30    !! $Id$ 
     30   !! $Header$  
    3131   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    3232   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynldf.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    3939   !!--------------------------------------------------------------------------------- 
    4040   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    41    !! $Id$ 
     41   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/DYN/dynldf.F90,v 1.4 2007/06/05 11:02:08 opalod Exp $ 
    4242   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    4343   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynldf_bilap.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    3030   !!---------------------------------------------------------------------- 
    3131   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    32    !! $Id$ 
     32   !! $Header$  
    3333   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3434   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    3535   !!---------------------------------------------------------------------- 
    3636   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    37    !! $Id$ 
     37   !! $Header$  
    3838   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3939   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynldf_iso.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    3737   !!---------------------------------------------------------------------- 
    3838   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    39    !! $Id$ 
    40    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    4139   !!---------------------------------------------------------------------- 
    4240 
  • trunk/NEMO/OPA_SRC/DYN/dynldf_lap.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    3131   !!---------------------------------------------------------------------- 
    3232   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    33    !! $Id$ 
     33   !! $Header$  
    3434   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3535   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynnxt.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    8383      !!---------------------------------------------------------------------- 
    8484      !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    85       !! $Id$ 
     85      !! $Header$  
    8686      !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    8787      !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynspg.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    4141   !!---------------------------------------------------------------------- 
    4242   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    43    !! $Id$ 
     43   !! $Header$  
    4444   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    4545   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynspg_exp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r708 r719  
    1616   USE oce             ! ocean dynamics and tracers  
    1717   USE dom_oce         ! ocean space and time domain  
    18    USE sbc_oce         ! surface boundary condition: ocean 
     18   USE in_out_manager  ! I/O manager 
     19   USE phycst          ! physical constants 
     20   USE ocesbc          ! ocean surface boundary condition 
    1921   USE obc_oce         ! Lateral open boundary condition 
    20    USE phycst          ! physical constants 
    2122   USE obc_par         ! open boundary condition parameters 
    2223   USE obcdta          ! open boundary condition data     (obc_dta_bt routine) 
    23    USE in_out_manager  ! I/O manager 
    2424   USE lib_mpp         ! distributed memory computing library 
    2525   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
     
    4040   !!---------------------------------------------------------------------- 
    4141   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    42    !! $Id$ 
     42   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/DYN/dynspg_exp.F90,v 1.9 2007/06/05 10:38:27 opalod Exp $  
    4343   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4444   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynspg_exp_jki.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r708 r719  
    1515   USE oce             ! ocean dynamics and tracers  
    1616   USE dom_oce         ! ocean space and time domain  
    17    USE sbc_oce         ! surface boundary condition: ocean 
     17   USE in_out_manager  ! I/O manager 
     18   USE phycst          ! physical constants 
     19   USE ocesbc          ! ocean surface boundary condition 
    1820   USE obc_oce         ! Lateral open boundary condition 
    19    USE phycst          ! physical constants 
    2021   USE obc_par         ! open boundary condition parameters 
    2122   USE obcdta          ! open boundary condition data     (obc_dta_bt routine) 
    22    USE in_out_manager  ! I/O manager 
    2323   USE lib_mpp         ! distributed memory computing library 
    2424   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
     
    3838   !!---------------------------------------------------------------------- 
    3939   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    40    !! $Id$ 
     40   !! $Header$  
    4141   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4242   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynspg_flt.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r708 r719  
    2525   USE dom_oce         ! ocean space and time domain  
    2626   USE zdf_oce         ! ocean vertical physics 
    27    USE sbc_oce         ! surface boundary condition: ocean 
    28    USE obc_oce         ! Lateral open boundary condition 
     27   USE phycst          ! physical constants 
     28   USE ocesbc          ! ocean surface boundary condition 
     29   USE flxrnf          ! ocean runoffs 
    2930   USE sol_oce         ! ocean elliptic solver 
    30    USE phycst          ! physical constants 
    31    USE domvvl          ! variable volume 
    3231   USE solver          ! solver initialization 
    3332   USE solpcg          ! preconditionned conjugate gradient solver 
     
    3534   USE solfet          ! FETI solver 
    3635   USE solsor_e        ! Successive Over-relaxation solver with MPP optimization 
     36   USE obc_oce         ! Lateral open boundary condition 
    3737   USE obcdyn          ! ocean open boundary condition (obc_dyn routines) 
    3838   USE obcvol          ! ocean open boundary condition (obc_vol routines) 
    39    USE cla_dynspg      ! cross land advection 
    40    USE in_out_manager  ! I/O manager 
    4139   USE lib_mpp         ! distributed memory computing library 
    4240   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
     41   USE cla_dynspg      ! cross land advection 
    4342   USE prtctl          ! Print control 
    4443   USE solmat          ! matrix construction for elliptic solvers 
    4544   USE agrif_opa_interp 
     45   USE in_out_manager  ! I/O manager 
    4646   USE iom 
    4747   USE restart         ! only for lrst_oce 
     48   USE domvvl          ! variable volume 
    4849 
    4950   IMPLICIT NONE 
     
    5859   !!---------------------------------------------------------------------- 
    5960   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    60    !! $Id$ 
     61   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/DYN/dynspg_flt.F90,v 1.14 2007/06/05 10:38:27 opalod Exp $  
    6162   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)  
    6263   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynspg_flt_jki.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r708 r719  
    1616   USE dom_oce         ! ocean space and time domain 
    1717   USE zdf_oce         ! ocean vertical physics 
    18    USE sbc_oce         ! surface boundary condition: ocean 
     18   USE phycst          ! physical constant 
     19   USE ocesbc          ! Ocean Surface Boundary condition 
     20   USE flxrnf          ! ocean runoffs 
    1921   USE sol_oce         ! ocean elliptic solver 
    20    USE obc_oce         ! Lateral open boundary condition 
    21    USE phycst          ! physical constant 
    22    USE dynspg_flt      ! surface pressure gradient 
    2322   USE solpcg          ! preconditionned conjugate gradient solver 
    2423   USE solsor          ! Successive Over-relaxation solver 
     
    2625   USE solsor_e        ! Successive Over-relaxation solver with MPP optimization 
    2726   USE solver 
     27   USE obc_oce         ! Lateral open boundary condition 
    2828   USE obcdyn          ! ocean open boundary condition (obc_dyn routines) 
    2929   USE obcvol          ! ocean open boundary condition (obc_vol routines) 
     
    3131   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
    3232   USE cla_dynspg      ! cross land advection 
     33   USE prtctl          ! Print control 
    3334   USE in_out_manager  ! I/O manager 
    34    USE prtctl          ! Print control 
    3535   USE solmat          ! matrix construction for elliptic solvers 
    3636   USE agrif_opa_interp 
    3737   USE restart         ! only for lrst_oce 
    3838   USE iom             ! I/O library 
     39   USE dynspg_flt      ! surface pressure gradient 
    3940 
    4041   IMPLICIT NONE 
     
    4849   !!---------------------------------------------------------------------- 
    4950   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    50    !! $Id$ 
     51   !! $Header$  
    5152   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    5253   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynspg_oce.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    1212   !!---------------------------------------------------------------------- 
    1313   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    14    !! $Id$ 
     14   !! $Header$  
    1515   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1616   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynspg_rl.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    5656   !!---------------------------------------------------------------------- 
    5757   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    58    !! $Id$ 
     58   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/DYN/dynspg_rl.F90,v 1.11 2007/06/05 10:38:27 opalod Exp $  
    5959   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)  
    6060   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r708 r719  
    2020   USE oce             ! ocean dynamics and tracers 
    2121   USE dom_oce         ! ocean space and time domain 
    22    USE sbc_oce         ! surface boundary condition: ocean 
    23    USE dynspg_oce      ! surface pressure gradient variables 
    2422   USE phycst          ! physical constants 
    25    USE domvvl          ! variable volume 
     23   USE ocesbc          ! ocean surface boundary condition 
    2624   USE obcdta          ! open boundary condition data      
    2725   USE obcfla          ! Flather open boundary condition   
     
    3230   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
    3331   USE prtctl          ! Print control 
     32   USE dynspg_oce      ! surface pressure gradient variables 
    3433   USE in_out_manager  ! I/O manager 
    3534   USE iom 
    3635   USE restart         ! only for lrst_oce 
     36   USE domvvl          ! variable volume 
    3737 
    3838   IMPLICIT NONE 
     
    5151   !!---------------------------------------------------------------------- 
    5252   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    53    !! $Id$ 
     53   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/DYN/dynspg_ts.F90,v 1.16 2007/06/05 10:38:27 opalod Exp $  
    5454   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    5555   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynspg_ts_jki.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r708 r719  
    1414   USE oce             ! ocean dynamics and tracers 
    1515   USE dom_oce         ! ocean space and time domain 
    16    USE sbc_oce         ! surface boundary condition: ocean 
    17    USE obc_oce         ! Lateral open boundary condition 
    18    USE obc_par         ! open boundary condition parameters 
    19    USE dynspg_oce      ! surface pressure gradient variables 
    20    USE dynspg_ts       ! surface pressure gradient 
    2116   USE phycst          ! physical constants 
     17   USE ocesbc          ! ocean surface boundary condition 
    2218   USE obcdta          ! open boundary condition data      
    2319   USE obcfla          ! Flather open boundary condition   
    2420   USE dynvor          ! vorticity term 
     21   USE obc_oce         ! Lateral open boundary condition 
     22   USE obc_par         ! open boundary condition parameters 
    2523   USE lib_mpp         ! distributed memory computing library 
    2624   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
    2725   USE prtctl          ! Print control 
     26   USE dynspg_oce      ! surface pressure gradient variables 
     27   USE dynspg_ts       ! surface pressure gradient 
    2828   USE in_out_manager  ! I/O manager 
    2929   USE iom             ! I/O library 
     
    4141   !!---------------------------------------------------------------------- 
    4242   !!   OPA 9.0 , LODYC-IPSL  (2005) 
    43    !! $Id$ 
     43   !! $Header$  
    4444   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4545   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynvor.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    5353   !!---------------------------------------------------------------------- 
    5454   !!   OPA 9.0 , LOCEAN-IPSL (2006)  
    55    !! $Id$ 
     55   !! $Header$ 
    5656   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    5757   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynzad.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r708 r719  
    1616   USE oce            ! ocean dynamics and tracers 
    1717   USE dom_oce        ! ocean space and time domain 
    18    USE sbc_oce        ! surface boundary condition: ocean 
     18   USE in_out_manager ! I/O manager 
     19   USE trdmod         ! ocean dynamics trends  
    1920   USE trdmod_oce     ! ocean variables trends 
    20    USE trdmod         ! ocean dynamics trends  
    21    USE in_out_manager ! I/O manager 
     21   USE flxrnf         ! ocean runoffs 
    2222   USE prtctl         ! Print control 
    2323 
     
    3232   !!---------------------------------------------------------------------- 
    3333   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    34    !! $Id$ 
     34   !! $Header$  
    3535   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    3636   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynzdf.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    4242   !!---------------------------------------------------------------------- 
    4343   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    44    !! $Id$ 
     44   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/DYN/dynzdf.F90,v 1.3 2007/06/05 11:00:28 opalod Exp $ 
    4545   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    4646   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/DYN/dynzdf_exp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r710 r719  
    1818   USE phycst          ! physical constants 
    1919   USE zdf_oce         ! ocean vertical physics 
    20    USE sbc_oce         ! surface boundary condition: ocean 
    2120   USE in_out_manager  ! I/O manager 
     21   USE taumod          ! surface ocean stress 
    2222 
    2323   IMPLICIT NONE 
     
    3232   !!---------------------------------------------------------------------- 
    3333   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    34    !! $Id$ 
     34   !! $Header$  
    3535   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    3636   !!---------------------------------------------------------------------- 
     
    8181         ! Surface boundary condition 
    8282         DO ji = 2, jpim1 
    83             zwy(ji,1) = utau(ji,jj) * zrau0r 
    84             zww(ji,1) = vtau(ji,jj) * zrau0r 
     83            zwy(ji,1) = taux(ji,jj) * zrau0r 
     84            zww(ji,1) = tauy(ji,jj) * zrau0r 
    8585         END DO   
    8686 
  • trunk/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r710 r719  
    1414   !!---------------------------------------------------------------------- 
    1515   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    16    !! $Id$ 
     16   !! $Header$  
    1717   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    1818   !!---------------------------------------------------------------------- 
     
    2020   USE oce             ! ocean dynamics and tracers 
    2121   USE dom_oce         ! ocean space and time domain 
    22    USE sbc_oce         ! surface boundary condition: ocean 
     22   USE phycst          ! physical constants 
    2323   USE zdf_oce         ! ocean vertical physics 
    24    USE phycst          ! physical constants 
    2524   USE in_out_manager  ! I/O manager 
     25   USE taumod          ! surface ocean stress 
    2626 
    2727   IMPLICIT NONE 
     
    3636   !!---------------------------------------------------------------------- 
    3737   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    38    !! $Id$ 
     38   !! $Header$  
    3939   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4040   !!---------------------------------------------------------------------- 
     
    141141!!! change les resultats (derniers digit, pas significativement + rapide 1* de moins) 
    142142!!!         ua(ji,jj,1) = ub(ji,jj,1)  & 
    143 !!!                      + p2dt * ( ua(ji,jj,1) + utau(ji,jj) / ( fse3u(ji,jj,1)*rau0 ) ) 
     143!!!                      + p2dt * ( ua(ji,jj,1) + taux(ji,jj) / ( fse3u(ji,jj,1)*rau0 ) ) 
    144144            z2dtf = p2dt / ( fse3u(ji,jj,1)*rau0 ) 
    145145            ua(ji,jj,1) = ub(ji,jj,1)  & 
    146                          + p2dt *  ua(ji,jj,1) + z2dtf * utau(ji,jj) 
     146                         + p2dt *  ua(ji,jj,1) + z2dtf * taux(ji,jj) 
    147147         END DO 
    148148      END DO 
     
    236236!!! change les resultats (derniers digit, pas significativement + rapide 1* de moins) 
    237237!!!         va(ji,jj,1) = vb(ji,jj,1)  & 
    238 !!!                      + p2dt * ( va(ji,jj,1) + vtau(ji,jj) / ( fse3v(ji,jj,1)*rau0 ) ) 
     238!!!                      + p2dt * ( va(ji,jj,1) + tauy(ji,jj) / ( fse3v(ji,jj,1)*rau0 ) ) 
    239239            z2dtf = p2dt / ( fse3v(ji,jj,1)*rau0 ) 
    240240            va(ji,jj,1) = vb(ji,jj,1)  & 
    241                          + p2dt * va(ji,jj,1) + z2dtf * vtau(ji,jj) 
     241                         + p2dt * va(ji,jj,1) + z2dtf * tauy(ji,jj) 
    242242         END DO 
    243243      END DO 
  • trunk/NEMO/OPA_SRC/DYN/dynzdf_imp_jki.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r710 r719  
    1515   USE oce             ! ocean dynamics and tracers 
    1616   USE dom_oce         ! ocean space and time domain 
     17   USE phycst          ! physical constants 
    1718   USE zdf_oce         ! ocean vertical physics 
    18    USE sbc_oce         ! surface boundary condition: ocean 
    19    USE phycst          ! physical constants 
    2019   USE in_out_manager  ! I/O manager 
     20   USE taumod          ! surface ocean stress 
    2121 
    2222   IMPLICIT NONE 
     
    3131   !!---------------------------------------------------------------------- 
    3232   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    33    !! $Id$ 
     33   !! $Header$  
    3434   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    3535   !!---------------------------------------------------------------------- 
     
    105105            zwi(ji,1) = 0. 
    106106            zwd(ji,1) = 1. - zws(ji,1) 
    107             zwy(ji,1) = zwy(ji,1) + z2dtf * utau(ji,jj) 
     107            zwy(ji,1) = zwy(ji,1) + z2dtf * taux(ji,jj) 
    108108         END DO 
    109109 
     
    192192            zwi(ji,1) = 0.e0 
    193193            zwd(ji,1) = 1. - zws(ji,1) 
    194             zwy(ji,1) = zwy(ji,1) + z2dtf * vtau(ji,jj) 
     194            zwy(ji,1) = zwy(ji,1) + z2dtf * tauy(ji,jj) 
    195195         END DO 
    196196 
  • trunk/NEMO/OPA_SRC/DYN/wzvmod.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r708 r719  
    1313   USE oce             ! ocean dynamics and tracers variables 
    1414   USE dom_oce         ! ocean space and time domain variables  
    15    USE sbc_oce         ! surface boundary condition: ocean 
    16    USE domvvl          ! Variable volume 
    1715   USE in_out_manager  ! I/O manager 
    1816   USE prtctl          ! Print control 
     17 
     18   USE domvvl          ! Variable volume 
    1919   USE phycst 
     20   USE ocesbc          ! ocean surface boundary condition 
    2021   USE lbclnk          ! ocean lateral boundary condition (or mpp link) 
    2122 
     
    3031   !!---------------------------------------------------------------------- 
    3132   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    32    !! $Id$ 
     33   !! $Header$  
    3334   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    3435   !!---------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.