Changeset 6950 for branches/NERC
- Timestamp:
- 2016-09-23T15:36:33+02:00 (8 years ago)
- Location:
- branches/NERC/dev_r5840_BDY_MSK/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/NERC/dev_r5840_BDY_MSK/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90
r6948 r6950 130 130 & cn_ice_lim, nn_ice_lim_dta, & 131 131 & rn_ice_tem, rn_ice_sal, rn_ice_age, & 132 & ln_vol, nn_volctl, nn_rimwidth , nb_jpk_bdy132 & ln_vol, nn_volctl, nn_rimwidth 133 133 #endif 134 134 !!--------------------------------------------------------------------- -
branches/NERC/dev_r5840_BDY_MSK/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90
r5130 r6950 41 41 USE in_out_manager ! I/O Manager 42 42 USE iom 43 #if defined key_bdy 44 USE bdy_oce 45 #endif 43 46 !! 44 47 INTEGER :: ji, jj, jn, jproc, jarea ! dummy loop indices … … 73 76 ! read namelist for ln_zco 74 77 NAMELIST/namzgr/ ln_zco, ln_zps, ln_sco, ln_isfcav 75 78 #if defined key_bdy 79 NAMELIST/nambdy/ nb_bdy, ln_coords_file, cn_coords_file, & 80 & ln_mask_file, cn_mask_file, cn_dyn2d, nn_dyn2d_dta, & 81 & cn_dyn3d, nn_dyn3d_dta, cn_tra, nn_tra_dta, & 82 & ln_tra_dmp, ln_dyn3d_dmp, rn_time_dmp, rn_time_dmp_out, & 83 & cn_ice_lim, nn_ice_lim_dta, & 84 & rn_ice_tem, rn_ice_sal, rn_ice_age, & 85 & ln_vol, nn_volctl, nn_rimwidth 86 #endif 76 87 !!---------------------------------------------------------------------- 77 88 !! OPA 9.0 , LOCEAN-IPSL (2005) … … 137 148 imask(:,:)=1 138 149 WHERE ( zdta(:,:) - zdtaisf(:,:) <= 0. ) imask = 0 150 151 #if defined key_bdy 152 ! Adjust imask with bdy_msk if exists 153 154 REWIND( numnam_ref ) ! Namelist nambdy in reference namelist : BDY 155 READ ( numnam_ref, nambdy, IOSTAT = ios, ERR = 903) 156 903 IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in reference namelist (mppini_2)', lwp ) 157 158 REWIND( numnam_cfg ) ! Namelist nambdy in configuration namelist : BDY 159 READ ( numnam_cfg, nambdy, IOSTAT = ios, ERR = 904 ) 160 904 IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in configuration namelist (mppini_2)', lwp ) 161 IF(lwm) WRITE ( numond, namzgr ) 162 163 IF( ln_mask_file ) THEN 164 CALL iom_open( cn_mask_file, inum ) 165 CALL iom_get ( inum, jpdom_unknown, 'bdy_msk', zdta(:,:), kstart=(/jpizoom,jpjzoom/), kcount=(/jpiglo,jpjglo/) ) 166 CALL iom_close( inum ) 167 WHERE ( zdta(:,:) <= 0. ) imask = 0 168 ENDIF 169 #endif 139 170 140 171 ! 1. Dimension arrays for subdomains
Note: See TracChangeset
for help on using the changeset viewer.