Changeset 2884
- Timestamp:
- Jan 31, 2023, 9:15:06 PM (22 months ago)
- Location:
- trunk/LMDZ.MARS
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.MARS/README
r2883 r2884 3849 3849 == 31/01/2023 == RV 3850 3850 Small fix : move an endif misplaced for watercap 3851 3852 == 31/01/2023 == RV 3853 Watercaptag is now outputed in the starfi.nc. 3854 There is a new mode : icelocationmode=5 to read watercaptag from startfi and to do as iceloctaionmode=4 if the variable is not present. -
trunk/LMDZ.MARS/libf/phymars/phyetat0_mod.F90
r2883 r2884 14 14 use tracer_mod, only: noms ! tracer names 15 15 use surfdat_h, only: phisfi, albedodat, z0, z0_default,& 16 zmea, zstd, zsig, zgam, zthe, hmons, summit, base 16 zmea, zstd, zsig, zgam, zthe, hmons, summit, base,& 17 watercaptag 17 18 use iostart, only: nid_start, open_startphy, close_startphy, & 18 19 get_field, get_var, inquire_field, & … … 102 103 REAL :: surfemis ! constant emissivity when no startfi 103 104 REAL :: surfalbedo ! constant albedo when no startfi 105 106 REAL :: watercaptag_tmp(ngrid) 107 104 108 CHARACTER(len=5) :: modname="phyetat0" 105 109 … … 641 645 call soil_settings(nid_start,ngrid,nsoil,tsurf,tsoil,indextime) 642 646 endif ! of if (startphy_file) 647 648 if (startphy_file) then 649 call get_field("watercaptag",watercaptag_tmp,found,indextime) 650 if (.not.found) then 651 write(*,*) "phyetat0: Failed loading <watercaptag> : ", & 652 "<watercaptag> is set as defined by icelocationmode in surfini.F" 653 watercaptag(:)=.false. 654 else 655 do ig=1,ngrid 656 if(watercaptag_tmp(ig).lt.0.5) then 657 watercaptag(ig)=.false. 658 else 659 watercaptag(ig)=.true. 660 endif 661 enddo 662 endif 663 endif !startphy_file 664 643 665 ! 644 666 ! close file: -
trunk/LMDZ.MARS/libf/phymars/phyredem.F90
r2829 r2884 14 14 z0_default, albedice, emisice, emissiv, & 15 15 iceradius, dtemisice, phisfi, z0, & 16 hmons,summit,base 16 hmons,summit,base,watercaptag 17 17 use dimradmars_mod, only: tauvis 18 18 use iostart, only : open_restartphy, close_restartphy, & … … 40 40 41 41 real :: tab_cntrl(length) ! nb "length=100" defined in iostart module 42 integer :: ig 43 real :: watercaptag_tmp(ngrid) 42 44 43 45 ! Create physics start file … … 133 135 call put_field("z0","Surface roughness length",z0) 134 136 137 do ig=1,ngrid 138 if(watercaptag(ig)) then 139 watercaptag_tmp(ig)=1 140 else 141 watercaptag_tmp(ig)=0 142 endif 143 enddo 144 145 call put_field("watercaptag","Infinite water reservoir",watercaptag_tmp) 146 135 147 ! Close file 136 148 call close_restartphy -
trunk/LMDZ.MARS/libf/phymars/surfini.F
r2826 r2884 43 43 ! resolution, and easily adaptable for dynamico 44 44 ! For visualisation : > /u/tnalmd/bin/watercaps gcm_txt_output_file 45 INTEGER,SAVE :: icelocationmode = 445 INTEGER,SAVE :: icelocationmode = 5 46 46 47 47 !$OMP THREADPRIVATE(icelocationmode) … … 118 118 c======================================================================= 119 119 ! Initialize watercaptag (default is false) 120 watercaptag_glo(:)=.false. 120 ! watercaptag_glo(:)=.false. !Already done in phyetat0 if needed 121 121 122 122 c water ice outliers … … 142 142 143 143 if (ngrid .ne. 1) then 144 watercaptag(:) = .false.144 ! watercaptag(:) = .false. 145 145 longwatercaptag(:) = .false. 146 146 endif … … 159 159 call gather(latitude,lati_glo) 160 160 call gather(longitude,long_glo) 161 call gather(watercaptag,watercaptag_glo) 161 162 162 163 if (is_master) then … … 447 448 ! print*,'watercaptag_glo(:), ',watercaptag_glo(:) 448 449 450 ELSE IF (icelocationmode .eq. 5) THEN 451 452 print*,'icelocationmode = 5' 453 print*,'Surfini: ice caps defined using startfi.nc data' 454 do ig=1,ngrid 455 if(any(watercaptag_glo)) then 456 else 457 call locate_watercaptag(klon_glo,lati_glo, 458 & long_glo,watercaptag_glo) 459 endif 460 enddo 461 462 ! print*,'watercaptag_glo(:), ',watercaptag_glo(:) 463 449 464 ELSE 450 465 451 466 print*, 'In surfini.F, icelocationmode is ', icelocationmode 452 print*, 'It should be 1, 2, 3 or 4 (default is 4)'467 print*, 'It should be 1, 2, 3, 4 or 5 (default is 5)' 453 468 call abort_physic("surfini","wrong icelocationmode",1) 454 469
Note: See TracChangeset
for help on using the changeset viewer.