Changeset 2207 for branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/cla_dynspg.F90

Timestamp:

2010-10-11T18:51:54+02:00 (14 years ago)

Author:

acc

Message:

#733 DEV_r2191_3partymerge2010. Merged in changes from devukmo2010 branch

File:

• branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/cla_dynspg.F90 (modified) (5 diffs)

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/cla_dynspg.F90

@@ -79 +79 @@
       ! EMP on Mediterranean Sea and Red Sea 
       ! ------------------------------------
-      ! compute the emp in Mediterranean Sea
+      ! compute the (emp-rnf) in Mediterranean Sea
       zempmed = 0.e0
       zwei = 0.e0
@@ -87 +87 @@
          DO ji = mi0(ii0),mi1(ii1)
             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
@@ -97 +97 @@
       DO jj = mj0(ij0), mj1(ij1)
          DO ji = mi0(ii0),mi1(ii1)
-            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
@@ -104 +104 @@
       zempmed = zempmed * 1.e-3
 
-      ! compute the emp in Red Sea   
+      ! compute the (emp-rnf) in Red Sea   
       zempred = 0.e0
       zwei = 0.e0
@@ -112 +112 @@
          DO ji = mi0(ii0),mi1(ii1)
             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