Changeset 1858 for branches/DEV_r1837_mass_heat_salt_fluxes/NEMO/OPA_SRC/TRA/traqsr.F90

Timestamp:

2010-05-04T10:39:48+02:00 (14 years ago)

Author:

gm

Message:

ticket:#665 : step 1 - heat content of freezing-melting ice

File:

• branches/DEV_r1837_mass_heat_salt_fluxes/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) (4 diffs)

branches/DEV_r1837_mass_heat_salt_fluxes/NEMO/OPA_SRC/TRA/traqsr.F90

@@ -120 +120 @@
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
-                  ta(ji,jj,jk) = ta(ji,jj,jk) + ro0cpr * ( etot3(ji,jj,jk) - etot3(ji,jj,jk+1) ) / fse3t(ji,jj,jk) 
+                  ta(ji,jj,jk) = ta(ji,jj,jk) + r1_rau0_rcp * ( etot3(ji,jj,jk) - etot3(ji,jj,jk+1) ) / fse3t(ji,jj,jk)
                END DO
             END DO
@@ -177 +177 @@
                !
                DO jk = 1, nksr                                        ! compute and add qsr trend to ta
-                  ta(:,:,jk) = ta(:,:,jk) + ro0cpr * ( zea(:,:,jk) - zea(:,:,jk+1) ) / fse3t(:,:,jk)
+                  ta(:,:,jk) = ta(:,:,jk) + r1_rau0_rcp * ( zea(:,:,jk) - zea(:,:,jk+1) ) / fse3t(:,:,jk)
                END DO
                zea(:,:,nksr+1:jpk) = 0.e0     ! below 400m set to zero
@@ -377 +377 @@
                !
                DO jk = 1, nksr
-                  etot3(:,:,jk) = ro0cpr * ( zea(:,:,jk) - zea(:,:,jk+1) ) / fse3t(:,:,jk)
+                  etot3(:,:,jk) = r1_rau0_rcp * ( zea(:,:,jk) - zea(:,:,jk+1) ) / fse3t(:,:,jk)
                END DO
                etot3(:,:,nksr+1:jpk) = 0.e0                ! below 400m set to zero
@@ -399 +399 @@
                      zc0 = rn_abs * EXP( -fsdepw(ji,jj,jk  )*zsi0r ) + (1.-rn_abs) * EXP( -fsdepw(ji,jj,jk  )*zsi1r )
                      zc1 = rn_abs * EXP( -fsdepw(ji,jj,jk+1)*zsi0r ) + (1.-rn_abs) * EXP( -fsdepw(ji,jj,jk+1)*zsi1r )
-                     etot3(ji,jj,jk) = ro0cpr * (  zc0 * tmask(ji,jj,jk) - zc1 * tmask(ji,jj,jk+1)  ) / fse3t(ji,jj,jk)
+                     etot3(ji,jj,jk) = r1_rau0_rcp * ( zc0 * tmask(ji,jj,jk) - zc1 * tmask(ji,jj,jk+1) ) / fse3t(ji,jj,jk)
                   END DO
                END DO