Changeset 2208 for branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/OBC/obcini.F90

Timestamp:

2010-10-12T11:20:53+02:00 (14 years ago)

Author:

rblod

Message:

Put FCM NEMO code changes in DEV_r2191_3partymerge2010 branch

File:

• branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/OBC/obcini.F90 (modified) (3 diffs)

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/OBC/obcini.F90

@@ -33 +33 @@
    !! NEMO/OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Id$ 
-   !! software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! software governed by the CeCILL licence  (NEMOGCM/License_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -427 +427 @@
                obcsurftot = obcsurftot+hu(ji,jj)*e2u(ji,jj)*uemsk(jj,1) * MAX(obctmsk(ji,jj),obctmsk(ji+1,jj) )
             END DO
+<<<<<<< .working
          END DO
       END IF
@@ -434 +435 @@
             DO jj = 1, jpj 
                obcsurftot = obcsurftot+hu(ji,jj)*e2u(ji,jj)*uwmsk(jj,1) * MAX(obctmsk(ji,jj),obctmsk(ji+1,jj) )
+=======
+         END DO
+      END IF
+      IF( lp_obc_west ) THEN ! ... West open boundary lateral surface
+         DO ji = niw0, niw1
+            DO jj = 1, jpj 
+               obcsurftot = obcsurftot+hu(ji,jj)*e2u(ji,jj)*uwmsk(jj,1) * MAX(obctmsk(ji,jj),obctmsk(ji+1,jj) )
+>>>>>>> .merge-right.r2207
             END DO
          END DO