Changeset 11822 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/trcice_pisces.F90

Timestamp:

2019-10-29T11:41:36+01:00 (4 years ago)

Author:

acc

Message:

Branch 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. Sette tested updates to branch to align with trunk changes between 10721 and 11740. Sette tests are passing but results differ from branch before these changes (except for GYRE_PISCES and VORTEX) and branch results already differed from trunk because of algorithmic fixes. Will need more checks to confirm correctness.

File:

• NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/trcice_pisces.F90 (modified) (7 diffs)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/trcice_pisces.F90

@@ -119 +119 @@
       zpisc(jpno3,1) =  5.79e-6_wp / rno3 
       zpisc(jpnh4,1) =  3.22e-7_wp / rno3
+      zpisc(jplgw,1) =  1.0e-9_wp
 
       ! ln_p5z
@@ -162 +163 @@
       zpisc(jpno3,2) =  3.51e-06_wp / rno3 
       zpisc(jpnh4,2) =  6.15e-08_wp / rno3 
+      zpisc(jplgw,2) =  1.0e-9_wp
 
       ! ln_p5z
@@ -205 +207 @@
       zpisc(jpno3,3) =  2.64e-5_wp / rno3  
       zpisc(jpnh4,3) =  3.39e-7_wp / rno3  
+      zpisc(jplgw,3) =  1.0e-9_wp
 
       ! ln_p5z
@@ -249 +252 @@
       zpisc(jpno3,4) = 5.36e-5_wp / rno3
       zpisc(jpnh4,4) = 7.18e-7_wp / rno3
+      zpisc(jplgw,4) = 1.0e-9_wp
 
       ! ln_p5z
@@ -266 +270 @@
       zpisc(jpgon,4) =  1.05e-8_wp
       zpisc(jpgop,4) =  1.05e-8_wp
- 
+!
+!     ln_ironice and tracers in seaice are redundant. Thus, if tracers in ice
+!     is activated, ln_ironice should be set to false
+!     ------------------------------------------------------------------------
+      IF( nn_ice_tr /= 0 .AND. ln_ironice ) THEN
+         IF(lwp) THEN
+            WRITE(numout,*) '   ==>>>   ln_ironice incompatible with nn_ice_tr = ', nn_ice_tr
+            WRITE(numout,*) '           Specify your sea ice iron concentration in nampisice instead '
+            WRITE(numout,*) '           ln_ironice is forced to .FALSE. '
+         ENDIF
+         ln_ironice = .FALSE.
+      ENDIF
+! 
       DO jn = jp_pcs0, jp_pcs1
          IF( cn_trc_o(jn) == 'GL ' ) trc_o(:,:,jn) = zpisc(jn,1)  ! Global case
@@ -310 +326 @@
             trc_i(:,:,jn) = trc_ice_prescr(jn)
          ENDIF
-       
          !-- Baltic
          IF( cn_cfg == "orca" .OR. cn_cfg == "ORCA" ) THEN     
@@ -318 +333 @@
                      trc_i(:,:,jn) = zratio(jn,2) * trc_o(:,:,jn) 
                END WHERE
-            ELSE                                 ! prescribed tracer concentration in ice
-               WHERE( 14._wp <= glamt(:,:) .AND. glamt(:,:) <= 32._wp .AND.    &
-                   54._wp <= gphit(:,:) .AND. gphit(:,:) <= 66._wp )
-                     trc_i(:,:,jn) = trc_ice_prescr(jn)
-               END WHERE
-            ENDIF ! trc_ice_ratio
+            ENDIF
          ENDIF
       !