Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (4 years ago)
Author:
timgraham
Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge —reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90

    r6140 r7646  
    4949      IF(lwp) WRITE(numout,*) '~~~~~~~' 
    5050 
    51       SELECT CASE( jphgr_msh )   ! type of horizontal mesh 
    52       ! 
    53       CASE ( 0, 1, 4 )               ! mesh on the sphere 
    54          ff(:,:) = 2. * omega * SIN( rad * gphit(:,:) )  
    55          ! 
    56       CASE ( 2 )                     ! f-plane at ppgphi0  
    57          ff(:,:) = 2. * omega * SIN( rad * ppgphi0 ) 
    58          IF(lwp) WRITE(numout,*) '          f-plane: Coriolis parameter = constant = ', ff(1,1) 
    59          ! 
    60       CASE ( 3 )                     ! beta-plane 
    61          zbeta   = 2. * omega * COS( rad * ppgphi0 ) / ra                     ! beta at latitude ppgphi0 
    62          zphi0   = ppgphi0 - FLOAT( jpjglo/2) * ppe2_m *1.e-3  / ( ra * rad ) ! latitude of the first row F-points 
    63          zf0     = 2. * omega * SIN( rad * zphi0 )                            ! compute f0 1st point south 
    64          ff(:,:) = ( zf0  + zbeta * gphit(:,:) * 1.e+3 )                      ! f = f0 +beta* y ( y=0 at south) 
    65          IF(lwp) WRITE(numout,*) '          Beta-plane: Beta parameter = constant = ', ff(1,1) 
    66          IF(lwp) WRITE(numout,*) '                      Coriolis parameter varies from ', ff(1,1),' to ', ff(1,jpj) 
    67          ! 
    68       CASE ( 5 )                     ! beta-plane and rotated domain 
    69          zbeta = 2. * omega * COS( rad * ppgphi0 ) / ra                     ! beta at latitude ppgphi0 
    70          zphi0 = 15.e0                                                      ! latitude of the first row F-points 
    71          zf0   = 2. * omega * SIN( rad * zphi0 )                            ! compute f0 1st point south 
    72          ff(:,:) = ( zf0 + zbeta * ABS( gphit(:,:) - zphi0 ) * rad * ra )   ! f = f0 +beta* y ( y=0 at south) 
    73          IF(lwp) WRITE(numout,*) '          Beta-plane: Beta parameter = constant = ', ff(1,1) 
    74          IF(lwp) WRITE(numout,*) '                      Coriolis parameter varies from ', ff(1,1),' to ', ff(1,jpj) 
    75          ! 
    76       END SELECT 
    7751      ! 
    7852   END SUBROUTINE cor_c1d 
     
    10074         DO jj = 2, jpjm1 
    10175            DO ji = fs_2, fs_jpim1   ! vector opt. 
    102                ua(ji,jj,jk) = ua(ji,jj,jk) + ff(ji,jj) * vn(ji,jj,jk) 
    103                va(ji,jj,jk) = va(ji,jj,jk) - ff(ji,jj) * un(ji,jj,jk) 
     76               ua(ji,jj,jk) = ua(ji,jj,jk) + ff_t(ji,jj) * vn(ji,jj,jk) 
     77               va(ji,jj,jk) = va(ji,jj,jk) - ff_t(ji,jj) * un(ji,jj,jk) 
    10478            END DO 
    10579         END DO 
Note: See TracChangeset for help on using the changeset viewer.