Changeset 23 for trunk/NEMOGCM/NEMO/OPA_SRC/OBC/obcini.F90

Timestamp:

02/13/12 19:45:12 (12 years ago)

Author:

rblod

Message:

Add possibility to choose where to apply the barotropic correction

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/OBC/obcini.F90 (modified) (1 diff)

trunk/NEMOGCM/NEMO/OPA_SRC/OBC/obcini.F90

@@ -423 +423 @@
       ! 3.1 Total lateral surface 
       ! -------------------------
+      obcsurfeast  = 0.e0       ;       obcsurfwest  = 0.e0   
+      obcsurfnorth = 0.e0       ;       obcsurfsouth = 0.e0   
       obcsurftot = 0.e0
 
-      IF( lp_obc_east ) THEN ! ... East open boundary lateral surface
+      IF( lp_obc_east .AND. lp_obc_east_barotp_corr ) THEN ! ... East open boundary lateral surface
          DO ji = nie0, nie1
             DO jj = 1, jpj 
-               obcsurftot = obcsurftot+hu(ji,jj)*e2u(ji,jj)*uemsk(jj,1) * MAX(obctmsk(ji,jj),obctmsk(ji+1,jj) )
+               obcsurfeast = obcsurfeast+hu(ji,jj)*e2u(ji,jj)*uemsk(jj,1) * MAX(obctmsk(ji,jj),obctmsk(ji+1,jj) )
             END DO
          END DO
-      END IF
-
-      IF( lp_obc_west ) THEN ! ... West open boundary lateral surface
+         obcsurftot = obcsurftot + obcsurfeast
+      END IF
+
+      IF( lp_obc_west .AND. lp_obc_west_barotp_corr ) 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) )
+               obcsurfwest = obcsurfwest+hu(ji,jj)*e2u(ji,jj)*uwmsk(jj,1) * MAX(obctmsk(ji,jj),obctmsk(ji+1,jj) )
             END DO
          END DO
-      END IF
-
-      IF( lp_obc_north ) THEN ! ... North open boundary lateral surface
+         obcsurftot = obcsurftot + obcsurfwest
+      END IF
+
+      IF( lp_obc_north .AND. lp_obc_north_barotp_corr ) THEN ! ... North open boundary lateral surface
          DO jj = njn0, njn1
             DO ji = 1, jpi
-               obcsurftot = obcsurftot+hv(ji,jj)*e1v(ji,jj)*vnmsk(ji,1) * MAX(obctmsk(ji,jj),obctmsk(ji,jj+1) )
+               obcsurfnorth = obcsurfnorth+hv(ji,jj)*e1v(ji,jj)*vnmsk(ji,1) * MAX(obctmsk(ji,jj),obctmsk(ji,jj+1) )
             END DO
          END DO
-      END IF
-
-      IF( lp_obc_south ) THEN ! ... South open boundary lateral surface
+         obcsurftot = obcsurftot + obcsurfnorth
+      END IF
+
+      IF( lp_obc_south .AND. lp_obc_south_barotp_corr ) THEN ! ... South open boundary lateral surface
          DO jj = njs0, njs1
             DO ji = 1, jpi
-               obcsurftot = obcsurftot+hv(ji,jj)*e1v(ji,jj)*vsmsk(ji,1) * MAX(obctmsk(ji,jj),obctmsk(ji,jj+1) )
+               obcsurfsouth = obcsurfsouth+hv(ji,jj)*e1v(ji,jj)*vsmsk(ji,1) * MAX(obctmsk(ji,jj),obctmsk(ji,jj+1) )
             END DO
          END DO
+         obcsurftot = obcsurftot + obcsurfsouth
       END IF