Index: trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/Registry.EM =================================================================== --- trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/Registry.EM (revision 772) +++ trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/Registry.EM (revision 774) @@ -114,6 +114,6 @@ state real QH2O ikjftb scalar 1 - i01rhusdf=(bdy_interp:dt) "QH2O" "Water vapor mixing ratio" "kg kg-1" state real QH2O_ICE ikjftb scalar 1 - i01rhusdf=(bdy_interp:dt) "QH2O_ICE" "Water ice mixing ratio" "kg kg-1" -state real qdust ikjftb scalar 1 - i01rhusdf=(bdy_interp:dt) "qdust" "Dust mixing ratio" "kg kg-1" -state real qndust ikjftb scalar 1 - i01rhusdf=(bdy_interp:dt) "qndust" "Dust number density" " m-3 " +state real qdust ikjftb scalar 1 - i01rhusdf=(bdy_interp:dt) "QDUST" "Dust mixing ratio" "kg kg-1" +state real qdustn ikjftb scalar 1 - i01rhusdf=(bdy_interp:dt) "QDUSTN" "Dust number density" " m-3 " state real qtrac1 ikjftb scalar 1 - i01rhusdf=(bdy_interp:dt) "qtrac1" "Decaying tracer 1" "kg kg-1" state real upward ikjftb scalar 1 - i01rhusdf=(bdy_interp:dt) "upward" "Decaying tracer surf" "kg kg-1" @@ -233,6 +233,4 @@ state real mars_dsoil ilj misc 1 - i012rd "MARS_DSOIL" "soil depths" "m" state real mars_gw ilj misc 1 - i012rd "MARS_GW" "gwparam" " " -state real mars_qdust ikj misc 1 - i012rd "MARS_QDUST" "dust mass mixing ratio" "kg/kg" -state real mars_qndust ikj misc 1 - i012rd "MARS_QNDUST" "dust number density" " " #### #### @@ -1499,5 +1497,5 @@ package water mars==1 - moist:qv;scalar:qh2o,qh2o_ice package dust mars==2 - moist:qv;scalar:qdust -package dust2eq mars==3 - scalar:qdust,qndust +package dust2eq mars==3 - scalar:qdust,qdustn package radioac mars==20 - scalar:qtrac1 package radioac2 mars==21 - scalar:upward,downward Index: trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/module_first_rk_step_part1.F =================================================================== --- trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/module_first_rk_step_part1.F (revision 772) +++ trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/module_first_rk_step_part1.F (revision 774) @@ -631,6 +631,4 @@ & ,MARS_Z0=grid%mars_z0 & & ,CST_Z0=config_flags%init_Z0 & - & ,MARS_QDUST=grid%mars_qdust & - & ,MARS_QNDUST=grid%mars_qndust & #endif & ,MARS_GW=grid%mars_gw & Index: trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/module_initialize_les.F =================================================================== --- trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/module_initialize_les.F (revision 772) +++ trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/module_initialize_les.F (revision 774) @@ -115,6 +115,5 @@ REAL :: lon_input, lat_input, alt_input, tsurf_input ! for mode 3 - LOGICAL :: MARS_MODE_INIT - REAL, DIMENSION(nl_max) :: qdust,qndust,dust_p_level + REAL, DIMENSION(nl_max) :: profdustq,profdustn,dust_p_level !!MARS @@ -349,8 +348,4 @@ grid%mars_tsurf(i,j)=0. !! << -!! >> Used for mode 3: - grid%mars_qdust(i,:,j)=0. - grid%mars_qndust(i,:,j)=0. -!! << grid%slpx(i,j) = 0. grid%slpy(i,j) = 0. @@ -764,13 +759,11 @@ !!!!! MARS INITIALIZE MODE 3 FOR LES - !! RESTART=config_flags%restart -> this routine is not used in restart - MARS_MODE_INIT=config_flags%mars - - IF (MARS_MODE_INIT .EQ. 3) THEN + IF ( ( config_flags%mars == 3 ) ) then + write (*,*) 'MARS MODE 3 INITIALIZATION, READING INPUT_DUST (module_initialize_les.F)' ! load a profile of dust (same for all points) - call read_dust(qdust,qndust,dust_p_level,nl_in) + call read_dust(profdustq,profdustn,dust_p_level,nl_in) p_level = grid%znu(1)*(pd_surf - grid%p_top) + grid%p_top IF (dust_p_level(1) .lt. p_level) then !input profile needs rescaling to avoid a plateau. This happens when you use different sources to initialize the pressure of the LES and the input_dust. Typicaly: you use the MCD for input_therm and different runs for input_dust, that dont have the same surface pressure ! This trick is ok because we dont want to initialize with a very precise profile of dust, just a realistic one. @@ -779,6 +772,8 @@ DO k=1,kte-1 p_level = grid%znu(k)*(pd_surf - grid%p_top) + grid%p_top - grid%mars_qdust(its:ite,k,jts:jte)=interp_0( qdust, dust_p_level, p_level, nl_in ) - grid%mars_qndust(its:ite,k,jts:jte)=interp_0( qndust, dust_p_level, p_level, nl_in ) + print *, '**** INTERPOLATE DUSTQ **** RANK 2 in SCALAR' + scalar(its:ite,k,jts:jte,2) = interp_0( profdustq, dust_p_level, p_level, nl_in ) + print *, '**** INTERPOLATE DUSTN **** RANK 3 in SCALAR' + scalar(its:ite,k,jts:jte,3) = interp_0( profdustn, dust_p_level, p_level, nl_in ) ENDDO ENDIF @@ -1041,8 +1036,8 @@ !!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc - subroutine read_dust(qdust,qndust,dust_p_level,n) + subroutine read_dust(pdustq,pdustn,dust_p_level,n) implicit none integer n - real qdust(n),qndust(n),dust_p_level(n) + real pdustq(n),pdustn(n),dust_p_level(n) logical end_of_file @@ -1057,6 +1052,6 @@ do while (.not. end_of_file) - read(11,*,end=102) qdust(k+1), qndust(k+1), dust_p_level(k+1) - write(*,*) k, qdust(k+1), qndust(k+1), dust_p_level(k+1) + read(11,*,end=102) pdustq(k+1),pdustn(k+1), dust_p_level(k+1) + write(*,*) k, pdustq(k+1), pdustn(k+1), dust_p_level(k+1) k = k+1 go to 113 Index: trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F =================================================================== --- trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F (revision 772) +++ trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F (revision 774) @@ -41,6 +41,4 @@ MARS_Z0, & CST_Z0, & - MARS_QDUST, & - MARS_QNDUST, & #endif MARS_GW, & @@ -146,6 +144,4 @@ REAL, DIMENSION( ims:ime, jms:jme ), INTENT(INOUT ) :: & MARS_FLUXRAD,MARS_WSTAR -REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), INTENT(IN ) :: & - MARS_QDUST, MARS_QNDUST #endif REAL, DIMENSION( ims:ime, 5, jms:jme ), INTENT(IN ) :: & @@ -868,9 +864,4 @@ !--------------------------------! #ifdef NEWPHYS -!!! Initialize SCALAR for MODE 3. -IF ((MARS_MODE .EQ. 3) .and. (firstcall .EQV. .true.) .and. (.not. restart)) THEN - SCALAR(i,kps:kpe,j,2)=MARS_QDUST(i,kps:kpe,j) - SCALAR(i,kps:kpe,j,3)=MARS_QNDUST(i,kps:kpe,j) -ENDIF IF (MARS_MODE .EQ. 0) THEN q_prof(:,1)=0.95