Changeset 2789 for branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90

Timestamp:

2011-06-27T13:18:25+02:00 (13 years ago)

Author:

cetlod

Message:

Implementation of the merge of TRA/TRP : first guess, see ticket #842

File:

• branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 (modified) (3 diffs)

branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90

@@ -64 +64 @@
          ssu_m(:,:) = ub(:,:,1)
          ssv_m(:,:) = vb(:,:,1)
-         sst_m(:,:) = tn(:,:,1)
-         sss_m(:,:) = sn(:,:,1)
+         sst_m(:,:) = tsn(:,:,1,jp_tem)
+         sss_m(:,:) = tsn(:,:,1,jp_sal)
          !                          ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics)
          IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )
@@ -104 +104 @@
                ssu_m(:,:) = zcoef * ub(:,:,1)
                ssv_m(:,:) = zcoef * vb(:,:,1)
-               sst_m(:,:) = zcoef * tn(:,:,1)
-               sss_m(:,:) = zcoef * sn(:,:,1)
+               sst_m(:,:) = zcoef * tsn(:,:,1,jp_tem)
+               sss_m(:,:) = zcoef * tsn(:,:,1,jp_sal)
                !                          ! removed inverse barometer ssh when Patm forcing is used 
                IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = zcoef * ( sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) )
@@ -126 +126 @@
          ssu_m(:,:) = ssu_m(:,:) + ub(:,:,1)
          ssv_m(:,:) = ssv_m(:,:) + vb(:,:,1)
-         sst_m(:,:) = sst_m(:,:) + tn(:,:,1)
-         sss_m(:,:) = sss_m(:,:) + sn(:,:,1)
+         sst_m(:,:) = sst_m(:,:) + tsn(:,:,1,jp_tem)
+         sss_m(:,:) = sss_m(:,:) + tsn(:,:,1,jp_sal)
          !                          ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics)
          IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = ssh_m(:,:) + sshn(:,:) - 0.5 *  ( ssh_ib(:,:) + ssh_ibb(:,:) )