Changeset 13286 for NEMO/trunk/src/ICE
- Timestamp:
- 2020-07-09T17:48:29+02:00 (4 years ago)
- Location:
- NEMO/trunk
- Files:
-
- 7 edited
-
. (modified) (1 prop)
-
src/ICE/icectl.F90 (modified) (2 diffs)
-
src/ICE/icedia.F90 (modified) (1 diff)
-
src/ICE/icedyn_adv_pra.F90 (modified) (1 diff)
-
src/ICE/icedyn_rhg_evp.F90 (modified) (1 diff)
-
src/ICE/icerst.F90 (modified) (5 diffs)
-
src/ICE/iceupdate.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk
- Property svn:externals
-
old new 2 2 ^/utils/build/makenemo@HEAD makenemo 3 3 ^/utils/build/mk@HEAD mk 4 ^/utils/tools /@HEADtools4 ^/utils/tools@HEAD tools 5 5 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM … … 8 8 9 9 # SETTE 10 ^/utils/CI/ sette@12931sette10 ^/utils/CI/r12931_sette_ticket2366@HEAD sette
-
- Property svn:externals
-
NEMO/trunk/src/ICE/icectl.F90
r12649 r13286 702 702 DO jl = 1, jpl 703 703 CALL prt_ctl_info(' ') 704 CALL prt_ctl_info(' - Category : ', ivar 1=jl)704 CALL prt_ctl_info(' - Category : ', ivar=jl) 705 705 CALL prt_ctl_info(' ~~~~~~~~~~') 706 706 CALL prt_ctl(tab2d_1=h_i (:,:,jl) , clinfo1= ' h_i : ') … … 719 719 720 720 DO jk = 1, nlay_i 721 CALL prt_ctl_info(' - Layer : ', ivar 1=jk)721 CALL prt_ctl_info(' - Layer : ', ivar=jk) 722 722 CALL prt_ctl(tab2d_1=t_i(:,:,jk,jl) , clinfo1= ' t_i : ') 723 723 END DO -
NEMO/trunk/src/ICE/icedia.F90
r12489 r13286 230 230 CALL iom_get( numrir, 'frc_tembot' , frc_tembot ) 231 231 CALL iom_get( numrir, 'frc_sal' , frc_sal ) 232 CALL iom_get( numrir, jpdom_auto glo, 'vol_loc_ini', vol_loc_ini )233 CALL iom_get( numrir, jpdom_auto glo, 'tem_loc_ini', tem_loc_ini )234 CALL iom_get( numrir, jpdom_auto glo, 'sal_loc_ini', sal_loc_ini )232 CALL iom_get( numrir, jpdom_auto, 'vol_loc_ini', vol_loc_ini ) 233 CALL iom_get( numrir, jpdom_auto, 'tem_loc_ini', tem_loc_ini ) 234 CALL iom_get( numrir, jpdom_auto, 'sal_loc_ini', sal_loc_ini ) 235 235 ELSE 236 236 IF(lwp) WRITE(numout,*) -
NEMO/trunk/src/ICE/icedyn_adv_pra.F90
r13226 r13286 772 772 ! 773 773 ! ! ice thickness 774 CALL iom_get( numrir, jpdom_auto glo, 'sxice' , sxice )775 CALL iom_get( numrir, jpdom_auto glo, 'syice' , syice )776 CALL iom_get( numrir, jpdom_auto glo, 'sxxice', sxxice )777 CALL iom_get( numrir, jpdom_auto glo, 'syyice', syyice )778 CALL iom_get( numrir, jpdom_auto glo, 'sxyice', sxyice )774 CALL iom_get( numrir, jpdom_auto, 'sxice' , sxice ) 775 CALL iom_get( numrir, jpdom_auto, 'syice' , syice ) 776 CALL iom_get( numrir, jpdom_auto, 'sxxice', sxxice ) 777 CALL iom_get( numrir, jpdom_auto, 'syyice', syyice ) 778 CALL iom_get( numrir, jpdom_auto, 'sxyice', sxyice ) 779 779 ! ! snow thickness 780 CALL iom_get( numrir, jpdom_auto glo, 'sxsn' , sxsn )781 CALL iom_get( numrir, jpdom_auto glo, 'sysn' , sysn )782 CALL iom_get( numrir, jpdom_auto glo, 'sxxsn' , sxxsn )783 CALL iom_get( numrir, jpdom_auto glo, 'syysn' , syysn )784 CALL iom_get( numrir, jpdom_auto glo, 'sxysn' , sxysn )780 CALL iom_get( numrir, jpdom_auto, 'sxsn' , sxsn ) 781 CALL iom_get( numrir, jpdom_auto, 'sysn' , sysn ) 782 CALL iom_get( numrir, jpdom_auto, 'sxxsn' , sxxsn ) 783 CALL iom_get( numrir, jpdom_auto, 'syysn' , syysn ) 784 CALL iom_get( numrir, jpdom_auto, 'sxysn' , sxysn ) 785 785 ! ! ice concentration 786 CALL iom_get( numrir, jpdom_auto glo, 'sxa' , sxa )787 CALL iom_get( numrir, jpdom_auto glo, 'sya' , sya )788 CALL iom_get( numrir, jpdom_auto glo, 'sxxa' , sxxa )789 CALL iom_get( numrir, jpdom_auto glo, 'syya' , syya )790 CALL iom_get( numrir, jpdom_auto glo, 'sxya' , sxya )786 CALL iom_get( numrir, jpdom_auto, 'sxa' , sxa ) 787 CALL iom_get( numrir, jpdom_auto, 'sya' , sya ) 788 CALL iom_get( numrir, jpdom_auto, 'sxxa' , sxxa ) 789 CALL iom_get( numrir, jpdom_auto, 'syya' , syya ) 790 CALL iom_get( numrir, jpdom_auto, 'sxya' , sxya ) 791 791 ! ! ice salinity 792 CALL iom_get( numrir, jpdom_auto glo, 'sxsal' , sxsal )793 CALL iom_get( numrir, jpdom_auto glo, 'sysal' , sysal )794 CALL iom_get( numrir, jpdom_auto glo, 'sxxsal', sxxsal )795 CALL iom_get( numrir, jpdom_auto glo, 'syysal', syysal )796 CALL iom_get( numrir, jpdom_auto glo, 'sxysal', sxysal )792 CALL iom_get( numrir, jpdom_auto, 'sxsal' , sxsal ) 793 CALL iom_get( numrir, jpdom_auto, 'sysal' , sysal ) 794 CALL iom_get( numrir, jpdom_auto, 'sxxsal', sxxsal ) 795 CALL iom_get( numrir, jpdom_auto, 'syysal', syysal ) 796 CALL iom_get( numrir, jpdom_auto, 'sxysal', sxysal ) 797 797 ! ! ice age 798 CALL iom_get( numrir, jpdom_auto glo, 'sxage' , sxage )799 CALL iom_get( numrir, jpdom_auto glo, 'syage' , syage )800 CALL iom_get( numrir, jpdom_auto glo, 'sxxage', sxxage )801 CALL iom_get( numrir, jpdom_auto glo, 'syyage', syyage )802 CALL iom_get( numrir, jpdom_auto glo, 'sxyage', sxyage )798 CALL iom_get( numrir, jpdom_auto, 'sxage' , sxage ) 799 CALL iom_get( numrir, jpdom_auto, 'syage' , syage ) 800 CALL iom_get( numrir, jpdom_auto, 'sxxage', sxxage ) 801 CALL iom_get( numrir, jpdom_auto, 'syyage', syyage ) 802 CALL iom_get( numrir, jpdom_auto, 'sxyage', sxyage ) 803 803 ! ! snow layers heat content 804 804 DO jk = 1, nlay_s 805 805 WRITE(zchar1,'(I2.2)') jk 806 znam = 'sxc0'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto glo, znam , z3d ) ; sxc0 (:,:,jk,:) = z3d(:,:,:)807 znam = 'syc0'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto glo, znam , z3d ) ; syc0 (:,:,jk,:) = z3d(:,:,:)808 znam = 'sxxc0'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto glo, znam , z3d ) ; sxxc0(:,:,jk,:) = z3d(:,:,:)809 znam = 'syyc0'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto glo, znam , z3d ) ; syyc0(:,:,jk,:) = z3d(:,:,:)810 znam = 'sxyc0'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto glo, znam , z3d ) ; sxyc0(:,:,jk,:) = z3d(:,:,:)806 znam = 'sxc0'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto, znam , z3d ) ; sxc0 (:,:,jk,:) = z3d(:,:,:) 807 znam = 'syc0'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto, znam , z3d ) ; syc0 (:,:,jk,:) = z3d(:,:,:) 808 znam = 'sxxc0'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto, znam , z3d ) ; sxxc0(:,:,jk,:) = z3d(:,:,:) 809 znam = 'syyc0'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto, znam , z3d ) ; syyc0(:,:,jk,:) = z3d(:,:,:) 810 znam = 'sxyc0'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto, znam , z3d ) ; sxyc0(:,:,jk,:) = z3d(:,:,:) 811 811 END DO 812 812 ! ! ice layers heat content 813 813 DO jk = 1, nlay_i 814 814 WRITE(zchar1,'(I2.2)') jk 815 znam = 'sxe'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto glo, znam , z3d ) ; sxe (:,:,jk,:) = z3d(:,:,:)816 znam = 'sye'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto glo, znam , z3d ) ; sye (:,:,jk,:) = z3d(:,:,:)817 znam = 'sxxe'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto glo, znam , z3d ) ; sxxe(:,:,jk,:) = z3d(:,:,:)818 znam = 'syye'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto glo, znam , z3d ) ; syye(:,:,jk,:) = z3d(:,:,:)819 znam = 'sxye'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto glo, znam , z3d ) ; sxye(:,:,jk,:) = z3d(:,:,:)815 znam = 'sxe'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto, znam , z3d ) ; sxe (:,:,jk,:) = z3d(:,:,:) 816 znam = 'sye'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto, znam , z3d ) ; sye (:,:,jk,:) = z3d(:,:,:) 817 znam = 'sxxe'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto, znam , z3d ) ; sxxe(:,:,jk,:) = z3d(:,:,:) 818 znam = 'syye'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto, znam , z3d ) ; syye(:,:,jk,:) = z3d(:,:,:) 819 znam = 'sxye'//'_l'//zchar1 ; CALL iom_get( numrir, jpdom_auto, znam , z3d ) ; sxye(:,:,jk,:) = z3d(:,:,:) 820 820 END DO 821 821 ! 822 822 IF( ln_pnd_H12 ) THEN ! melt pond fraction 823 CALL iom_get( numrir, jpdom_auto glo, 'sxap' , sxap )824 CALL iom_get( numrir, jpdom_auto glo, 'syap' , syap )825 CALL iom_get( numrir, jpdom_auto glo, 'sxxap', sxxap )826 CALL iom_get( numrir, jpdom_auto glo, 'syyap', syyap )827 CALL iom_get( numrir, jpdom_auto glo, 'sxyap', sxyap )823 CALL iom_get( numrir, jpdom_auto, 'sxap' , sxap ) 824 CALL iom_get( numrir, jpdom_auto, 'syap' , syap ) 825 CALL iom_get( numrir, jpdom_auto, 'sxxap', sxxap ) 826 CALL iom_get( numrir, jpdom_auto, 'syyap', syyap ) 827 CALL iom_get( numrir, jpdom_auto, 'sxyap', sxyap ) 828 828 ! ! melt pond volume 829 CALL iom_get( numrir, jpdom_auto glo, 'sxvp' , sxvp )830 CALL iom_get( numrir, jpdom_auto glo, 'syvp' , syvp )831 CALL iom_get( numrir, jpdom_auto glo, 'sxxvp', sxxvp )832 CALL iom_get( numrir, jpdom_auto glo, 'syyvp', syyvp )833 CALL iom_get( numrir, jpdom_auto glo, 'sxyvp', sxyvp )829 CALL iom_get( numrir, jpdom_auto, 'sxvp' , sxvp ) 830 CALL iom_get( numrir, jpdom_auto, 'syvp' , syvp ) 831 CALL iom_get( numrir, jpdom_auto, 'sxxvp', sxxvp ) 832 CALL iom_get( numrir, jpdom_auto, 'syyvp', syyvp ) 833 CALL iom_get( numrir, jpdom_auto, 'sxyvp', sxyvp ) 834 834 ENDIF 835 835 ! -
NEMO/trunk/src/ICE/icedyn_rhg_evp.F90
r13237 r13286 845 845 ! 846 846 IF( MIN( id1, id2, id3 ) > 0 ) THEN ! fields exist 847 CALL iom_get( numrir, jpdom_auto glo, 'stress1_i' , stress1_i)848 CALL iom_get( numrir, jpdom_auto glo, 'stress2_i' , stress2_i)849 CALL iom_get( numrir, jpdom_auto glo, 'stress12_i', stress12_i)847 CALL iom_get( numrir, jpdom_auto, 'stress1_i' , stress1_i , cd_type = 'T' ) 848 CALL iom_get( numrir, jpdom_auto, 'stress2_i' , stress2_i , cd_type = 'T' ) 849 CALL iom_get( numrir, jpdom_auto, 'stress12_i', stress12_i, cd_type = 'F' ) 850 850 ELSE ! start rheology from rest 851 851 IF(lwp) WRITE(numout,*) -
NEMO/trunk/src/ICE/icerst.F90
r12649 r13286 211 211 212 212 ! --- mandatory fields --- ! 213 CALL iom_get( numrir, jpdom_auto glo, 'v_i' , v_i )214 CALL iom_get( numrir, jpdom_auto glo, 'v_s' , v_s )215 CALL iom_get( numrir, jpdom_auto glo, 'sv_i' , sv_i )216 CALL iom_get( numrir, jpdom_auto glo, 'a_i' , a_i )217 CALL iom_get( numrir, jpdom_auto glo, 't_su' , t_su )218 CALL iom_get( numrir, jpdom_auto glo, 'u_ice', u_ice)219 CALL iom_get( numrir, jpdom_auto glo, 'v_ice', v_ice)213 CALL iom_get( numrir, jpdom_auto, 'v_i' , v_i ) 214 CALL iom_get( numrir, jpdom_auto, 'v_s' , v_s ) 215 CALL iom_get( numrir, jpdom_auto, 'sv_i' , sv_i ) 216 CALL iom_get( numrir, jpdom_auto, 'a_i' , a_i ) 217 CALL iom_get( numrir, jpdom_auto, 't_su' , t_su ) 218 CALL iom_get( numrir, jpdom_auto, 'u_ice', u_ice, cd_type = 'U', psgn = -1._wp ) 219 CALL iom_get( numrir, jpdom_auto, 'v_ice', v_ice, cd_type = 'V', psgn = -1._wp ) 220 220 ! Snow enthalpy 221 221 DO jk = 1, nlay_s 222 222 WRITE(zchar1,'(I2.2)') jk 223 223 znam = 'e_s'//'_l'//zchar1 224 CALL iom_get( numrir, jpdom_auto glo, znam , z3d )224 CALL iom_get( numrir, jpdom_auto, znam , z3d ) 225 225 e_s(:,:,jk,:) = z3d(:,:,:) 226 226 END DO … … 229 229 WRITE(zchar1,'(I2.2)') jk 230 230 znam = 'e_i'//'_l'//zchar1 231 CALL iom_get( numrir, jpdom_auto glo, znam , z3d )231 CALL iom_get( numrir, jpdom_auto, znam , z3d ) 232 232 e_i(:,:,jk,:) = z3d(:,:,:) 233 233 END DO … … 236 236 id1 = iom_varid( numrir, 'oa_i' , ldstop = .FALSE. ) 237 237 IF( id1 > 0 ) THEN ! fields exist 238 CALL iom_get( numrir, jpdom_auto glo, 'oa_i', oa_i )238 CALL iom_get( numrir, jpdom_auto, 'oa_i', oa_i ) 239 239 ELSE ! start from rest 240 240 IF(lwp) WRITE(numout,*) ' ==>> previous run without ice age output then set it to zero' … … 244 244 id2 = iom_varid( numrir, 'a_ip' , ldstop = .FALSE. ) 245 245 IF( id2 > 0 ) THEN ! fields exist 246 CALL iom_get( numrir, jpdom_auto glo, 'a_ip' , a_ip )247 CALL iom_get( numrir, jpdom_auto glo, 'v_ip' , v_ip )246 CALL iom_get( numrir, jpdom_auto, 'a_ip' , a_ip ) 247 CALL iom_get( numrir, jpdom_auto, 'v_ip' , v_ip ) 248 248 ELSE ! start from rest 249 249 IF(lwp) WRITE(numout,*) ' ==>> previous run without melt ponds output then set it to zero' … … 256 256 id4 = iom_varid( numrir, 't1_ice' , ldstop = .FALSE. ) 257 257 IF( id3 > 0 .AND. id4 > 0 ) THEN ! fields exist 258 CALL iom_get( numrir, jpdom_auto glo, 'cnd_ice', cnd_ice )259 CALL iom_get( numrir, jpdom_auto glo, 't1_ice' , t1_ice )258 CALL iom_get( numrir, jpdom_auto, 'cnd_ice', cnd_ice ) 259 CALL iom_get( numrir, jpdom_auto, 't1_ice' , t1_ice ) 260 260 ELSE ! start from rest 261 261 IF(lwp) WRITE(numout,*) ' ==>> previous run without conductivity output then set it to zero' -
NEMO/trunk/src/ICE/iceupdate.F90
r13226 r13286 417 417 ! 418 418 IF( id1 > 0 ) THEN ! fields exist 419 CALL iom_get( numrir, jpdom_auto glo, 'snwice_mass' , snwice_mass )420 CALL iom_get( numrir, jpdom_auto glo, 'snwice_mass_b', snwice_mass_b )419 CALL iom_get( numrir, jpdom_auto, 'snwice_mass' , snwice_mass ) 420 CALL iom_get( numrir, jpdom_auto, 'snwice_mass_b', snwice_mass_b ) 421 421 ELSE ! start from rest 422 422 IF(lwp) WRITE(numout,*) ' ==>> previous run without snow-ice mass output then set it'
Note: See TracChangeset
for help on using the changeset viewer.
