- Timestamp:
- 2019-11-26T16:06:55+01:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/ENHANCE-02_ISF_nemo_TEST_MERGE/src/OCE/DYN/dynspg_ts.F90
r11536 r11970 33 33 USE zdf_oce ! vertical physics: variables 34 34 USE zdfdrg ! vertical physics: top/bottom drag coef. 35 USE sbcisf ! ice shelf variable (fwfisf) 35 USE isf ! ice shelf variable (fwfisf) 36 USE isfutils 36 37 USE sbcapr ! surface boundary condition: atmospheric pressure 37 38 USE dynadv , ONLY: ln_dynadv_vec … … 338 339 ELSE ! CENTRED integration: use kt-1/2 + kt+1/2 fluxes (NOW) 339 340 zztmp = r1_rau0 * r1_2 340 zssh_frc(:,:) = zztmp * ( emp(:,:) + emp_b(:,:) - rnf(:,:) - rnf_b(:,:) + fwfisf(:,:) + fwfisf_b(:,:) ) 341 zssh_frc(:,:) = zztmp * ( emp(:,:) + emp_b(:,:) & 342 & - rnf(:,:) - rnf_b(:,:) & 343 & + fwfisf_cav(:,:) + fwfisf_cav_b(:,:) & 344 & + fwfisf_par(:,:) + fwfisf_par_b(:,:) ) 341 345 ENDIF 342 346 ! != Add Stokes drift divergence =! (if exist) … … 344 348 zssh_frc(:,:) = zssh_frc(:,:) + div_sd(:,:) 345 349 ENDIF 350 ! 351 ! ! ice sheet coupling 352 IF ( ln_isf .AND. ln_isfcpl ) THEN 353 ! 354 ! ice sheet coupling 355 IF( ln_rstart .AND. kt == nit000 ) THEN 356 zssh_frc(:,:) = zssh_frc(:,:) + risfcpl_ssh(:,:) 357 END IF 358 ! 359 ! conservation option 360 IF( ln_isfcpl_cons ) THEN 361 zssh_frc(:,:) = zssh_frc(:,:) + risfcpl_cons_ssh(:,:) 362 END IF 363 ! 364 END IF 346 365 ! 347 366 #if defined key_asminc
Note: See TracChangeset
for help on using the changeset viewer.