- Timestamp:
- 2015-11-06T11:42:35+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
r5845 r5866 109 109 IF( ln_trabbc ) z_frc_trd_t = z_frc_trd_t + glob_sum( qgh_trd0(:,:) * surf(:,:) ) 110 110 ! 111 IF( .NOT. lk_vvl) THEN111 IF( ln_linssh ) THEN 112 112 IF ( ln_isfcav ) THEN 113 113 DO ji=1,jpi … … 129 129 frc_s = frc_s + z_frc_trd_s * rdt 130 130 ! ! Advection flux through fixed surface (z=0) 131 IF( .NOT. lk_vvl) THEN131 IF( ln_linssh ) THEN 132 132 frc_wn_t = frc_wn_t + z_wn_trd_t * rdt 133 133 frc_wn_s = frc_wn_s + z_wn_trd_s * rdt … … 145 145 146 146 ! heat & salt content variation (associated with ssh) 147 IF( .NOT. lk_vvl) THEN147 IF( ln_linssh ) THEN 148 148 IF ( ln_isfcav ) THEN 149 149 DO ji = 1, jpi … … 175 175 ! Substract forcing from heat content, salt content and volume variations 176 176 zdiff_v1 = zdiff_v1 - frc_v 177 IF( lk_vvl) zdiff_v2 = zdiff_v2 - frc_v177 IF( .NOT.ln_linssh ) zdiff_v2 = zdiff_v2 - frc_v 178 178 zdiff_hc = zdiff_hc - frc_t 179 179 zdiff_sc = zdiff_sc - frc_s 180 IF( .NOT. lk_vvl) THEN180 IF( ln_linssh ) THEN 181 181 zdiff_hc1 = zdiff_hc + z_ssh_hc 182 182 zdiff_sc1 = zdiff_sc + z_ssh_sc … … 194 194 195 195 !!gm to be added ? 196 ! IF( .NOT. lk_vvl) THEN ! fixed volume, add the ssh contribution196 ! IF( ln_linssh ) THEN ! fixed volume, add the ssh contribution 197 197 ! zvol_tot = zvol_tot + glob_sum( surf(:,:) * sshn(:,:) ) 198 198 ! ENDIF 199 199 !!gm end 200 200 201 IF( lk_vvl) THEN201 IF( .NOT.ln_linssh ) THEN 202 202 CALL iom_put( 'bgtemper' , zdiff_hc / zvol_tot ) ! Temperature variation (C) 203 203 CALL iom_put( 'bgsaline' , zdiff_sc / zvol_tot ) ! Salinity variation (psu) … … 256 256 CALL iom_get( numror, 'frc_t', frc_t ) 257 257 CALL iom_get( numror, 'frc_s', frc_s ) 258 IF( .NOT. lk_vvl) THEN258 IF( ln_linssh ) THEN 259 259 CALL iom_get( numror, 'frc_wn_t', frc_wn_t ) 260 260 CALL iom_get( numror, 'frc_wn_s', frc_wn_s ) … … 264 264 CALL iom_get( numror, jpdom_autoglo, 'hc_loc_ini', hc_loc_ini ) 265 265 CALL iom_get( numror, jpdom_autoglo, 'sc_loc_ini', sc_loc_ini ) 266 IF( .NOT. lk_vvl) THEN266 IF( ln_linssh ) THEN 267 267 CALL iom_get( numror, jpdom_autoglo, 'ssh_hc_loc_ini', ssh_hc_loc_ini ) 268 268 CALL iom_get( numror, jpdom_autoglo, 'ssh_sc_loc_ini', ssh_sc_loc_ini ) … … 281 281 frc_t = 0._wp ! heat content - - - - 282 282 frc_s = 0._wp ! salt content - - - - 283 IF( .NOT. lk_vvl) THEN283 IF( ln_linssh ) THEN 284 284 IF ( ln_isfcav ) THEN 285 285 DO ji=1,jpi … … 307 307 CALL iom_rstput( kt, nitrst, numrow, 'frc_t' , frc_t ) 308 308 CALL iom_rstput( kt, nitrst, numrow, 'frc_s' , frc_s ) 309 IF( .NOT. lk_vvl) THEN309 IF( ln_linssh ) THEN 310 310 CALL iom_rstput( kt, nitrst, numrow, 'frc_wn_t', frc_wn_t ) 311 311 CALL iom_rstput( kt, nitrst, numrow, 'frc_wn_s', frc_wn_s ) … … 315 315 CALL iom_rstput( kt, nitrst, numrow, 'hc_loc_ini', hc_loc_ini ) 316 316 CALL iom_rstput( kt, nitrst, numrow, 'sc_loc_ini', sc_loc_ini ) 317 IF( .NOT. lk_vvl) THEN317 IF( ln_linssh ) THEN 318 318 CALL iom_rstput( kt, nitrst, numrow, 'ssh_hc_loc_ini', ssh_hc_loc_ini ) 319 319 CALL iom_rstput( kt, nitrst, numrow, 'ssh_sc_loc_ini', ssh_sc_loc_ini ) … … 384 384 ENDIF 385 385 386 IF( .NOT. lk_vvl )ALLOCATE( ssh_hc_loc_ini(jpi,jpj), ssh_sc_loc_ini(jpi,jpj),STAT=ierror )386 IF( ln_linssh ) ALLOCATE( ssh_hc_loc_ini(jpi,jpj), ssh_sc_loc_ini(jpi,jpj),STAT=ierror ) 387 387 IF( ierror > 0 ) THEN 388 388 CALL ctl_stop( 'dia_hsb: unable to allocate hc_loc_ini' ) ; RETURN
Note: See TracChangeset
for help on using the changeset viewer.