Index: trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/lect_start_archive.F =================================================================== --- trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/lect_start_archive.F (revision 2953) +++ trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/lect_start_archive.F (revision 2959) @@ -26,4 +26,5 @@ & subslope_dist,end_comslope_h,ini_comslope_h use netcdf + use surfdat_h, ONLY: watercaptag implicit none @@ -139,4 +140,5 @@ real totcloudfracS(iip1,jjp1) real watercapS(iip1,jjp1,nslope) + real watercaptagS(iip1,jjp1) real albedoS(iip1,jjp1,nslope) @@ -177,4 +179,6 @@ real, dimension(:,:,:), allocatable :: watercapold real, dimension(:,:), allocatable :: watercapold_noslope + real, dimension(:,:), allocatable :: watercaptagold + real, dimension(:), allocatable :: watercaptag_tmp real, dimension(:,:,:), allocatable :: albedoold real, dimension(:,:), allocatable :: albedoold_noslope @@ -426,4 +430,6 @@ allocate(totcloudfracold(imold+1,jmold+1)) allocate(watercapold(imold+1,jmold+1,nslope)) + allocate(watercaptagold(imold+1,jmold+1)) + allocate(watercaptag_tmp(ngrid)) allocate(albedoold(imold+1,jmold+1,nslope)) @@ -908,4 +914,20 @@ IF (ierr .NE. NF_NOERR) THEN PRINT*, "lect_start_archive: Failed loading " + PRINT*, NF_STRERROR(ierr) + CALL abort + ENDIF + ENDIF + +c + ierr = NF_INQ_VARID (nid, "watercaptag", nvarid) + IF (ierr .NE. NF_NOERR) THEN + PRINT*, "lect_start_archive: not in file" + PRINT*, "watercaptag set to false, will be adapted in + & surfini of PCM" + watercaptagold(:,:) = 0 + ELSE + ierr = nf90_get_var(nid, nvarid,watercaptagold) + IF (ierr .NE. NF_NOERR) THEN + PRINT*, "lect_start_archive: Failed loading " PRINT*, NF_STRERROR(ierr) CALL abort @@ -1230,4 +1252,26 @@ & watercap(:,1)) +c Watercaptag + if(imold.eq.iim .and. jmold.eq.jjm) then + else + print *, "We are doing an horizontal interpolation, + & watercaptag will be set to false and redefined proprely + & in the PCM(surfini)" + watercaptagold(:,:)=0 + endif + call interp_horiz (watercaptagold(:,:),watercaptags(:,:), + & imold,jmold,iim,jjm,1,rlonuold,rlatvold,rlonu,rlatv) + call gr_dyn_fi (1,iim+1,jjm+1,ngrid,watercaptags(:,:), + & watercaptag_tmp(:)) + + do i=1,ngrid + if(watercaptag_tmp(i).gt. 0.5) then + watercaptag(i)=.true. + else + watercaptag(i)=.false. + endif + enddo + + c Surface albedo call interp_horiz (albedoold(:,:,1),albedoS(:,:,1), @@ -1605,4 +1649,5 @@ deallocate(totcloudfracold) deallocate(watercapold) + deallocate(watercaptagold) deallocate(albedoold) deallocate(var,varp1) Index: trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/start2archive.F =================================================================== --- trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/start2archive.F (revision 2953) +++ trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/start2archive.F (revision 2959) @@ -20,6 +20,6 @@ use infotrac, only: infotrac_init, nqtot, tname - use comsoil_h, only: nsoilmx, inertiedat - use surfdat_h, only: ini_surfdat_h, qsurf + use comsoil_h, only: nsoilmx, inertiedat, inertiesoil + use surfdat_h, only: ini_surfdat_h, qsurf,watercaptag use comsoil_h, only: ini_comsoil_h ! use comgeomphy, only: initcomgeomphy @@ -66,5 +66,4 @@ REAL,ALLOCATABLE :: tsurf(:,:) ! Surface temperature REAL,ALLOCATABLE :: tsoil(:,:,:) ! Soil temperature - REAL,ALLOCATABLE :: inertiesoil(:,:,:) ! Soil thermal inertia (!= inertiedat which is for present day climate) REAL,ALLOCATABLE :: watercap(:,:) ! h2o ice layer REAL :: tauscaling(ngridmx) ! dust conversion factor @@ -87,4 +86,6 @@ REAL ithS(ip1jmp1,nsoilmx) ! Soil Thermal Inertia for inertie dat (present day climate) REAL,ALLOCATABLE :: watercapS(:,:) + REAL,ALLOCATABLE :: watercaptag_tmp(:) + REAL,ALLOCATABLE :: watercaptagS(:) REAL :: tauscalingS(ip1jmp1) REAL :: totcloudfracS(ip1jmp1) @@ -167,5 +168,4 @@ allocate(tsurf(ngridmx,nslope)) allocate(tsoil(ngridmx,nsoilmx,nslope)) - allocate(inertiesoil(ngridmx,nsoilmx,nslope)) allocate(watercap(ngridmx,nslope)) allocate(emis(ngridmx,nslope)) @@ -177,4 +177,5 @@ allocate(inertiesoilS(ip1jmp1,nsoilmx,nslope)) allocate(watercapS(ip1jmp1,nslope)) + allocate(watercaptagS(ip1jmp1)) allocate(emisS(ip1jmp1,nslope)) allocate(albedoS(ip1jmp1,nslope)) @@ -207,4 +208,6 @@ ENDIF + CALL surfini(ngridmx,qsurf) + ierr = NF_CLOSE(nid1) @@ -287,5 +290,5 @@ & tsoilS(:,:,islope)) call gr_fi_dyn(nsoilmx,ngridmx,iip1,jjp1,inertiesoil(:,:,islope), - & inertiesoil(:,:,islope)) + & inertiesoilS(:,:,islope)) ! Note: thermal inertia "inertiedat" is in comsoil.h call gr_fi_dyn(1,ngridmx,iip1,jjp1,emis(:,islope), @@ -302,4 +305,16 @@ call gr_fi_dyn(1,ngridmx,iip1,jjp1,tauscaling,tauscalingS) call gr_fi_dyn(1,ngridmx,iip1,jjp1,totcloudfrac,totcloudfracS) + + allocate(watercaptag_tmp(ngridmx)) + do ij=1,ngridmx + if(watercaptag(ij)) then + watercaptag_tmp(ij)=1 + else + watercaptag_tmp(ij)=0 + endif + enddo + + call gr_fi_dyn(1,ngridmx,iip1,jjp1,watercaptag_tmp(:), + & watercaptagS(:)) c======================================================================= @@ -402,4 +417,6 @@ call write_archive(nid,ntime,'watercap','couche de glace h2o', & 'kg/m2',2,watercapS) + call write_archive(nid,ntime,'watercaptag','couche de glace h2o', + & 'kg/m2',2,watercaptagS) call write_archive(nid,ntime,'tauscaling', & 'dust conversion factor',' ',2,tauscalingS) @@ -462,6 +479,6 @@ & 'J.s-1/2.m-2.K-1',-3,inertiesoilS(:,:,:)) ! Write soil thermal inertia for current climate - call write_archive(nid,ntime,'inertiedat - present day TI', - & 'Soil thermal inertia', + call write_archive(nid,ntime,'inertiedat', + & 'Soil thermal inertia (present day TI)', & 'J.s-1/2.m-2.K-1',-3,ithS) Index: trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/start2archive_SSO.F =================================================================== --- trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/start2archive_SSO.F (revision 2953) +++ trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/start2archive_SSO.F (revision 2959) @@ -20,7 +20,6 @@ use infotrac, only: infotrac_init, nqtot, tname - use comsoil_h, only: nsoilmx, inertiedat + use comsoil_h, only: nsoilmx, inertiedat,inertiesoil use surfdat_h, only: ini_surfdat_h, qsurf - use comsoil_h, only: ini_comsoil_h ! use comgeomphy, only: initcomgeomphy use filtreg_mod, only: inifilr @@ -69,5 +68,4 @@ REAL,ALLOCATABLE :: tsurf(:,:) ! Surface temperature REAL,ALLOCATABLE :: tsoil(:,:,:) ! Soil temperature - REAL,ALLOCATABLE :: inertiesoil(:,:,:) ! Soil thermal inertia (!= inertiedat which is for present day climate) REAL,ALLOCATABLE :: watercap(:,:) ! h2o ice layer REAL tauscaling(ngridmx) ! dust conversion factor @@ -185,5 +183,4 @@ allocate(tsurf(ngridmx,nslope)) allocate(tsoil(ngridmx,nsoilmx,nslope)) - allocate(inertiesoil(ngridmx,nsoilmx,nslope)) allocate(watercap(ngridmx,nslope)) allocate(emis(ngridmx,nslope)) @@ -302,5 +299,5 @@ & tsoilS(:,:,islope)) call gr_fi_dyn(nsoilmx,ngridmx,iip1,jjp1,inertiesoil(:,:,islope), - & inertiesoil(:,:,islope)) + & inertiesoilS(:,:,islope)) ! Note: thermal inertia "inertiedat" is in comsoil.h call gr_fi_dyn(1,ngridmx,iip1,jjp1,emis(:,islope), @@ -313,4 +310,5 @@ & subslope_distS(:,islope)) enddo + call gr_fi_dyn(nsoilmx,ngridmx,iip1,jjp1,inertiedat,ithS) call gr_fi_dyn(llm+1,ngridmx,iip1,jjp1,q2,q2S) @@ -497,4 +495,5 @@ call write_archive(nid,ntime,'tsoil','Soil temperature', & 'K',-3,tsoilS(:,:,:)) + ! Write soil thermal inertia call write_archive(nid,ntime,'inertiesoil','Soil TI', Index: trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/write_archive.F =================================================================== --- trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/write_archive.F (revision 2953) +++ trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/write_archive.F (revision 2959) @@ -226,5 +226,5 @@ & nom.eq."ZGAM" .or. nom.eq."albedodat" .or. & nom.eq."z0" .or. nom.eq."summit" .or. nom.eq."hmons" - & .or. nom.eq."base") then + & .or. nom.eq."base".or. nom.eq."watercaptag") then if (ierr /= NF_NOERR) then