Changeset 6041 for branches/2015/dev_r5776_UKMO2_OBS_efficiency_improvs/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90
- Timestamp:
- 2015-12-14T10:06:06+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5776_UKMO2_OBS_efficiency_improvs/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90
r5506 r6041 74 74 a_salb = 0.e0 ! valeur de sal au debut de la simulation 75 75 ! sshb used because diafwb called after tranxt (i.e. after the swap) 76 a_sshb = SUM( e1 t(:,:) *e2t(:,:) * sshb(:,:) * tmask_i(:,:) )76 a_sshb = SUM( e1e2t(:,:) * sshb(:,:) * tmask_i(:,:) ) 77 77 IF( lk_mpp ) CALL mpp_sum( a_sshb ) ! sum over the global domain 78 78 … … 80 80 DO jj = 2, jpjm1 81 81 DO ji = fs_2, fs_jpim1 ! vector opt. 82 zwei = e1 t(ji,jj) *e2t(ji,jj) * fse3t(ji,jj,jk) * tmask(ji,jj,jk) * tmask_i(ji,jj)82 zwei = e1e2t(ji,jj) * fse3t(ji,jj,jk) * tmask(ji,jj,jk) * tmask_i(ji,jj) 83 83 a_salb = a_salb + ( tsb(ji,jj,jk,jp_sal) - zsm0 ) * zwei 84 84 END DO … … 88 88 ENDIF 89 89 90 a_fwf = SUM( e1 t(:,:) *e2t(:,:) * ( emp(:,:)-rnf(:,:) ) * tmask_i(:,:) )90 a_fwf = SUM( e1e2t(:,:) * ( emp(:,:)-rnf(:,:) ) * tmask_i(:,:) ) 91 91 IF( lk_mpp ) CALL mpp_sum( a_fwf ) ! sum over the global domain 92 92 … … 98 98 zfwfnew = 0.e0 99 99 ! Mean sea level at nitend 100 a_sshn = SUM( e1 t(:,:) *e2t(:,:) * sshn(:,:) * tmask_i(:,:) )100 a_sshn = SUM( e1e2t(:,:) * sshn(:,:) * tmask_i(:,:) ) 101 101 IF( lk_mpp ) CALL mpp_sum( a_sshn ) ! sum over the global domain 102 zarea = SUM( e1 t(:,:) *e2t(:,:) * tmask_i(:,:) )102 zarea = SUM( e1e2t(:,:) * tmask_i(:,:) ) 103 103 IF( lk_mpp ) CALL mpp_sum( zarea ) ! sum over the global domain 104 104 … … 106 106 DO jj = 2, jpjm1 107 107 DO ji = fs_2, fs_jpim1 ! vector opt. 108 zwei = e1 t(ji,jj) *e2t(ji,jj) * fse3t(ji,jj,jk) * tmask(ji,jj,jk) * tmask_i(ji,jj)108 zwei = e1e2t(ji,jj) * fse3t(ji,jj,jk) * tmask(ji,jj,jk) * tmask_i(ji,jj) 109 109 a_saln = a_saln + ( tsn(ji,jj,jk,jp_sal) - zsm0 ) * zwei 110 110 zvol = zvol + zwei
Note: See TracChangeset
for help on using the changeset viewer.