- Timestamp:
- 2015-04-17T11:50:03+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90
r5120 r5220 64 64 DO jj = 1, jpj 65 65 DO ji = 1, jpi 66 zts(ji,jj,jp_tem) = ts n(ji,jj,mikt(ji,jj),jp_tem)67 zts(ji,jj,jp_sal) = ts n(ji,jj,mikt(ji,jj),jp_sal)66 zts(ji,jj,jp_tem) = tsb(ji,jj,mikt(ji,jj),jp_tem) 67 zts(ji,jj,jp_sal) = tsb(ji,jj,mikt(ji,jj),jp_sal) 68 68 END DO 69 69 END DO … … 84 84 sss_m(:,:) = zts(:,:,jp_sal) 85 85 ! ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics) 86 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = ssh n(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )87 ELSE ; ssh_m(:,:) = ssh n(:,:)86 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 87 ELSE ; ssh_m(:,:) = sshb(:,:) 88 88 ENDIF 89 89 ! … … 104 104 sss_m(:,:) = zcoef * zts(:,:,jp_sal) 105 105 ! ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics) 106 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = zcoef * ( ssh n(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) )107 ELSE ; ssh_m(:,:) = zcoef * ssh n(:,:)106 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = zcoef * ( sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) ) 107 ELSE ; ssh_m(:,:) = zcoef * sshb(:,:) 108 108 ENDIF 109 109 ! … … 129 129 sss_m(:,:) = sss_m(:,:) + zts(:,:,jp_sal) 130 130 ! ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics) 131 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = ssh_m(:,:) + ssh n(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )132 ELSE ; ssh_m(:,:) = ssh_m(:,:) + ssh n(:,:)131 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = ssh_m(:,:) + sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 132 ELSE ; ssh_m(:,:) = ssh_m(:,:) + sshb(:,:) 133 133 ENDIF 134 134 !
Note: See TracChangeset
for help on using the changeset viewer.