Index: trunk/LMDZ.PLUTO/libf/phypluto/physiq_mod.F90 =================================================================== --- trunk/LMDZ.PLUTO/libf/phypluto/physiq_mod.F90 (revision 3452) +++ trunk/LMDZ.PLUTO/libf/phypluto/physiq_mod.F90 (revision 3453) @@ -57,6 +57,6 @@ carbox, methane,condmetsurf,condcosurf,& oldplutovdifc,oldplutocorrk,oldplutosedim, & - aerohaze,haze_proffix,source_haze, tsurfmax, & - albmin_ch4, & + aerohaze,haze_proffix,haze_radproffix,& + source_haze, tsurfmax, albmin_ch4, & season, sedimentation,generic_condensation, & specOLR, & @@ -2255,12 +2255,16 @@ call writediagfi(ngrid,"tsurf","Surface temperature","K",2,tsurf) call writediagfi(ngrid,"ps","Surface pressure","Pa",2,ps) + call writediagfi(ngrid,"emis","Emissivity","",2,emis) !! Pluto outputs - ! call writediagfi(ngrid,"rice_ch4","ch4 ice mass mean radius","m",3,rice_ch4) call writediagfi(ngrid,"dist_star","dist_star","AU",0,dist_star) if (fast) then call writediagfi(ngrid,"globave","surf press","Pa",0,globave) - !AF: TODO which outputs? + call writediagfi(ngrid,"fluxrad","fluxrad","W m-2",2,fluxrad) + call writediagfi(ngrid,"fluxgrd","fluxgrd","W m-2",2,fluxgrd) + call writediagfi(ngrid,"capcal","capcal","W.s m-2 K-1",2,capcal) + ! call writediagfi(ngrid,"dplanck","dplanck","W.s m-2 K-1",2,dplanck) + call writediagfi(ngrid,"tsoil","tsoil","K",3,tsoil) else if (check_physics_outputs) then @@ -2269,11 +2273,10 @@ endif - call writediagfi(ngrid,"emis","Emissivity","",2,emis) - call writediagfi(ngrid,"temp","temperature","K",3,zt) - call writediagfi(ngrid,"teta","potential temperature","K",3,zh) - call writediagfi(ngrid,"u","Zonal wind","m.s-1",3,zu) - call writediagfi(ngrid,"v","Meridional wind","m.s-1",3,zv) - call writediagfi(ngrid,"w","Vertical wind","m.s-1",3,pw) - call writediagfi(ngrid,"p","Pressure","Pa",3,pplay) + call writediagfi(ngrid,"temp","temperature","K",3,zt) + call writediagfi(ngrid,"teta","potential temperature","K",3,zh) + call writediagfi(ngrid,"u","Zonal wind","m.s-1",3,zu) + call writediagfi(ngrid,"v","Meridional wind","m.s-1",3,zv) + call writediagfi(ngrid,"w","Vertical wind","m.s-1",3,pw) + call writediagfi(ngrid,"p","Pressure","Pa",3,pplay) endif @@ -2281,8 +2284,4 @@ ! call writediagsoil(ngrid,"tsurf","Surface temperature","K",2,tsurf) ! call writediagsoil(ngrid,"temp","temperature","K",3,tsoil) - -! ! Oceanic layers !AF24: removed - ! ! Thermal plume model !AF24: removed -! GW non-oro outputs !AF24: removed ! Total energy balance diagnostics @@ -2296,10 +2295,6 @@ call writediagfi(ngrid,"shad","rings"," ", 2, fract) -! call writediagfi(ngrid,"ASRcs","absorbed stellar rad (cs).","W m-2",2,fluxabs_sw1) -! call writediagfi(ngrid,"OLRcs","outgoing longwave rad (cs).","W m-2",2,fluxtop_lw1) ! call writediagfi(ngrid,"fluxsurfsw","sw surface flux.","W m-2",2,fluxsurf_sw) ! call writediagfi(ngrid,"fluxsurflw","lw back radiation.","W m-2",2,fluxsurf_lw) -! call writediagfi(ngrid,"fluxsurfswcs","sw surface flux (cs).","W m-2",2,fluxsurf_sw1) -! call writediagfi(ngrid,"fluxsurflwcs","lw back radiation (cs).","W m-2",2,fluxsurf_lw1) call writediagfi(ngrid,"GND","heat flux from ground","W m-2",2,fluxgrd) @@ -2311,5 +2306,4 @@ if(enertest) then - if (calldifv) then @@ -2328,11 +2322,7 @@ endif -! if(watercond) then !AF24: removed - if (generic_condensation) then - call writediagfi(ngrid,"genericconddE","heat from generic condensation","W m-2",2,genericconddE) call writediagfi(ngrid,"dt_generic_condensation","heating from generic condensation","K s-1",3,dt_generic_condensation) - endif @@ -2352,5 +2342,4 @@ endif - ! Temporary inclusions for heating diagnostics. call writediagfi(ngrid,"zdtsw","SW heating","T s-1",3,zdtsw) @@ -2359,40 +2348,20 @@ call writediagfi(ngrid,"zdtdyn","Dyn. heating","T s-1",3,zdtdyn) - !Pluto specific - ! call writediagfi(ngrid,"zdtc","tendancy T cond N2","K",3,zdtc) - ! call writediagfi(ngrid,"zdtch4cloud","tendancy T ch4cloud","K",3,zdtch4cloud) - ! call writediagfi(ngrid,"zdtcocloud","tendancy T cocloud","K",3,zdtcocloud) - ! call writediagfi(ngrid,"zq1temp_ch4"," "," ",2,zq1temp_ch4) - ! call writediagfi(ngrid,"qsat_ch4"," "," ",2,qsat_ch4) - ! call writediagfi(ngrid,"qsat_ch4_l1"," "," ",2,qsat_ch4_l1) - ! call writediagfi(ngrid,"senshf1","senshf1"," ",2,sensiblehf1) - ! call writediagfi(ngrid,"senshf2","senshf2"," ",2,sensiblehf2) - - ! For Debugging. !call writediagfi(ngrid,'rnat','Terrain type',' ',2,real(rnat)) !call writediagfi(ngrid,'pphi','Geopotential',' ',3,pphi) - - ! Output aerosols.!AF: TODO: write haze aerosols - ! if (igcm_n2_ice.ne.0.and.iaero_haze.ne.0) & - ! call writediagfi(ngrid,'N2ice_reff','N2ice_reff','m',3,reffrad(1,1,iaero_haze)) - ! if (igcm_n2_ice.ne.0.and.iaero_haze.ne.0) & - ! call writediagfi(ngrid,'N2ice_reffcol','N2ice_reffcol','um kg m^-2',2,reffcol(1,iaero_haze)) - ! if (igcm_h2o_ice.ne.0.and.iaero_h2o.ne.0) & !AF24: removed - ! Output tracers. if (tracer) then + ! call writediagfi(ngrid,"zdtc","tendancy T cond N2","K",3,zdtc) do iq=1,nq - call writediagfi(ngrid,noms(iq),noms(iq),'kg/kg',3,zq(1,1,iq)) - ! call writediagfi(ngrid,trim(noms(iq))//'_surf',trim(noms(iq))//'_surf', & + call writediagfi(ngrid,noms(iq),noms(iq),'kg/kg',3,zq(1,1,iq)) + ! call writediagfi(ngrid,trim(noms(iq))//'_surf',trim(noms(iq))//'_surf', & ! 'kg m^-2',2,qsurf_hist(1,iq) ) call writediagfi(ngrid,trim(noms(iq))//'_col',trim(noms(iq))//'_col', & 'kg m^-2',2,qcol(1,iq) ) - call writediagfi(ngrid,trim(noms(iq))//'_surf',trim(noms(iq))//'_surf', & + call writediagfi(ngrid,trim(noms(iq))//'_surf',trim(noms(iq))//'_surf', & 'kg m^-2',2,qsurf(1,iq) ) - - ! if(watercond.or.CLFvarying)then !AF24: removed if(generic_condensation)then @@ -2401,18 +2370,18 @@ call writediagfi(ngrid,"RH_generic","GCS relative humidity"," ",3,RH_generic) endif - - ! if(generic_rain)then !AF24: removed - ! if((hydrology).and.(.not.ok_slab_ocean))then !AF24: removed - ! call writediagfi(ngrid,"tau_col","Total aerosol optical depth","[]",2,tau_col) - enddo ! end of 'nq' loop !Pluto specific call writediagfi(ngrid,'n2_iceflux','n2_iceflux',"kg m^-2 s^-1",2,flusurf(1,igcm_n2) ) - if (aerohaze)then + if (haze_radproffix)then call writediagfi(ngrid,'haze_reff','haze_reff','m',3,reffrad(1,1,1)) end if if (methane) then + ! call writediagfi(ngrid,"rice_ch4","ch4 ice mass mean radius","m",3,rice_ch4) + ! call writediagfi(ngrid,"zq1temp_ch4"," "," ",2,zq1temp_ch4) + ! call writediagfi(ngrid,"qsat_ch4"," "," ",2,qsat_ch4) + ! call writediagfi(ngrid,"qsat_ch4_l1"," "," ",2,qsat_ch4_l1) + call writediagfi(ngrid,'ch4_iceflux','ch4_iceflux',& "kg m^-2 s^-1",2,flusurf(1,igcm_ch4_ice) ) @@ -2423,14 +2392,12 @@ ! Tendancies - !call writediagfi(ngrid,"zdqch4cloud","ch4 cloud","T s-1",& - ! 3,zdqch4cloud(1,1,igcm_ch4_gas)) - ! call writediagfi(ngrid,"zdqcn2_ch4","zdq condn2 ch4","",& - ! 3,zdqc(:,:,igcm_ch4_gas)) - ! call writediagfi(ngrid,"zdqdif_ch4","zdqdif ch4","",& - ! 3,zdqdif(:,:,igcm_ch4_gas)) - ! call writediagfi(ngrid,"zdqsdif_ch4_ice","zdqsdif ch4","",& - ! 2,zdqsdif(:,igcm_ch4_ice)) - ! call writediagfi(ngrid,"zdqadj_ch4","zdqadj ch4","",& - ! 3,zdqadj(:,:,igcm_ch4_gas)) + call writediagfi(ngrid,"zdqcn2_ch4","zdq condn2 ch4","",& + 3,zdqc(:,:,igcm_ch4_gas)) + call writediagfi(ngrid,"zdqdif_ch4","zdqdif ch4","",& + 3,zdqdif(:,:,igcm_ch4_gas)) + call writediagfi(ngrid,"zdqsdif_ch4_ice","zdqsdif ch4","",& + 2,zdqsdif(:,igcm_ch4_ice)) + call writediagfi(ngrid,"zdqadj_ch4","zdqadj ch4","",& + 3,zdqadj(:,:,igcm_ch4_gas)) if (sedimentation) then call writediagfi(ngrid,"zdqsed_ch4","zdqsed ch4","",& @@ -2449,4 +2416,5 @@ if (carbox) then + ! call writediagfi(ngrid,"zdtcocloud","tendancy T cocloud","K",3,zdtcocloud) call writediagfi(ngrid,'co_iceflux','co_iceflux',& "kg m^-2 s^-1",2,flusurf(1,igcm_co_ice) ) @@ -2503,8 +2471,6 @@ comm_ALBEQ(1:ngrid)=albedo_equivalent(1:ngrid) if (.not.calldifv) comm_LATENT_HF(:)=0.0 - ! if ((tracer).and.(water)) then !AF24: removed if ((tracer).and.(generic_condensation)) then - ! .and.(.not. water) ! If you have set generic_condensation (and not water) and you have set several GCS @@ -2557,20 +2523,4 @@ sensibFlux(1:ngrid) = zflubid(1:ngrid) - capcal(1:ngrid)*zdtsdif(1:ngrid) !!! ???? comm_HR_DYN(1:ngrid,1:nlayer) = zdtdyn(1:ngrid,1:nlayer) - -! if (turb_resolved) then -! open(17,file='lsf.txt',form='formatted',status='old') -! rewind(17) -! DO l=1,nlayer -! read(17,*) lsf_dt(l),lsf_dq(l) -! ENDDO -! close(17) -! do ig=1,ngrid -! if ((tracer).and.(water)) then -! pdq(ig,:,igcm_h2o_gas) = pdq(ig,:,igcm_h2o_gas) + lsf_dq(:) -! endif -! pdt(ig,:) = pdt(ig,:) + lsf_dt(:) -! comm_HR_DYN(ig,:) = lsf_dt(:) -! enddo -! endif #endif @@ -2587,8 +2537,5 @@ CALL send_xios_field("u",zu) CALL send_xios_field("v",zv) - CALL send_xios_field("omega",omega) - -! IF (calltherm) THEN !AF24: removed - ! IF (water) THEN !AF24: removed + call send_xios_field("w",pw) CALL send_xios_field("ISR",fluxtop_dn) Index: trunk/LMDZ.PLUTO/libf/phypluto/tabfi_mod.F90 =================================================================== --- trunk/LMDZ.PLUTO/libf/phypluto/tabfi_mod.F90 (revision 3452) +++ trunk/LMDZ.PLUTO/libf/phypluto/tabfi_mod.F90 (revision 3453) @@ -192,6 +192,11 @@ ! boundary layer and turbulence z0 = tab_cntrl(tab0+19) - lmixmin = tab_cntrl(tab0+20) - emin_turb = tab_cntrl(tab0+21) +! for paleoclimate + tpal = tab_cntrl(tab0+20) + adjust = tab_cntrl(tab0+21) ! for Triton albedo adjustment + ! lmixmin = tab_cntrl(tab0+20) + ! emin_turb = tab_cntrl(tab0+21) + +!!! AF24: parameters below are not used? ! optical properties of polar caps and ground emissivity emisice(1) = tab_cntrl(tab0+24)