Changeset 1938 for branches/DEV_R1821_Rivers/NEMO/OPA_SRC/cla_div.F90

Timestamp:

2010-06-16T16:34:29+02:00 (14 years ago)

Author:

rfurner

Message:

rnf has been separated from emp and emps. Also temperature and salinity of runoff can be specified, and runoff can be added to a user specified depth

File:

• branches/DEV_R1821_Rivers/NEMO/OPA_SRC/cla_div.F90 (modified) (3 diffs)

branches/DEV_R1821_Rivers/NEMO/OPA_SRC/cla_div.F90

@@ -124 +124 @@
          DO ji = mi0(148), mi1(160) 
             zwei    = tmask(ji,jj,1) * e1t(ji,jj) * e2t(ji,jj)
-            zempred = zempred + emp(ji,jj) * zwei
+            zempred = zempred + ( emp(ji,jj) - rnf(ji,jj) ) * zwei 
          END DO
       END DO
@@ -234 +234 @@
          DO ji = mi0(141),mi1(181)
             zwei    = tmask(ji,jj,1) * e1t(ji,jj) * e2t(ji,jj)
-            zempmed = zempmed + emp(ji,jj) * zwei
+            zempmed = zempmed + ( emp(ji,jj) - rnf(ji,jj) ) * zwei 
          END DO
       END DO
@@ -242 +242 @@
       DO jj = mj0(96), mj1(96)
          DO ji = mi0(148),mi1(148)
-            zempmed = zempmed -  emp(ji  , jj) * tmask(ji  , jj,1) * e1t(ji  , jj) * e2t(ji  , jj)   &
-                              -  emp(ji+1, jj) * tmask(ji+1, jj,1) * e1t(ji+1, jj) * e2t(ji+1, jj)   
+            zempmed = zempmed -  ( emp(ji  , jj) - rnf(ji  ,jj) ) * tmask(ji  , jj,1) * e1t(ji  , jj) * e2t(ji  , jj)   & 
+                              -  ( emp(ji+1, jj) - rnf(ji+1,jj) ) * tmask(ji+1, jj,1) * e1t(ji+1, jj) * e2t(ji+1, jj)    
          END DO
       END DO