Changeset 85 for trunk/NEMO/OPA_SRC/SOL/solmat.F90

Timestamp:

2004-04-22T15:35:07+02:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE052 : change logical lpXXXobc to lp_obc_XXX for Open Boundaries case

File:

• trunk/NEMO/OPA_SRC/SOL/solmat.F90 (modified) (7 diffs)

trunk/NEMO/OPA_SRC/SOL/solmat.F90

@@ -94 +94 @@
 
 #if defined key_dynspg_fsc && ! defined key_obc
-!!cr      IF( lk_dynspg_fsc .AND. .NOT.lk_obc ) THEN
+!!cr      IF( lk_dynspg_fsc .AND. .NOT.lk_obc ) THEN   !bug missing lk_dynspg_fsc_atsk
 
       ! defined the coefficients for free surface elliptic system
@@ -115 +115 @@
       
 #  elif defined key_dynspg_fsc && defined key_obc
-!!cr      ELSEIF( lk_dynspg_fsc .AND. lk_obc ) THEN
+!!cr      ELSEIF( lk_dynspg_fsc .AND. lk_obc ) THEN     !bug missing lk_dynspg_fsc_atsk 
 
       !   defined gcdmat in the case of open boundaries
@@ -123 +123 @@
             zcoef = z2dt * z2dt * grav * rnu * bmask(ji,jj)
             !  south coefficient
-            IF( ( lpsouthobc ) .AND. ( jj == njs0p1 ) ) THEN
+            IF( lp_obc_south .AND. ( jj == njs0p1 ) ) THEN
                zcoefs = -zcoef * hv(ji,jj-1) * e1v(ji,jj-1)/e2v(ji,jj-1)*(1.-vsmsk(ji,1))
             ELSE
@@ -131 +131 @@
 
             !  west coefficient
-            IF( ( lpwestobc ) .AND. ( ji == niw0p1 ) ) THEN
+            IF( lp_obc_west  .AND. ( ji == niw0p1 ) ) THEN
                zcoefw = -zcoef * hu(ji-1,jj) * e2u(ji-1,jj)/e1u(ji-1,jj)*(1.-uwmsk(jj,1))
             ELSE
@@ -139 +139 @@
 
             !   east coefficient
-            IF( ( lpeastobc ) .AND. ( ji == nie0 ) ) THEN
+            IF( lp_obc_east  .AND. ( ji == nie0 ) ) THEN
                zcoefe = -zcoef * hu(ji,jj) * e2u(ji,jj)/e1u(ji,jj)*(1.-uemsk(jj,1))
             ELSE
@@ -147 +147 @@
 
             !   north coefficient
-            IF( ( lpnorthobc ) .AND. ( jj == njn0 ) ) THEN
+            IF( lp_obc_north .AND. ( jj == njn0 ) ) THEN
                zcoefn = -zcoef * hv(ji,jj) * e1v(ji,jj)/e2v(ji,jj)*(1.-vnmsk(ji,1))
             ELSE
@@ -197 +197 @@
       ! account for the existence of the south symmetric bassin.
       
-!!cr      IF( .NOT.lk_dynspg_fsc ) THEN
+!!cr      IF( .NOT.lk_dynspg_fsc ) THEN   !bug missing lk_dynspg_fsc_atsk
 #if ! defined key_dynspg_fsc
       IF( nperio == 2 ) THEN