Changeset 2082 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zrem.F90

Timestamp:

2010-09-10T12:32:58+02:00 (14 years ago)

Author:

cetlod

Message:

Improve the merge of TRA-TRC, see ticket #717

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zrem.F90 (modified) (1 diff)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zrem.F90

@@ -287 +287 @@
                zsatur  = ( sio3eq(ji,jj,jk) - trn(ji,jj,jk,jpsil) ) / ( sio3eq(ji,jj,jk) + rtrn )
                zsatur  = MAX( rtrn, zsatur )
-               zsatur2 = zsatur * ( 1. + tn(ji,jj,jk) / 400.)**4
-               znusil  = 0.225  * ( 1. + tn(ji,jj,jk) / 15.) * zsatur + 0.775 * zsatur2**9
+               zsatur2 = zsatur * ( 1. + tsn(ji,jj,jk,jp_tem) / 400.)**4
+               znusil  = 0.225  * ( 1. + tsn(ji,jj,jk,jp_tem) / 15.) * zsatur + 0.775 * zsatur2**9
 #    if defined key_degrad
                zsiremin = xsirem * xstep * znusil * facvol(ji,jj,jk)