Changeset 10794

Timestamp:

2019-03-22T10:25:28+01:00 (5 years ago)

Author:

cetlod

Message:

trunk : minor bugfix in PISCES

Location:

NEMO/trunk/src/TOP/PISCES

Files:

• P4Z/p4zsbc.F90 (modified) (1 diff)
• trcice_pisces.F90 (modified) (5 diffs)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zsbc.F90

@@ -108 +108 @@
          IF( kt == nit000 .OR. ( kt /= nit000 .AND. ntimes_dust > 1 ) ) THEN
             CALL fld_read( kt, 1, sf_dust )
-            dust(:,:) = MAX( rtrn, sf_dust(1)%fnow(:,:,1) ) * ( 1.0 - fr_i(ji,jj) )
+            dust(:,:) = MAX( rtrn, sf_dust(1)%fnow(:,:,1) ) * ( 1.0 - fr_i(:,:) )
          ENDIF
       ENDIF

NEMO/trunk/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
@@ -270 +274 @@
 !     is activated, ln_ironice should be set to false
 !     ------------------------------------------------------------------------
-      IF( nn_ice_tr >= 0 .AND. ln_ironice ) THEN
+      IF( nn_ice_tr /= 0 .AND. ln_ironice ) THEN
          IF(lwp) THEN
             WRITE(numout,*) '   ==>>>   ln_ironice incompatible with nn_ice_tr = ', nn_ice_tr