Changeset 5304

Timestamp:

2015-05-28T12:05:28+02:00 (9 years ago)

Author:

pabouttier

Message:

Fix bugs in eos perturbations

Location:

branches/2015/dev_r5177_CNRS4_stopar/NEMOGCM/NEMO/OPA_SRC

Files:

• TRA/eosbn2.F90 (modified) (4 diffs)
• stopts.F90 (modified) (4 diffs)

branches/2015/dev_r5177_CNRS4_stopar/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

@@ -315 +315 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk     ), INTENT(in   ) ::   pdep   ! depth                      [m]
       !
-      INTEGER  ::   ji, jj, jk, jsmp, jdof       ! dummy loop indices
+      INTEGER  ::   ji, jj, jk, jsmp             ! dummy loop indices
+      INTEGER  ::   jdof
       REAL(wp) ::   zt , zh , zstemp, zs , ztm   ! local scalars
       REAL(wp) ::   zn , zn0, zn1, zn2, zn3      !   -      -
@@ -345 +346 @@
                      ! (2) for t-dt, s-ds (with the opposite fluctuation)
                      DO jsmp = 1, nn_sto_eos*2
+                        jdof   = (jsmp + 1) / 2
                         zh     = pdep(ji,jj,jk) * r1_Z0                                  ! depth
-                        zt     = pts (ji,jj,jk,jp_tem) * r1_T0  + pts_ran(ji,jj,jk,jp_tem,jdof) * zsign(jsmp)  ! temperature
-                        zstemp = pts   (ji,jj,jk,jp_sal) + pts_ran(ji,jj,jk,jp_sal,jdof) * zsign(jsmp)
+                        zt     = (pts (ji,jj,jk,jp_tem) + pts_ran(ji,jj,jk,jp_tem,jdof) * zsign(jsmp)) * r1_T0    ! temperature
+                        zstemp = pts  (ji,jj,jk,jp_sal) + pts_ran(ji,jj,jk,jp_sal,jdof) * zsign(jsmp)
                         zs     = SQRT( ABS( zstemp + rdeltaS ) * r1_S0 )   ! square root salinity
                         ztm    = tmask(ji,jj,jk)                                         ! tmask
@@ -372 +374 @@
                            &   + (((((EOS600*zs+EOS500)*zs+EOS400)*zs+EOS300)*zs+EOS200)*zs+EOS100)*zs+EOS000
                            !
-                        zn_sto(jsmp)  = ( ( zn3 * zh + zn2 ) * zh + zn1 ) * zh + zn0
+                        zn_sto(jsmp)  = ( ( zn3 * zh + zn2 ) * zh + zn1 ) * zh + zn0_sto(jsmp)
                      END DO
-                     !
                      !
                      ! compute stochastic density as the mean of the (2*nn_sto_eos) densities
@@ -380 +381 @@
                      DO jsmp = 1, nn_sto_eos*2
                         prhop(ji,jj,jk) = prhop(ji,jj,jk) + zn0_sto(jsmp)                      ! potential density referenced at the surface
-                        ! 
+                        !
                         prd(ji,jj,jk) = prd(ji,jj,jk) + (  zn_sto(jsmp) * r1_rau0 - 1._wp  )   ! density anomaly (masked)
                      END DO

branches/2015/dev_r5177_CNRS4_stopar/NEMOGCM/NEMO/OPA_SRC/stopts.F90

@@ -20 +20 @@
 
    PUBLIC   sto_pts         ! called by step.F90
-   PUBLIC   sto_pts_init    ! called by nemogcm.F90 
+   PUBLIC   sto_pts_init    ! called by nemogcm.F90
 
    ! Public array with random tracer fluctuations
@@ -37 +37 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE sto_pts  ***
-      !!           
+      !!
       !! ** Purpose :   Compute current stochastic tracer fluctuations
       !!
@@ -84 +84 @@
 !                          & zdtskp * MAX(sto2d(ji,jj,jsto_eosk),0._wp) + &
 !                          & zdtskm * MIN(sto2d(ji,jj,jsto_eosk),0._wp)
-                    zdts   = zdts  * tmask(ji,jj,jk) *SIN( 2._wp * gphit(ji,jj) * rad )
+                    zdts   = zdts  * tmask(ji,jj,jk) *SIN( gphit(ji,jj) * rad )
                     pts_ran(ji,jj,jk,jts,jdof) = zdts * 0.5_wp
                     !
@@ -133 +133 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE sto_pts_init  ***
-      !!           
+      !!
       !! ** Purpose :   Initialisation for stochastic tracer fluctuations
       !!