Index: trunk/LMDZ.PLUTO/libf/dynphy_lonlat/phypluto/start2archive.F =================================================================== --- trunk/LMDZ.PLUTO/libf/dynphy_lonlat/phypluto/start2archive.F (revision 3371) +++ trunk/LMDZ.PLUTO/libf/dynphy_lonlat/phypluto/start2archive.F (revision 3380) @@ -23,10 +23,10 @@ ! use slab_ice_h, only: noceanmx - USE ocean_slab_mod, ONLY: nslay +c USE ocean_slab_mod, ONLY: nslay USE ioipsl_getincom, only: getin USE planete_mod, only: year_day USE mod_const_mpi, ONLY: COMM_LMDZ USE control_mod, only: planet_type - USE callkeys_mod, ONLY: ok_slab_ocean +c USE callkeys_mod, ONLY: ok_slab_ocean use filtreg_mod, only: inifilr USE comvert_mod, ONLY: ap,bp @@ -36,6 +36,6 @@ use phys_state_var_mod, only: phys_state_var_init use phyetat0_mod, only: phyetat0 - use nonoro_gwd_ran_mod, only: du_nonoro_gwd, dv_nonoro_gwd, - & east_gwstress, west_gwstress +c use nonoro_gwd_ran_mod, only: du_nonoro_gwd, dv_nonoro_gwd, +c & east_gwstress, west_gwstress use exner_hyb_m, only: exner_hyb implicit none @@ -136,6 +136,6 @@ allocate(qsurf(ngridmx,nqtot)) allocate(qsurfS(ip1jmp1,nqtot)) - allocate(tslab(ngridmx,nslay)) !Added by SB for slab ocean - allocate(tslabS(ip1jmp1,nslay)) !Added by SB for slab ocean +c allocate(tslab(ngridmx,nslay)) !Added by SB for slab ocean +c allocate(tslabS(ip1jmp1,nslay)) !Added by SB for slab ocean ! other array allocations: ! call ini_comsoil_h(ngridmx) ! done via iniphysiq @@ -222,9 +222,9 @@ CALL phyetat0(.true.,ngridmx,llm,fichnom,0,Lmodif,nsoilmx,nqtot, . day_ini_fi,timefi, - . tsurf,tsoil,emis,q2,qsurf, + . tsurf,tsoil,emis,q2,qsurf) ! change FF 05/2011 - . cloudfrac,totalcloudfrac,hice, +c . cloudfrac,totalcloudfrac,hice, ! change BC 05/2014 - . rnat,pctsrf_sic,tslab,tsea_ice,sea_ice) +c . rnat,pctsrf_sic,tslab,tsea_ice,sea_ice) @@ -330,18 +330,18 @@ call gr_fi_dyn(llm+1,ngridmx,iip1,jjp1,q2,q2S) call gr_fi_dyn(nqtot,ngridmx,iip1,jjp1,qsurf,qsurfS) - call gr_fi_dyn(llm,ngridmx,iip1,jjp1,cloudfrac,cloudfracS) - call gr_fi_dyn(1,ngridmx,iip1,jjp1,hice,hiceS) - call gr_fi_dyn(1,ngridmx,iip1,jjp1,totalcloudfrac,totalcloudfracS) - - call gr_fi_dyn(1,ngridmx,iip1,jjp1,rnat,rnatS) - call gr_fi_dyn(1,ngridmx,iip1,jjp1,pctsrf_sic,pctsrf_sicS) - call gr_fi_dyn(1,ngridmx,iip1,jjp1,tsea_ice,tsea_iceS) - call gr_fi_dyn(1,ngridmx,iip1,jjp1,sea_ice,sea_iceS) - call gr_fi_dyn(nslay,ngridmx,iip1,jjp1,tslab,tslabS) - - call gr_fi_dyn(llm,ngridmx,iip1,jjp1,du_nonoro_gwd,du_nonoro_gwdS) - call gr_fi_dyn(llm,ngridmx,iip1,jjp1,dv_nonoro_gwd,dv_nonoro_gwdS) - call gr_fi_dyn(llm,ngridmx,iip1,jjp1,east_gwstress,east_gwstressS) - call gr_fi_dyn(llm,ngridmx,iip1,jjp1,west_gwstress,west_gwstressS) +c call gr_fi_dyn(llm,ngridmx,iip1,jjp1,cloudfrac,cloudfracS) +c call gr_fi_dyn(1,ngridmx,iip1,jjp1,hice,hiceS) +c call gr_fi_dyn(1,ngridmx,iip1,jjp1,totalcloudfrac,totalcloudfracS) + +c call gr_fi_dyn(1,ngridmx,iip1,jjp1,rnat,rnatS) +c call gr_fi_dyn(1,ngridmx,iip1,jjp1,pctsrf_sic,pctsrf_sicS) +c call gr_fi_dyn(1,ngridmx,iip1,jjp1,tsea_ice,tsea_iceS) +c call gr_fi_dyn(1,ngridmx,iip1,jjp1,sea_ice,sea_iceS) +c call gr_fi_dyn(nslay,ngridmx,iip1,jjp1,tslab,tslabS) + +c call gr_fi_dyn(llm,ngridmx,iip1,jjp1,du_nonoro_gwd,du_nonoro_gwdS) +c call gr_fi_dyn(llm,ngridmx,iip1,jjp1,dv_nonoro_gwd,dv_nonoro_gwdS) +c call gr_fi_dyn(llm,ngridmx,iip1,jjp1,east_gwstress,east_gwstressS) +c call gr_fi_dyn(llm,ngridmx,iip1,jjp1,west_gwstress,west_gwstressS) c======================================================================= c Info pour controler @@ -490,10 +490,10 @@ c Ecriture du champs cloudfrac,hice,totalcloudfrac c----------------------------------------------------------------------- - call write_archive(nid,ntime,'hice', - & 'Height of oceanic ice','m',2,hiceS) - call write_archive(nid,ntime,'totalcloudfrac', - & 'Total cloud Fraction','',2,totalcloudfracS) - call write_archive(nid,ntime,'cloudfrac' - & ,'Cloud fraction','',3,cloudfracS) +c call write_archive(nid,ntime,'hice', +c & 'Height of oceanic ice','m',2,hiceS) +c call write_archive(nid,ntime,'totalcloudfrac', +c & 'Total cloud Fraction','',2,totalcloudfracS) +c call write_archive(nid,ntime,'cloudfrac' +c & ,'Cloud fraction','',3,cloudfracS) c----------------------------------------------------------------------- @@ -506,36 +506,36 @@ IF(ierr.EQ.0) THEN - write(*,*) "Use slab-ocean ?" - ok_slab_ocean=.false. ! default value - call getin("ok_slab_ocean",ok_slab_ocean) - write(*,*) "ok_slab_ocean = ",ok_slab_ocean - - if(ok_slab_ocean) then - call write_archive(nid,ntime,'rnat' - & ,'rnat','',2,rnatS) - call write_archive(nid,ntime,'pctsrf_sic' - & ,'pctsrf_sic','',2,pctsrf_sicS) - call write_archive(nid,ntime,'sea_ice' - & ,'sea_ice','',2,sea_iceS) - call write_archive(nid,ntime,'tslab' - & ,'tslab','',-2,tslabS) - call write_archive(nid,ntime,'tsea_ice' - & ,'tsea_ice','',2,tsea_iceS) - endif !ok_slab_ocean +c write(*,*) "Use slab-ocean ?" +c ok_slab_ocean=.false. ! default value +c call getin("ok_slab_ocean",ok_slab_ocean) +c write(*,*) "ok_slab_ocean = ",ok_slab_ocean + +c if(ok_slab_ocean) then +c call write_archive(nid,ntime,'rnat' +c & ,'rnat','',2,rnatS) +c call write_archive(nid,ntime,'pctsrf_sic' +c & ,'pctsrf_sic','',2,pctsrf_sicS) +c call write_archive(nid,ntime,'sea_ice' +c & ,'sea_ice','',2,sea_iceS) +c call write_archive(nid,ntime,'tslab' +c & ,'tslab','',-2,tslabS) +c call write_archive(nid,ntime,'tsea_ice' +c & ,'tsea_ice','',2,tsea_iceS) +c endif !ok_slab_ocean ENDIF ! of IF(ierr.EQ.0) ! Non-orographic gavity waves - call write_archive(nid,ntime,"du_nonoro_gwd", - & "Zonal wind tendency due to GW",'m.s-1',3,du_nonoro_gwdS) - call write_archive(nid,ntime,"dv_nonoro_gwd", - & "Meridional wind tendency due to GW",'m.s-1', - & 3,dv_nonoro_gwdS) - call write_archive(nid,ntime,"east_gwstress", - & "Eastward stress profile due to GW",'kg.m-1.s-2', - & 3,east_gwstressS) - call write_archive(nid,ntime,"west_gwstress", - & "Westward stress profile due to GW",'kg.m-1.s-2', - & 3,west_gwstressS) +c call write_archive(nid,ntime,"du_nonoro_gwd", +c & "Zonal wind tendency due to GW",'m.s-1',3,du_nonoro_gwdS) +c call write_archive(nid,ntime,"dv_nonoro_gwd", +c & "Meridional wind tendency due to GW",'m.s-1', +c & 3,dv_nonoro_gwdS) +c call write_archive(nid,ntime,"east_gwstress", +c & "Eastward stress profile due to GW",'kg.m-1.s-2', +c & 3,east_gwstressS) +c call write_archive(nid,ntime,"west_gwstress", +c & "Westward stress profile due to GW",'kg.m-1.s-2', +c & 3,west_gwstressS) c-----------------------------------------------------------------------