- Timestamp:
- 2020-10-22T20:49:56+02:00 (4 years ago)
- Location:
- NEMO/branches/2019/dev_r11842_SI3-10_EAP
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11842_SI3-10_EAP
- Property svn:externals
-
old new 1 ^/utils/build/arch@HEAD arch 2 ^/utils/build/makenemo@HEAD makenemo 3 ^/utils/build/mk@HEAD mk 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev@HEAD ext/AGRIF 6 ^/vendors/FCM@HEAD ext/FCM 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL 1 ^/utils/build/arch@12130 arch 2 ^/utils/build/makenemo@12191 makenemo 3 ^/utils/build/mk@11662 mk 4 ^/utils/tools_r4.0-HEAD@12672 tools 5 ^/vendors/AGRIF/dev@10586 ext/AGRIF 6 ^/vendors/FCM@10134 ext/FCM 7 ^/vendors/IOIPSL@9655 ext/IOIPSL 8 9 # SETTE mapping (inactive) 10 #^/utils/CI/sette@12135 sette
-
- Property svn:externals
-
NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/ICE/icedyn_rdgrft.F90
r13574 r13662 346 346 ELSEIF( zGsum(ji,jl-1) < rn_gstar ) THEN 347 347 apartf(ji,jl) = z1_gstar * ( rn_gstar - zGsum(ji,jl-1) ) * & 348 & ( 2._wp - ( zGsum(ji,jl-1) + rn_gstar 348 & ( 2._wp - ( zGsum(ji,jl-1) + rn_gstar ) * z1_gstar ) 349 349 ELSE 350 350 apartf(ji,jl) = 0._wp … … 499 499 REAL(wp) :: airdg1, oirdg1, aprdg1, virdg1, sirdg1 500 500 REAL(wp) :: airft1, oirft1, aprft1 501 REAL(wp), DIMENSION(jpij) :: airdg2, oirdg2, aprdg2, virdg2, sirdg2, vsrdg, vprdg ! area etc of new ridges502 REAL(wp), DIMENSION(jpij) :: airft2, oirft2, aprft2, virft , sirft , vsrft, vprft ! area etc of rafted ice501 REAL(wp), DIMENSION(jpij) :: airdg2, oirdg2, aprdg2, virdg2, sirdg2, vsrdg, vprdg, vlrdg ! area etc of new ridges 502 REAL(wp), DIMENSION(jpij) :: airft2, oirft2, aprft2, virft , sirft , vsrft, vprft, vlrft ! area etc of rafted ice 503 503 ! 504 504 REAL(wp), DIMENSION(jpij) :: ersw ! enth of water trapped into ridges … … 527 527 DO jl1 = 1, jpl 528 528 529 CALL tab_2d_1d( npti, nptidx(1:npti), s_i_1d(1:npti), s_i(:,:,jl1) ) 529 IF( nn_icesal /= 2 ) THEN 530 CALL tab_2d_1d( npti, nptidx(1:npti), s_i_1d(1:npti), s_i(:,:,jl1) ) 531 ENDIF 530 532 531 533 DO ji = 1, npti … … 570 572 oirft2(ji) = oa_i_2d(ji,jl1) * afrft * hi_hrft 571 573 572 IF ( ln_pnd_ H12) THEN574 IF ( ln_pnd_LEV ) THEN 573 575 aprdg1 = a_ip_2d(ji,jl1) * afrdg 574 576 aprdg2(ji) = a_ip_2d(ji,jl1) * afrdg * hi_hrdg(ji,jl1) … … 577 579 aprft2(ji) = a_ip_2d(ji,jl1) * afrft * hi_hrft 578 580 vprft (ji) = v_ip_2d(ji,jl1) * afrft 581 IF ( ln_pnd_lids ) THEN 582 vlrdg (ji) = v_il_2d(ji,jl1) * afrdg 583 vlrft (ji) = v_il_2d(ji,jl1) * afrft 584 ENDIF 579 585 ENDIF 580 586 … … 603 609 sv_i_2d(ji,jl1) = sv_i_2d(ji,jl1) - sirdg1 - sirft(ji) 604 610 oa_i_2d(ji,jl1) = oa_i_2d(ji,jl1) - oirdg1 - oirft1 605 IF ( ln_pnd_ H12) THEN611 IF ( ln_pnd_LEV ) THEN 606 612 a_ip_2d(ji,jl1) = a_ip_2d(ji,jl1) - aprdg1 - aprft1 607 613 v_ip_2d(ji,jl1) = v_ip_2d(ji,jl1) - vprdg(ji) - vprft(ji) 614 IF ( ln_pnd_lids ) THEN 615 v_il_2d(ji,jl1) = v_il_2d(ji,jl1) - vlrdg(ji) - vlrft(ji) 616 ENDIF 608 617 ENDIF 609 618 ENDIF … … 697 706 v_s_2d (ji,jl2) = v_s_2d (ji,jl2) + ( vsrdg (ji) * rn_fsnwrdg * fvol(ji) + & 698 707 & vsrft (ji) * rn_fsnwrft * zswitch(ji) ) 699 IF ( ln_pnd_ H12) THEN708 IF ( ln_pnd_LEV ) THEN 700 709 v_ip_2d (ji,jl2) = v_ip_2d(ji,jl2) + ( vprdg (ji) * rn_fpndrdg * fvol (ji) & 701 710 & + vprft (ji) * rn_fpndrft * zswitch(ji) ) 702 711 a_ip_2d (ji,jl2) = a_ip_2d(ji,jl2) + ( aprdg2(ji) * rn_fpndrdg * farea & 703 712 & + aprft2(ji) * rn_fpndrft * zswitch(ji) ) 713 IF ( ln_pnd_lids ) THEN 714 v_il_2d (ji,jl2) = v_il_2d(ji,jl2) + ( vlrdg(ji) * rn_fpndrdg * fvol (ji) & 715 & + vlrft(ji) * rn_fpndrft * zswitch(ji) ) 716 ENDIF 704 717 ENDIF 705 718 … … 732 745 !---------------- 733 746 ! In case ridging/rafting lead to very small negative values (sometimes it happens) 734 CALL ice_var_roundoff( a_i_2d, v_i_2d, v_s_2d, sv_i_2d, oa_i_2d, a_ip_2d, v_ip_2d, ze_s_2d, ze_i_2d )747 CALL ice_var_roundoff( a_i_2d, v_i_2d, v_s_2d, sv_i_2d, oa_i_2d, a_ip_2d, v_ip_2d, v_il_2d, ze_s_2d, ze_i_2d ) 735 748 ! 736 749 END SUBROUTINE rdgrft_shift … … 845 858 CALL tab_3d_2d( npti, nptidx(1:npti), a_ip_2d(1:npti,1:jpl), a_ip(:,:,:) ) 846 859 CALL tab_3d_2d( npti, nptidx(1:npti), v_ip_2d(1:npti,1:jpl), v_ip(:,:,:) ) 860 CALL tab_3d_2d( npti, nptidx(1:npti), v_il_2d(1:npti,1:jpl), v_il(:,:,:) ) 847 861 DO jl = 1, jpl 848 862 DO jk = 1, nlay_s … … 871 885 CALL tab_2d_3d( npti, nptidx(1:npti), a_ip_2d(1:npti,1:jpl), a_ip(:,:,:) ) 872 886 CALL tab_2d_3d( npti, nptidx(1:npti), v_ip_2d(1:npti,1:jpl), v_ip(:,:,:) ) 887 CALL tab_2d_3d( npti, nptidx(1:npti), v_il_2d(1:npti,1:jpl), v_il(:,:,:) ) 873 888 DO jl = 1, jpl 874 889 DO jk = 1, nlay_s
Note: See TracChangeset
for help on using the changeset viewer.