Changeset 7439 for branches/2016/dev_merge_2016
- Timestamp:
- 2016-12-02T12:17:06+01:00 (8 years ago)
- Location:
- branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90
r7421 r7439 95 95 !! 96 96 NAMELIST/namlbc/ rn_shlat, ln_vorlat 97 NAMELIST/nambdy/ ln_bdy ,nb_bdy, ln_coords_file, cn_coords_file, &98 & ln_mask_file, cn_mask_file, cn_dyn2d, nn_dyn2d_dta, &99 & cn_dyn3d, nn_dyn3d_dta, cn_tra, nn_tra_dta, &100 & ln_tra_dmp, ln_dyn3d_dmp, rn_time_dmp, rn_time_dmp_out, &101 & cn_ice_lim, nn_ice_lim_dta, &102 & rn_ice_tem, rn_ice_sal, rn_ice_age, &103 & ln_vol, nn_volctl, nn_rimwidth, nb_jpk_bdy104 97 !!--------------------------------------------------------------------- 105 98 ! … … 149 142 !SF add here lbc_lnk: bug not still understood : cause now domain configuration is read ! 150 143 !!gm I don't understand why... 151 CALL lbc_lnk( tmask , 'T', 1._wp ) ! Lateral boundary conditions 152 144 CALL lbc_lnk( tmask , 'T', 1._wp ) ! Lateral boundary conditions 145 146 ! Mask corrections for bdy (read in mppini2) 147 ! ------------------------ 148 IF ( ln_bdy .AND. ln_mask_file ) THEN 149 DO jk = 1, jpkm1 150 DO jj = 1, jpj 151 DO ji = 1, jpi 152 tmask(ji,jj,jk) = tmask(ji,jj,jk) * bdytmask(ji,jj) 153 END DO 154 END DO 155 END DO 156 ENDIF 157 153 158 ! Ocean/land mask at u-, v-, and f-points (computed from tmask) 154 159 ! ---------------------------------------- -
branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r7437 r7439 33 33 USE dynvor ! vorticity term 34 34 USE wet_dry ! wetting/drying flux limter 35 USE bdy_oce ! open boundary 35 36 USE bdytides ! open boundary condition data 36 37 USE bdydyn2d ! open boundary conditions on barotropic variables -
branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90
r7430 r7439 67 67 ibne , ibnw , ibse , ibsw ! " " 68 68 INTEGER, DIMENSION(jpiglo,jpjglo) :: imask ! global workspace 69 REAL(wp), DIMENSION(jpiglo,jpjglo) :: zbot, ztop , zdta! global workspace69 REAL(wp), DIMENSION(jpiglo,jpjglo) :: zbot, ztop ! global workspace 70 70 REAL(wp) :: zidom , zjdom ! local scalars 71 71 NAMELIST/nambdy/ ln_bdy, nb_bdy, ln_coords_file, cn_coords_file, & … … 116 116 IF( ln_bdy .AND. ln_mask_file ) THEN 117 117 CALL iom_open( cn_mask_file, inum ) 118 CALL iom_get ( inum, jpdom_ unknown, 'bdy_msk', zdta(:,:) )118 CALL iom_get ( inum, jpdom_data, 'bdy_msk', bdytmask(:,:) ) 119 119 CALL iom_close( inum ) 120 WHERE ( zdta(:,:) <= 0. ) imask = 0120 WHERE ( bdytmask(:,:) <= 0. ) imask = 0 121 121 ENDIF 122 122
Note: See TracChangeset
for help on using the changeset viewer.