Index: /LMDZ5/trunk/libf/phylmd/dyn1d/1D_decl_cases.h =================================================================== --- /LMDZ5/trunk/libf/phylmd/dyn1d/1D_decl_cases.h (revision 2331) +++ /LMDZ5/trunk/libf/phylmd/dyn1d/1D_decl_cases.h (revision 2332) @@ -251,4 +251,5 @@ real hu_mod_cas(llm),vu_mod_cas(llm),du_mod_cas(llm) real hv_mod_cas(llm),vv_mod_cas(llm),dv_mod_cas(llm) -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - + integer day_ini_cas +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + Index: /LMDZ5/trunk/libf/phylmd/dyn1d/1D_interp_cases.h =================================================================== --- /LMDZ5/trunk/libf/phylmd/dyn1d/1D_interp_cases.h (revision 2331) +++ /LMDZ5/trunk/libf/phylmd/dyn1d/1D_interp_cases.h (revision 2332) @@ -613,15 +613,17 @@ ! time interpolation: - CALL interp_case_time(daytime,day1,annee_ref & - & ,year_ini_cas,day_ju_ini_cas,nt_cas,pdt_cas,nlev_cas & - & ,ts_cas,plev_cas,t_cas,q_cas,u_cas,v_cas,ug_cas,vg_cas & - & ,vitw_cas,du_cas,hu_cas,vu_cas & - & ,dv_cas,hv_cas,vv_cas,dt_cas,ht_cas,vt_cas,dtrad_cas & - & ,dq_cas,hq_cas,vq_cas,lat_cas,sens_cas,ustar_cas & + CALL interp_case_time(daytime,day1,annee_ref & +! & ,year_ini_cas,day_ju_ini_cas,nt_cas,pdt_cas,nlev_cas & + & ,nt_cas,nlev_cas & + & ,ts_cas,plev_cas,t_cas,q_cas,u_cas,v_cas,ug_cas,vg_cas & + & ,vitw_cas,du_cas,hu_cas,vu_cas & + & ,dv_cas,hv_cas,vv_cas,dt_cas,ht_cas,vt_cas,dtrad_cas & + & ,dq_cas,hq_cas,vq_cas,lat_cas,sens_cas,ustar_cas & + & ,uw_cas,vw_cas,q1_cas,q2_cas & & ,ts_prof_cas,plev_prof_cas,t_prof_cas,q_prof_cas,u_prof_cas,v_prof_cas & & ,ug_prof_cas,vg_prof_cas,vitw_prof_cas,du_prof_cas,hu_prof_cas,vu_prof_cas & & ,dv_prof_cas,hv_prof_cas,vv_prof_cas,dt_prof_cas,ht_prof_cas,vt_prof_cas & & ,dtrad_prof_cas,dq_prof_cas,hq_prof_cas,vq_prof_cas,lat_prof_cas & - & ,sens_prof_cas,ustar_prof_cas) + & ,sens_prof_cas,ustar_prof_cas,uw_prof_cas,vw_prof_cas,q1_prof_cas,q2_prof_cas) ts_cur = ts_prof_cas Index: /LMDZ5/trunk/libf/phylmd/dyn1d/1D_read_forc_cases.h =================================================================== --- /LMDZ5/trunk/libf/phylmd/dyn1d/1D_read_forc_cases.h (revision 2331) +++ /LMDZ5/trunk/libf/phylmd/dyn1d/1D_read_forc_cases.h (revision 2332) @@ -326,5 +326,5 @@ write(*,*) 'SST initiale mxcalc: ',tsurf,mxcalc do l = 1, llm -! Ligne du dessous à decommenter si on lit theta au lieu de temp +! Ligne du dessous ?? decommenter si on lit theta au lieu de temp ! temp(l) = t_mod(l)*(play(l)/pzero)**rkappa temp(l) = t_mod(l) @@ -410,5 +410,5 @@ & ,ht_mod,hq_mod,hu_mod,hv_mod,w_mod,omega_mod,mxcalc) -! Pour tester les advections horizontales de T et Q, on met w_mod et omega_mod à zero (MPL 20131108) +! Pour tester les advections horizontales de T et Q, on met w_mod et omega_mod ?? zero (MPL 20131108) ! w_mod(:,:)=0. ! omega_mod(:,:)=0. @@ -424,5 +424,5 @@ write(*,*) 'SST initiale mxcalc: ',tsurf,mxcalc do l = 1, llm -! Ligne du dessous à decommenter si on lit theta au lieu de temp +! Ligne du dessous ?? decommenter si on lit theta au lieu de temp temp(l) = th_mod(l)*(play(l)/pzero)**rkappa ! temp(l) = t_mod(l) @@ -736,14 +736,17 @@ !Time interpolation for initial conditions using TOGA interpolation routine write(*,*) 'AVT 1ere INTERPOLATION: day,day1 = ',daytime,day1 - CALL interp_case_time(day,day1,annee_ref & - & ,year_ini_cas,day_ju_ini_cas,nt_cas,pdt_cas,nlev_cas & - & ,ts_cas,plev_cas,t_cas,q_cas,u_cas,v_cas & - & ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas & - & ,dv_cas,hv_cas,vv_cas,dt_cas,ht_cas,vt_cas,dtrad_cas & - & ,dq_cas,hq_cas,vq_cas,lat_cas,sens_cas,ustar_cas & - & ,ts_prof_cas,plev_prof_cas,t_prof_cas,q_prof_cas,u_prof_cas,v_prof_cas & - & ,ug_prof_cas,vg_prof_cas,vitw_prof_cas,du_prof_cas,hu_prof_cas,vu_prof_cas & - & ,dv_prof_cas,hv_prof_cas,vv_prof_cas,dt_prof_cas,ht_prof_cas,vt_prof_cas,dtrad_prof_cas & - & ,dq_prof_cas,hq_prof_cas,vq_prof_cas,lat_prof_cas,sens_prof_cas,ustar_prof_cas) + CALL interp_case_time(day,day1,annee_ref & +! & ,year_ini_cas,day_ju_ini_cas,nt_cas,pdt_cas,nlev_cas & + & ,nt_cas,nlev_cas & + & ,ts_cas,plev_cas,t_cas,q_cas,u_cas,v_cas & + & ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas & + & ,dv_cas,hv_cas,vv_cas,dt_cas,ht_cas,vt_cas,dtrad_cas & + & ,dq_cas,hq_cas,vq_cas,lat_cas,sens_cas,ustar_cas & + & ,uw_cas,vw_cas,q1_cas,q2_cas & + & ,ts_prof_cas,plev_prof_cas,t_prof_cas,q_prof_cas,u_prof_cas,v_prof_cas & + & ,ug_prof_cas,vg_prof_cas,vitw_prof_cas,du_prof_cas,hu_prof_cas,vu_prof_cas & + & ,dv_prof_cas,hv_prof_cas,vv_prof_cas,dt_prof_cas,ht_prof_cas,vt_prof_cas,dtrad_prof_cas & + & ,dq_prof_cas,hq_prof_cas,vq_prof_cas,lat_prof_cas,sens_prof_cas,ustar_prof_cas & + & ,uw_prof_cas,vw_prof_cas,q1_prof_cas,q2_prof_cas) ! vertical interpolation using TOGA interpolation routine: Index: /LMDZ5/trunk/libf/phylmd/dyn1d/date_cas.h =================================================================== --- /LMDZ5/trunk/libf/phylmd/dyn1d/date_cas.h (revision 2332) +++ /LMDZ5/trunk/libf/phylmd/dyn1d/date_cas.h (revision 2332) @@ -0,0 +1,9 @@ + integer :: year_ini_cas ! initial year of the case + integer :: mth_ini_cas ! initial month of the case + integer :: day_deb ! initial day of the case + real :: heure_ini_cas ! start time of the case + real :: pdt_cas ! forcing_frequency + real :: day_ju_ini_cas ! julian day of initial day of the case + + common /date_cas/year_ini_cas,mth_ini_cas,day_deb,heure_ini_cas,pdt_cas,day_ju_ini_cas + Index: /LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90 =================================================================== --- /LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90 (revision 2331) +++ /LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90 (revision 2332) @@ -36,4 +36,5 @@ #include "compar1d.h" #include "flux_arp.h" +#include "date_cas.h" #include "tsoilnudge.h" #include "fcg_gcssold.h" @@ -284,7 +285,9 @@ ! Different stages: soil model alone, atm. model alone ! then both models coupled -!forcing_type = 10 ==> forcing_case = .true. +!forcing_type >= 100 ==> forcing_case = .true. ! initial profiles and large scale forcings in cas.nc ! LS convergence, omega and SST imposed from CINDY-DYNAMO files +! 101=cindynamo +! 102=bomex !forcing_type = 40 ==> forcing_GCSSold = .true. ! initial profile from GCSS file @@ -323,6 +326,18 @@ elseif (forcing_type .eq.7) THEN forcing_dice = .true. - elseif (forcing_type .eq.10) THEN + elseif (forcing_type .eq.101) THEN ! Cindynamo starts 1-10-2011 0h forcing_case = .true. + year_ini_cas=2011 + mth_ini_cas=10 + day_deb=1 + heure_ini_cas=0. + pdt_cas=3*3600. ! forcing frequency + elseif (forcing_type .eq.102) THEN ! Bomex starts 24-6-1969 0h + forcing_case = .true. + year_ini_cas=1969 + mth_ini_cas=6 + day_deb=24 + heure_ini_cas=0. + pdt_cas=1800. ! forcing frequency elseif (forcing_type .eq.40) THEN forcing_GCSSold = .true. @@ -396,4 +411,5 @@ fnday=-nday/float(day_step) endif + print *,'fnday=',fnday ! Special case for arm_cu which lasts less than one day : 53100s !! (MPL 20111026) @@ -432,11 +448,12 @@ & (year_ini_dice,mth_ini_dice,day_ini_dice,heure_ini_dice & & ,day_ju_ini_dice) - ELSEIF (forcing_type .eq.10) THEN + ELSEIF (forcing_type .gt.100) THEN ! Convert the initial date to Julian day - print*,'time cindy',year_ini_cas,mth_ini_cas,day_ini_cas + day_ini_cas=day_deb + print*,'time case',year_ini_cas,mth_ini_cas,day_ini_cas call ymds2ju & - & (year_ini_cas,mth_ini_cas,day_ini_cas,heure_ini_cas & + & (year_ini_cas,mth_ini_cas,day_ini_cas,heure_ini_cas & & ,day_ju_ini_cas) - print*,'time cindy 2',day_ju_ini_cas + print*,'time case 2',day_ini_cas,day_ju_ini_cas ELSEIF (forcing_type .eq.59) THEN ! Convert the initial date of Sandu case to Julian day @@ -576,5 +593,5 @@ print*,'play=',play(mxcalc) -!Al1 pour SST forced, appellé depuis ocean_forced_noice +!Al1 pour SST forced, appell?? depuis ocean_forced_noice ts_cur = tsurf ! SST used in read_tsurf1d !===================================================================== @@ -806,5 +823,5 @@ if (prt_level.ge.1) then print*,'XXXXXXXXXXXXXXXXXXX ITAP,day,time=', & - & it,day,time,nint(fnday*day_step) + & it,day,time,nint(fnday*day_step),day_step print*,'PAS DE TEMPS ',timestep endif Index: /LMDZ5/trunk/libf/phylmd/dyn1d/mod_1D_cases_read.F90 =================================================================== --- /LMDZ5/trunk/libf/phylmd/dyn1d/mod_1D_cases_read.F90 (revision 2331) +++ /LMDZ5/trunk/libf/phylmd/dyn1d/mod_1D_cases_read.F90 (revision 2332) @@ -7,20 +7,20 @@ !Declarations specifiques au cas standard character*80 :: fich_cas -! Discrétisation +! Discr?tisation integer nlev_cas, nt_cas - integer year_ini_cas, day_ini_cas, mth_ini_cas - real heure_ini_cas - real day_ju_ini_cas ! Julian day of case first day +! integer year_ini_cas, day_ini_cas, mth_ini_cas +! real heure_ini_cas +! real day_ju_ini_cas ! Julian day of case first day ! parameter (year_ini_cas=2011) - parameter (year_ini_cas=1969) +! parameter (year_ini_cas=1969) ! parameter (mth_ini_cas=10) - parameter (mth_ini_cas=6) +! parameter (mth_ini_cas=6) ! parameter (day_ini_cas=1) ! 10 = 10Juil2006 - parameter (day_ini_cas=24) ! 24 = 24 juin 1969 - parameter (heure_ini_cas=0.) !0h en secondes - real pdt_cas - parameter (pdt_cas=3.*3600) +! parameter (day_ini_cas=24) ! 24 = 24 juin 1969 +! parameter (heure_ini_cas=0.) !0h en secondes +! real pdt_cas +! parameter (pdt_cas=3.*3600) !CR ATTENTION TEST AMMA @@ -50,4 +50,5 @@ real, allocatable:: ug_cas(:,:),vg_cas(:,:) real, allocatable:: lat_cas(:),sens_cas(:),ts_cas(:),ustar_cas(:) + real, allocatable:: uw_cas(:,:),vw_cas(:,:),q1_cas(:,:),q2_cas(:,:) !champs interpoles @@ -74,4 +75,8 @@ real, allocatable:: du_prof_cas(:) real, allocatable:: dv_prof_cas(:) + real, allocatable:: uw_prof_cas(:) + real, allocatable:: vw_prof_cas(:) + real, allocatable:: q1_prof_cas(:) + real, allocatable:: q2_prof_cas(:) @@ -105,5 +110,5 @@ ENDIF ierr=NF_INQ_DIMLEN(nid,rid,ii) - print*,'OK nid,rid,lat',nid,rid,ii + print*,'OK1 nid,rid,lat',nid,rid,ii !....................................................................... ierr=NF_INQ_DIMID(nid,'lon',rid) @@ -112,5 +117,5 @@ ENDIF ierr=NF_INQ_DIMLEN(nid,rid,jj) - print*,'OK nid,rid,lat',nid,rid,jj + print*,'OK2 nid,rid,lat',nid,rid,jj !....................................................................... ierr=NF_INQ_DIMID(nid,'lev',rid) @@ -119,5 +124,5 @@ ENDIF ierr=NF_INQ_DIMLEN(nid,rid,nlev_cas) - print*,'OK nid,rid,nlev_cas',nid,rid,nlev_cas + print*,'OK3 nid,rid,nlev_cas',nid,rid,nlev_cas !....................................................................... ierr=NF_INQ_DIMID(nid,'time',rid) @@ -128,5 +133,5 @@ ENDIF ierr=NF_INQ_DIMLEN(nid,rid,nt_cas) - print*,'nid,rid,nlev_cas',nid,rid,nt_cas + print*,'OK4 nid,rid,nt_cas',nid,rid,nt_cas !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -150,4 +155,5 @@ allocate(vg_cas(nlev_cas,nt_cas)) allocate(lat_cas(nt_cas),sens_cas(nt_cas),ts_cas(nt_cas),ustar_cas(nt_cas)) + allocate(uw_cas(nlev_cas,nt_cas),vw_cas(nlev_cas,nt_cas),q1_cas(nlev_cas,nt_cas),q2_cas(nlev_cas,nt_cas)) @@ -175,11 +181,17 @@ allocate(du_prof_cas(nlev_cas)) allocate(dv_prof_cas(nlev_cas)) + allocate(uw_prof_cas(nlev_cas)) + allocate(vw_prof_cas(nlev_cas)) + allocate(q1_prof_cas(nlev_cas)) + allocate(q2_prof_cas(nlev_cas)) print*,'Allocations OK' - call read_cas(nid,nlev_cas,nt_cas & - & ,z_cas,plev_cas,t_cas,q_cas,rh_cas,th_cas,rv_cas,u_cas,v_cas & - & ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas,dv_cas,hv_cas,vv_cas & - & ,dt_cas,dtrad_cas,ht_cas,vt_cas,dq_cas,hq_cas,vq_cas & - & ,dth_cas,hth_cas,vth_cas,dr_cas,hr_cas,vr_cas,sens_cas,lat_cas,ts_cas,ustar_cas) + call read_cas(nid,nlev_cas,nt_cas & + & ,z_cas,plev_cas,t_cas,q_cas,rh_cas,th_cas,rv_cas,u_cas,v_cas & + & ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas,dv_cas,hv_cas,vv_cas & + & ,dt_cas,dtrad_cas,ht_cas,vt_cas,dq_cas,hq_cas,vq_cas & + & ,dth_cas,hth_cas,vth_cas,dr_cas,hr_cas,vr_cas,sens_cas,lat_cas,ts_cas& + & ,ustar_cas,uw_cas,vw_cas,q1_cas,q2_cas) + print*,'Read cas OK' @@ -209,5 +221,5 @@ deallocate(ug_cas) deallocate(vg_cas) - deallocate(lat_cas,sens_cas,ts_cas,ustar_cas) + deallocate(lat_cas,sens_cas,ts_cas,ustar_cas,uw_cas,vw_cas,q1_cas,q2_cas) !champs interpoles @@ -238,4 +250,8 @@ deallocate(u_prof_cas) deallocate(v_prof_cas) + deallocate(uw_prof_cas) + deallocate(vw_prof_cas) + deallocate(q1_prof_cas) + deallocate(q2_prof_cas) END SUBROUTINE deallocate_1D_cases @@ -247,5 +263,5 @@ & ,zz,pp,temp,qv,rh,theta,rv,u,v,ug,vg,w, & & du,hu,vu,dv,hv,vv,dt,dtrad,ht,vt,dq,hq,vq, & - & dth,hth,vth,dr,hr,vr,sens,flat,ts,ustar) + & dth,hth,vth,dr,hr,vr,sens,flat,ts,ustar,uw,vw,q1,q2) !program reading forcing of the case study @@ -272,4 +288,5 @@ real dr(nlevel,ntime),hr(nlevel,ntime),vr(nlevel,ntime) real flat(ntime),sens(ntime),ts(ntime),ustar(ntime) + real uw(nlevel,ntime),vw(nlevel,ntime),q1(nlevel,ntime),q2(nlevel,ntime) @@ -490,4 +507,28 @@ stop 'ustar' endif + + ierr=NF_INQ_VARID(nid,"uw",var3didin(36)) + if(ierr/=NF_NOERR) then + write(*,*) NF_STRERROR(ierr) + stop 'uw' + endif + + ierr=NF_INQ_VARID(nid,"vw",var3didin(37)) + if(ierr/=NF_NOERR) then + write(*,*) NF_STRERROR(ierr) + stop 'vw' + endif + + ierr=NF_INQ_VARID(nid,"q1",var3didin(38)) + if(ierr/=NF_NOERR) then + write(*,*) NF_STRERROR(ierr) + stop 'q1' + endif + + ierr=NF_INQ_VARID(nid,"q2",var3didin(39)) + if(ierr/=NF_NOERR) then + write(*,*) NF_STRERROR(ierr) + stop 'q2' + endif #ifdef NC_DOUBLE @@ -876,4 +917,48 @@ endif ! write(*,*)'lecture ustar ok',ustar + +#ifdef NC_DOUBLE + ierr = NF_GET_VAR_DOUBLE(nid,var3didin(36),uw) +#else + ierr = NF_GET_VAR_REAL(nid,var3didin(36),uw) +#endif + if(ierr/=NF_NOERR) then + write(*,*) NF_STRERROR(ierr) + stop "getvarup" + endif +! write(*,*)'lecture uw ok',uw + +#ifdef NC_DOUBLE + ierr = NF_GET_VAR_DOUBLE(nid,var3didin(37),vw) +#else + ierr = NF_GET_VAR_REAL(nid,var3didin(37),vw) +#endif + if(ierr/=NF_NOERR) then + write(*,*) NF_STRERROR(ierr) + stop "getvarup" + endif +! write(*,*)'lecture vw ok',vw + +#ifdef NC_DOUBLE + ierr = NF_GET_VAR_DOUBLE(nid,var3didin(38),q1) +#else + ierr = NF_GET_VAR_REAL(nid,var3didin(38),q1) +#endif + if(ierr/=NF_NOERR) then + write(*,*) NF_STRERROR(ierr) + stop "getvarup" + endif +! write(*,*)'lecture q1 ok',q1 + +#ifdef NC_DOUBLE + ierr = NF_GET_VAR_DOUBLE(nid,var3didin(39),q2) +#else + ierr = NF_GET_VAR_REAL(nid,var3didin(39),q2) +#endif + if(ierr/=NF_NOERR) then + write(*,*) NF_STRERROR(ierr) + stop "getvarup" + endif +! write(*,*)'lecture q2 ok',q2 @@ -882,9 +967,11 @@ !====================================================================== SUBROUTINE interp_case_time(day,day1,annee_ref & - & ,year_ini_cas,day_ini_cas,nt_cas,pdt_cas,nlev_cas & +! & ,year_cas,day_cas,nt_cas,pdt_forc,nlev_cas & + & ,nt_cas,nlev_cas & & ,ts_cas,plev_cas,t_cas,q_cas,u_cas,v_cas & & ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas & & ,dv_cas,hv_cas,vv_cas,dt_cas,ht_cas,vt_cas,dtrad_cas & & ,dq_cas,hq_cas,vq_cas,lat_cas,sens_cas,ustar_cas & + & ,uw_cas,vw_cas,q1_cas,q2_cas & & ,ts_prof_cas,plev_prof_cas,t_prof_cas,q_prof_cas & & ,u_prof_cas,v_prof_cas,ug_prof_cas,vg_prof_cas & @@ -892,5 +979,6 @@ & ,dv_prof_cas,hv_prof_cas,vv_prof_cas,dt_prof_cas & & ,ht_prof_cas,vt_prof_cas,dtrad_prof_cas,dq_prof_cas & - & ,hq_prof_cas,vq_prof_cas,lat_prof_cas,sens_prof_cas,ustar_prof_cas) + & ,hq_prof_cas,vq_prof_cas,lat_prof_cas,sens_prof_cas & + & ,ustar_prof_cas,uw_prof_cas,vw_prof_cas,q1_prof_cas,q2_prof_cas) @@ -907,11 +995,10 @@ #include "compar1d.h" +#include "date_cas.h" ! inputs: integer annee_ref integer nt_cas,nlev_cas - integer year_ini_cas - real day_ini_cas - real day, day1,pdt_cas + real day, day1,day_cas real ts_cas(nt_cas) real plev_cas(nlev_cas,nt_cas) @@ -927,5 +1014,6 @@ real lat_cas(nt_cas) real sens_cas(nt_cas) - real ustar_cas(nt_cas) + real ustar_cas(nt_cas),uw_cas(nlev_cas,nt_cas),vw_cas(nlev_cas,nt_cas) + real q1_cas(nlev_cas,nt_cas),q2_cas(nlev_cas,nt_cas) ! outputs: @@ -941,4 +1029,5 @@ real dq_prof_cas(nlev_cas),hq_prof_cas(nlev_cas),vq_prof_cas(nlev_cas) real lat_prof_cas,sens_prof_cas,ts_prof_cas,ustar_prof_cas + real uw_prof_cas(nlev_cas),vw_prof_cas(nlev_cas),q1_prof_cas(nlev_cas),q2_prof_cas(nlev_cas) ! local: integer it_cas1, it_cas2,k @@ -946,5 +1035,5 @@ - print*,'Check time',day1,day_ini_cas,day_ini_cas+1 + print*,'Check time',day1,day_ju_ini_cas,day_deb+1,pdt_cas ! On teste si la date du cas AMMA est correcte. @@ -952,31 +1041,36 @@ ! sont censes etre corrects. ! A supprimer a terme (MPL 20150623) - if ((forcing_type.eq.10).and.(1.eq.0)) then +! if ((forcing_type.eq.10).and.(1.eq.0)) then ! Check that initial day of the simulation consistent with AMMA case: - if (annee_ref.ne.2006) then - print*,'Pour AMMA, annee_ref doit etre 2006' - print*,'Changer annee_ref dans run.def' - stop - endif - if (annee_ref.eq.2006 .and. day1.lt.day_ini_cas) then - print*,'AMMA a debute le 10 juillet 2006',day1,day_ini_cas - print*,'Changer dayref dans run.def' - stop - endif - if (annee_ref.eq.2006 .and. day1.gt.day_ini_cas+1) then - print*,'AMMA a fini le 11 juillet' - print*,'Changer dayref ou nday dans run.def' - stop - endif - endif +! if (annee_ref.ne.2006) then +! print*,'Pour AMMA, annee_ref doit etre 2006' +! print*,'Changer annee_ref dans run.def' +! stop +! endif +! if (annee_ref.eq.2006 .and. day1.lt.day_cas) then +! print*,'AMMA a debute le 10 juillet 2006',day1,day_cas +! print*,'Changer dayref dans run.def' +! stop +! endif +! if (annee_ref.eq.2006 .and. day1.gt.day_cas+1) then +! print*,'AMMA a fini le 11 juillet' +! print*,'Changer dayref ou nday dans run.def' +! stop +! endif +! endif ! Determine timestep relative to the 1st day: ! timeit=(day-day1)*86400. ! if (annee_ref.eq.1992) then -! timeit=(day-day_ini_cas)*86400. +! timeit=(day-day_cas)*86400. ! else ! timeit=(day+61.-1.)*86400. ! 61 days between Nov01 and Dec31 1992 ! endif - timeit=(day-day_ini_cas)*86400 + timeit=(day-day_ju_ini_cas)*86400 + print *,'day=',day + print *,'day_ju_ini_cas=',day_ju_ini_cas + print *,'pdt_cas=',pdt_cas + print *,'timeit=',timeit + print *,'nt_cas=',nt_cas ! Determine the closest observation times: @@ -994,8 +1088,12 @@ time_cas1=(it_cas1-1)*pdt_cas time_cas2=(it_cas2-1)*pdt_cas + print *,'it_cas1=',it_cas1 + print *,'it_cas2=',it_cas2 + print *,'time_cas1=',time_cas1 + print *,'time_cas2=',time_cas2 if (it_cas1 .gt. nt_cas) then - write(*,*) 'PB-stop: day, it_cas1, it_cas2, timeit: ' & - & ,day,day_ini_cas,it_cas1,it_cas2,timeit/86400. + write(*,*) 'PB-stop: day, day_ju_ini_cas,it_cas1, it_cas2, timeit: ' & + & ,day,day_ju_ini_cas,it_cas1,it_cas2,timeit stop endif @@ -1057,4 +1155,12 @@ vq_prof_cas(k) = vq_cas(k,it_cas2) & & -frac*(vq_cas(k,it_cas2)-vq_cas(k,it_cas1)) + uw_prof_cas(k) = uw_cas(k,it_cas2) & + & -frac*(uw_cas(k,it_cas2)-uw_cas(k,it_cas1)) + vw_prof_cas(k) = vw_cas(k,it_cas2) & + & -frac*(vw_cas(k,it_cas2)-vw_cas(k,it_cas1)) + q1_prof_cas(k) = q1_cas(k,it_cas2) & + & -frac*(q1_cas(k,it_cas2)-q1_cas(k,it_cas1)) + q2_prof_cas(k) = q2_cas(k,it_cas2) & + & -frac*(q2_cas(k,it_cas2)-q2_cas(k,it_cas1)) enddo