Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/C1D

Timestamp:

2017-02-06T10:25:03+01:00 (7 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.

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/C1D

Files:

• domc1d.F90 (modified) (4 diffs)
• dyncor_c1d.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/C1D/domc1d.F90

@@ -24 +24 @@
 
    PUBLIC   dom_c1d   ! called in domcfg.F90
+
+   INTEGER ::   jpizoom = 1      !: left bottom (i,j) indices of the zoom
+   INTEGER ::   jpjzoom = 1      !: in data domain indices
 
    !!----------------------------------------------------------------------
@@ -82 +85 @@
       !  mesh, only glamt and gphit   !
       ! ============================= !
-
+      !
       SELECT CASE( jphgr_msh )   ! type of horizontal mesh
-
+      !
       CASE ( 0 )                 !  curvilinear coordinate on the sphere read in coordinate.nc file
-
+         !
          CALL iom_open( 'coordinates', inum )
          CALL iom_get( inum, jpdom_unknown, 'glamt', glamdta ) ! mig, mjg undefined at this point
          CALL iom_get( inum, jpdom_unknown, 'gphit', gphidta ) ! so use jpdom_unknown not jpdom_data
          CALL iom_close ( inum )
-
+         !
       CASE ( 1 )                 ! geographical mesh on the sphere with regular grid-spacing
-
+         !
          DO jj = 1, jpjdta
             DO ji = 1, jpidta
                zti = FLOAT( ji - 1 + nimpp - 1 )
                ztj = FLOAT( jj - 1 + njmpp - 1 )
-
+               !
                glamdta(ji,jj) = ppglam0 + ppe1_deg * zti
                gphidta(ji,jj) = ppgphi0 + ppe2_deg * ztj
             END DO
          END DO
-
+         !
       CASE ( 2:3 )               ! f- or beta-plane with regular grid-spacing
-         
+         !
          glam0 = 0.e0
          gphi0 = - ppe2_m * 1.e-3
-
+         !
          DO jj = 1, jpjdta
             DO ji = 1, jpidta
@@ -115 +118 @@
             END DO
          END DO
-
+         !
       CASE ( 4 )                 ! geographical mesh on the sphere, isotropic MERCATOR type
-
+         !
          IF( ppgphi0 == -90 )   CALL ctl_stop( ' Mercator grid cannot start at south pole !!!! ' )
-
+         !
          zarg = rpi / 4. - rpi / 180. * ppgphi0 / 2.
          ijeq = ABS( 180. / rpi * LOG( COS( zarg ) / SIN( zarg ) ) / ppe1_deg )
          IF( ppgphi0 > 0 )   ijeq = -ijeq
-
+         !
          DO jj = 1, jpjdta
             DO ji = 1, jpidta
                zti = FLOAT( ji - 1    + nimpp - 1 )
                ztj = FLOAT( jj - ijeq + njmpp - 1 )
-
+               !
                glamdta(ji,jj) = ppglam0 + ppe1_deg * zti
                gphidta(ji,jj) = 1. / rad * ASIN ( TANH( ppe1_deg * rad * ztj ) )
             END DO
          END DO
-
+         !
       CASE ( 5 )                 ! beta-plane with regular grid-spacing and rotated domain (GYRE configuration)
-   
+         !
          zlam1 = -85
          zphi1 = 29
-         ze1 = 106000. / FLOAT(jp_cfg)
- 
+         ze1 = 106000. / REAL( nn_cfg , wp )
+         !
          zsin_alpha = - SQRT( 2. ) / 2.
          zcos_alpha =   SQRT( 2. ) / 2.
          ze1deg = ze1 / (ra * rad)
-
+         !
          glam0 = zlam1 + zcos_alpha * ze1deg * FLOAT( jpjdta-2 ) ! Force global
          gphi0 = zphi1 + zsin_alpha * ze1deg * FLOAT( jpjdta-2 )
-
+         !
          DO jj = 1, jpjdta
             DO ji = 1, jpidta
@@ -156 +159 @@
             END DO
          END DO
-
+         !
       CASE DEFAULT
-
+         !
          WRITE(ctmp1,*) '          bad flag value for jphgr_msh = ', jphgr_msh
          CALL ctl_stop( ctmp1 )
-
+         !
       END SELECT
 

trunk/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90

@@ -49 +49 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~'
 
-      SELECT CASE( jphgr_msh )   ! type of horizontal mesh
-      !
-      CASE ( 0, 1, 4 )               ! mesh on the sphere
-         ff(:,:) = 2. * omega * SIN( rad * gphit(:,:) ) 
-         !
-      CASE ( 2 )                     ! f-plane at ppgphi0 
-         ff(:,:) = 2. * omega * SIN( rad * ppgphi0 )
-         IF(lwp) WRITE(numout,*) '          f-plane: Coriolis parameter = constant = ', ff(1,1)
-         !
-      CASE ( 3 )                     ! beta-plane
-         zbeta   = 2. * omega * COS( rad * ppgphi0 ) / ra                     ! beta at latitude ppgphi0
-         zphi0   = ppgphi0 - FLOAT( jpjglo/2) * ppe2_m *1.e-3  / ( ra * rad ) ! latitude of the first row F-points
-         zf0     = 2. * omega * SIN( rad * zphi0 )                            ! compute f0 1st point south
-         ff(:,:) = ( zf0  + zbeta * gphit(:,:) * 1.e+3 )                      ! f = f0 +beta* y ( y=0 at south)
-         IF(lwp) WRITE(numout,*) '          Beta-plane: Beta parameter = constant = ', ff(1,1)
-         IF(lwp) WRITE(numout,*) '                      Coriolis parameter varies from ', ff(1,1),' to ', ff(1,jpj)
-         !
-      CASE ( 5 )                     ! beta-plane and rotated domain
-         zbeta = 2. * omega * COS( rad * ppgphi0 ) / ra                     ! beta at latitude ppgphi0
-         zphi0 = 15.e0                                                      ! latitude of the first row F-points
-         zf0   = 2. * omega * SIN( rad * zphi0 )                            ! compute f0 1st point south
-         ff(:,:) = ( zf0 + zbeta * ABS( gphit(:,:) - zphi0 ) * rad * ra )   ! f = f0 +beta* y ( y=0 at south)
-         IF(lwp) WRITE(numout,*) '          Beta-plane: Beta parameter = constant = ', ff(1,1)
-         IF(lwp) WRITE(numout,*) '                      Coriolis parameter varies from ', ff(1,1),' to ', ff(1,jpj)
-         !
-      END SELECT
       !
    END SUBROUTINE cor_c1d
@@ -100 +74 @@
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.
-               ua(ji,jj,jk) = ua(ji,jj,jk) + ff(ji,jj) * vn(ji,jj,jk)
-               va(ji,jj,jk) = va(ji,jj,jk) - ff(ji,jj) * un(ji,jj,jk)
+               ua(ji,jj,jk) = ua(ji,jj,jk) + ff_t(ji,jj) * vn(ji,jj,jk)
+               va(ji,jj,jk) = va(ji,jj,jk) - ff_t(ji,jj) * un(ji,jj,jk)
             END DO
          END DO