- Timestamp:
- 2017-10-05T16:44:46+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icedyn_rdgrft.F90
r8565 r8597 253 253 CALL tab_3d_2d( npti, nptidx(1:npti), sv_i_2d(1:npti,1:jpl), sv_i(:,:,:) ) 254 254 CALL tab_3d_2d( npti, nptidx(1:npti), oa_i_2d(1:npti,1:jpl), oa_i(:,:,:) ) 255 IF ( nn_pnd_scheme > 0 ) THEN 256 CALL tab_3d_2d( npti, nptidx(1:npti), a_ip_2d(1:npti,1:jpl), a_ip(:,:,:) ) 257 CALL tab_3d_2d( npti, nptidx(1:npti), v_ip_2d(1:npti,1:jpl), v_ip(:,:,:) ) 258 ENDIF 255 CALL tab_3d_2d( npti, nptidx(1:npti), a_ip_2d(1:npti,1:jpl), a_ip(:,:,:) ) 256 CALL tab_3d_2d( npti, nptidx(1:npti), v_ip_2d(1:npti,1:jpl), v_ip(:,:,:) ) 259 257 DO jl = 1, jpl 260 258 DO jk = 1, nlay_s … … 270 268 CALL tab_2d_1d( npti, nptidx(1:npti), hfx_dyn_1d (1:npti), hfx_dyn (:,:) ) 271 269 CALL tab_2d_1d( npti, nptidx(1:npti), wfx_snw_dyn_1d(1:npti), wfx_snw_dyn(:,:) ) 272 IF ( nn_pnd_scheme > 0 ) THEN 273 CALL tab_2d_1d( npti, nptidx(1:npti), wfx_pnd_1d(1:npti), wfx_pnd(:,:) ) 274 ENDIF 270 CALL tab_2d_1d( npti, nptidx(1:npti), wfx_pnd_1d(1:npti), wfx_pnd(:,:) ) 275 271 276 272 !-----------------------------------------------------------------------------! … … 320 316 CALL tab_2d_3d( npti, nptidx(1:npti), sv_i_2d(1:npti,1:jpl), sv_i(:,:,:) ) 321 317 CALL tab_2d_3d( npti, nptidx(1:npti), oa_i_2d(1:npti,1:jpl), oa_i(:,:,:) ) 322 IF ( nn_pnd_scheme > 0 ) THEN 323 CALL tab_2d_3d( npti, nptidx(1:npti), a_ip_2d(1:npti,1:jpl), a_ip(:,:,:) ) 324 CALL tab_2d_3d( npti, nptidx(1:npti), v_ip_2d(1:npti,1:jpl), v_ip(:,:,:) ) 325 ENDIF 318 CALL tab_2d_3d( npti, nptidx(1:npti), a_ip_2d(1:npti,1:jpl), a_ip(:,:,:) ) 319 CALL tab_2d_3d( npti, nptidx(1:npti), v_ip_2d(1:npti,1:jpl), v_ip(:,:,:) ) 326 320 DO jl = 1, jpl 327 321 DO jk = 1, nlay_s … … 337 331 CALL tab_1d_2d( npti, nptidx(1:npti), hfx_dyn_1d (1:npti), hfx_dyn (:,:) ) 338 332 CALL tab_1d_2d( npti, nptidx(1:npti), wfx_snw_dyn_1d(1:npti), wfx_snw_dyn(:,:) ) 339 IF ( nn_pnd_scheme > 0 ) THEN 340 CALL tab_1d_2d( npti, nptidx(1:npti), wfx_pnd_1d(1:npti), wfx_pnd(:,:) ) 341 ENDIF 333 CALL tab_1d_2d( npti, nptidx(1:npti), wfx_pnd_1d(1:npti), wfx_pnd(:,:) ) 342 334 343 335 ENDIF ! npti > 0 … … 651 643 652 644 !MV MP 2016 653 IF ( nn_pnd_scheme > 0) THEN645 IF ( ln_pnd_H12 ) THEN 654 646 aprdg1 = a_ip_2d(ji,jl1) * afrdg 655 647 aprdg2(ji) = a_ip_2d(ji,jl1) * afrdg * hi_hrdg(ji,jl1) … … 679 671 ! Put the melt pond water into the ocean 680 672 !------------------------------------------ 681 IF ( ( nn_pnd_scheme > 0 ) .AND. ln_pnd_fw) THEN673 IF ( ln_pnd_fwb ) THEN 682 674 wfx_pnd_1d(ji) = wfx_pnd_1d(ji) + ( rhofw * vprdg(ji) * ( 1._wp - rn_fpndrdg ) & ! fresh water source for ocean 683 675 & + rhofw * vprft(ji) * ( 1._wp - rn_fpndrft ) ) * r1_rdtice … … 702 694 oa_i_2d(ji,jl1) = oa_i_2d(ji,jl1) - oirdg1 - oirft1 703 695 ! MV MP 2016 704 IF ( nn_pnd_scheme > 0) THEN696 IF ( ln_pnd_H12 ) THEN 705 697 a_ip_2d(ji,jl1) = a_ip_2d(ji,jl1) - aprdg1 - aprft1 706 698 v_ip_2d(ji,jl1) = v_ip_2d(ji,jl1) - vprdg(ji) - vprft(ji) … … 766 758 & vsrft (ji) * rn_fsnwrft * zswitch(ji) ) 767 759 ! MV MP 2016 768 IF ( nn_pnd_scheme > 0) THEN760 IF ( ln_pnd_H12 ) THEN 769 761 v_ip_2d (ji,jl2) = v_ip_2d(ji,jl2) + ( vprdg (ji) * rn_fpndrdg * fvol (ji) & 770 762 & + vprft (ji) * rn_fpndrft * zswitch(ji) )
Note: See TracChangeset
for help on using the changeset viewer.