Changeset 11263 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/TOP/PISCES

Timestamp:

2019-07-12T12:47:53+02:00 (5 years ago)

Author:

smasson

Message:

dev_r10984_HPC-13 : merge with trunk@11242, see #2285

Location:

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/TOP/PISCES/P4Z

Files:

• p4zpoc.F90 (modified) (2 diffs)
• p4zprod.F90 (modified) (1 diff)

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/TOP/PISCES/P4Z/p4zpoc.F90

@@ -102 +102 @@
      ! particle scheme. Does not work with Kriest parameterization.
      ! -----------------------------------------------------------------------
+     ztremint(:,:,:) = zremigoc(:,:,:)
      DO jk = 2, jpkm1
         DO jj = 1, jpj
@@ -285 +286 @@
      ! layer, this spectrum is supposed to be uniform.
      ! ---------------------------------------------------------------------
+     ztremint(:,:,:) = zremipoc(:,:,:)
      DO jk = 1, jpkm1
         DO jj = 1, jpj

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/TOP/PISCES/P4Z/p4zprod.F90

@@ -225 +225 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zprbio(ji,jj,jk) = zprbio(ji,jj,jk) * ( 1. - fr_i(ji,jj) )
-               zprdia(ji,jj,jk) = zprdia(ji,jj,jk) * ( 1. - fr_i(ji,jj) )
                zprbio(ji,jj,jk) = zprbio(ji,jj,jk) * ( 1. - fr_i(ji,jj) )
                zprdia(ji,jj,jk) = zprdia(ji,jj,jk) * ( 1. - fr_i(ji,jj) )