Changeset 5223 for branches/2015/dev_r5218_CNRS17_coupling

Timestamp:

2015-04-17T14:31:07+02:00 (9 years ago)

Author:

smasson

Message:

dev_r5218_CNRS17_coupling: keep exact same results with old version

File:

• branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) (4 diffs)

branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90

@@ -62 +62 @@
       
       !                                        !* surface T-, U-, V- ocean level variables (T, S, depth, velocity)
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-            zts(ji,jj,jp_tem) = tsb(ji,jj,mikt(ji,jj),jp_tem)
-            zts(ji,jj,jp_sal) = tsb(ji,jj,mikt(ji,jj),jp_sal)
+      IF( nn_components == jp_iam_opa ) THEN
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               zts(ji,jj,jp_tem) = tsb(ji,jj,mikt(ji,jj),jp_tem)
+               zts(ji,jj,jp_sal) = tsb(ji,jj,mikt(ji,jj),jp_sal)
+            END DO
          END DO
-      END DO
+      ELSE
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               zts(ji,jj,jp_tem) = tsb(ji,jj,mikt(ji,jj),jp_tem)
+               zts(ji,jj,jp_sal) = tsb(ji,jj,mikt(ji,jj),jp_sal)
+            END DO
+         END DO
+      ENDIF
       zub(:,:)        = ub (:,:,1       )
       zvb(:,:)        = vb (:,:,1       )
@@ -84 +93 @@
          sss_m(:,:) = zts(:,:,jp_sal)
          !                          ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics)
-         IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )
-         ELSE                    ;   ssh_m(:,:) = sshb(:,:)
+         IF( nn_components == jp_iam_opa ) THEN
+            IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )
+            ELSE                    ;   ssh_m(:,:) = sshb(:,:)
+            ENDIF
+         ELSE
+            IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )
+            ELSE                    ;   ssh_m(:,:) = sshn(:,:)
+            ENDIF
          ENDIF
          !
@@ -104 +119 @@
             sss_m(:,:) = zcoef * zts(:,:,jp_sal)
             !                          ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics)
-            IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = zcoef * ( sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) )
-            ELSE                    ;   ssh_m(:,:) = zcoef * sshb(:,:)
+            IF( nn_components == jp_iam_opa ) THEN
+               IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = zcoef * ( sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) )
+               ELSE                    ;   ssh_m(:,:) = zcoef * sshb(:,:)
+               ENDIF
+            ELSE
+               IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = zcoef * ( sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) )
+               ELSE                    ;   ssh_m(:,:) = zcoef * sshn(:,:)
+               ENDIF
             ENDIF
             !
@@ -129 +150 @@
          sss_m(:,:) = sss_m(:,:) + zts(:,:,jp_sal)
          !                          ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics)
-         IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = ssh_m(:,:) + sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )
-         ELSE                    ;   ssh_m(:,:) = ssh_m(:,:) + sshb(:,:)
+         IF( nn_components == jp_iam_opa ) THEN
+            IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = ssh_m(:,:) + sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )
+            ELSE                    ;   ssh_m(:,:) = ssh_m(:,:) + sshb(:,:)
+            ENDIF
+         ELSE
+            IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = ssh_m(:,:) + sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )
+            ELSE                    ;   ssh_m(:,:) = ssh_m(:,:) + sshb(:,:)
+            ENDIF
          ENDIF
          !