Index: trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM =================================================================== --- trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM (revision 452) +++ trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM (revision 481) @@ -129,4 +129,6 @@ state real qdust ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "QDUST" "Dust mixing ratio" "kg kg-1" state real qdustn ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "QDUSTN" "Dust_number mixing ratio" "kg kg-1" +state real qccn ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "QCCN" "CCN mixing ratio" "kg kg-1" +state real qccnn ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "QCCNN" "CCN number mixing ratio" "kg kg-1" state real qco2 ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "QCO2" "CO2 mixing ratio" "kg kg-1" state real chem_co ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "chem_co" "" "" @@ -1366,4 +1368,5 @@ package dust2eq mars==3 - scalar:qdust,qdustn package newwater mars==11 - scalar:qh2o,qh2o_ice,qdust,qdustn +package newwatersca mars==12 - scalar:qh2o,qh2o_ice,qdust,qdustn,qccn,qccnn package photochem mars==42 - scalar:qco2,chem_co,chem_o,chem_o1d,chem_o2,chem_o3,chem_h,chem_h2,chem_oh,chem_ho2,chem_h2o2,chem_ch4,chem_n2,chem_ar,qh2o_ice,qh2o,qdust,qdustn ##### MARS OPTIONS Index: trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/dyn_em/module_initialize_real.F =================================================================== --- trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/dyn_em/module_initialize_real.F (revision 452) +++ trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/dyn_em/module_initialize_real.F (revision 481) @@ -1293,5 +1293,5 @@ its , ite , jts , jte , kts , kte ) endif -if ( ( config_flags%mars == 1 ) .OR. ( config_flags%mars == 11 ) ) then +if ( ( config_flags%mars == 1 ) .OR. ( config_flags%mars == 11 ) .OR. ( config_flags%mars == 12 ) ) then print *, '**** INTERPOLATE HV **** RANK 2 in SCALAR' !print *, size(scalar(0,0,0,:)), P_QH2O, P_QH2O_ICE @@ -1313,5 +1313,5 @@ endif #ifdef NEWPHYS -if ( config_flags%mars == 11 ) then +if ( config_flags%mars == 11 .OR. config_flags%mars == 12 ) then print *, '**** INTERPOLATE DUSTQ **** RANK 4 in SCALAR' CALL vert_interp_old ( grid%em_dustq_gc , grid%em_pd_gc , scalar(:,:,:,4) , grid%em_pb , & Index: trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/dyn_em/solve_em.F =================================================================== --- trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/dyn_em/solve_em.F (revision 452) +++ trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/dyn_em/solve_em.F (revision 481) @@ -2709,4 +2709,5 @@ ! .OR. ( (config_flags%mars .eq. 11) .AND. (is .EQ. 2) ) & !! 11 pass only water vapor .OR. ( config_flags%mars .eq. 11 ) & !! 11 pass EVERYTHING + .OR. ( config_flags%mars .eq. 12 ) & !! 12 pass EVERYTHING .OR. config_flags%nested ) THEN !! * pass all tracers if nested CALL relax_bdy_scalar ( scalar_tend(ims,kms,jms,is), & Index: trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/main/real_em.F =================================================================== --- trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/main/real_em.F (revision 452) +++ trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/main/real_em.F (revision 481) @@ -712,9 +712,10 @@ IF ( (config_flags%mars .eq. 1) .OR. & (config_flags%mars .eq. 3) .OR. & - (config_flags%mars .eq. 11) ) THEN + (config_flags%mars .eq. 11) .OR. & + (config_flags%mars .eq. 12) ) THEN CALL couple ( grid%em_mu_2 , grid%em_mub , q2bdy3dtemp1 , grid%scalar(:,:,:,3) , 't' , grid%msft , & ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe ) ENDIF -IF (config_flags%mars .eq. 11) THEN +IF ((config_flags%mars .eq. 11) .OR. (config_flags%mars .eq. 12)) THEN CALL couple ( grid%em_mu_2 , grid%em_mub , q3bdy3dtemp1 , grid%scalar(:,:,:,4) , 't' , grid%msft , & ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe ) @@ -786,5 +787,6 @@ IF ( (config_flags%mars .eq. 1) .OR. & (config_flags%mars .eq. 3) .OR. & - (config_flags%mars .eq. 11) ) THEN + (config_flags%mars .eq. 11) .OR. & + (config_flags%mars .eq. 12) ) THEN CALL stuff_bdy ( q2bdy3dtemp1 , grid%scalar_b(:,:,:,:,3) , 'T' , ijds , ijde , spec_bdy_width , & ids , ide , jds , jde , kds , kde , & @@ -792,5 +794,5 @@ ips , ipe , jps , jpe , kps , kpe ) ENDIF -IF (config_flags%mars .eq. 11) THEN +IF ((config_flags%mars .eq. 11) .OR. (config_flags%mars .eq. 12)) THEN CALL stuff_bdy ( q3bdy3dtemp1 , grid%scalar_b(:,:,:,:,4) , 'T' , ijds , ijde , spec_bdy_width , & ids , ide , jds , jde , kds , kde , & @@ -863,9 +865,10 @@ IF ( (config_flags%mars .eq. 1) .OR. & (config_flags%mars .eq. 3) .OR. & - (config_flags%mars .eq. 11) ) THEN + (config_flags%mars .eq. 11) .OR. & + (config_flags%mars .eq. 12) ) THEN CALL couple ( grid%em_mu_2 , grid%em_mub , q2bdy3dtemp2 , grid%scalar(:,:,:,3) , 't' , grid%msft , & ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe ) ENDIF -IF (config_flags%mars .eq. 11) THEN +IF ((config_flags%mars .eq. 11) .OR. (config_flags%mars .eq. 12)) THEN CALL couple ( grid%em_mu_2 , grid%em_mub , q3bdy3dtemp2 , grid%scalar(:,:,:,4) , 't' , grid%msft , & ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe ) @@ -941,5 +944,6 @@ IF ( (config_flags%mars .eq. 1) .OR. & (config_flags%mars .eq. 3) .OR. & - (config_flags%mars .eq. 11) ) THEN + (config_flags%mars .eq. 11) .OR. & + (config_flags%mars .eq. 12) ) THEN CALL stuff_bdytend ( q2bdy3dtemp2 , q2bdy3dtemp1 , REAL(interval_seconds) ,grid%scalar_bt(:,:,:,:,3) , 'T' , & ijds , ijde , spec_bdy_width , & @@ -948,5 +952,5 @@ ips , ipe , jps , jpe , kps , kpe ) ENDIF -IF (config_flags%mars .eq. 11) THEN +IF ((config_flags%mars .eq. 11) .OR. (config_flags%mars .eq. 12)) THEN CALL stuff_bdytend ( q3bdy3dtemp2 , q3bdy3dtemp1 , REAL(interval_seconds) , grid%scalar_bt(:,:,:,:,4) , 'T' , & ijds , ijde , spec_bdy_width , & @@ -1112,5 +1116,6 @@ IF ( (config_flags%mars .eq. 1) .OR. & (config_flags%mars .eq. 3) .OR. & - (config_flags%mars .eq. 11) ) THEN + (config_flags%mars .eq. 11) .OR. & + (config_flags%mars .eq. 12) ) THEN CALL stuff_bdy ( q2bdy3dtemp1 , grid%scalar_b(:,:,:,:,3) , 'T', ijds , ijde , spec_bdy_width , & ids , ide , jds , jde , kds , kde , & @@ -1118,5 +1123,5 @@ ips , ipe , jps , jpe , kps , kpe ) ENDIF -IF (config_flags%mars .eq. 11) THEN +IF ((config_flags%mars .eq. 11) .OR. (config_flags%mars .eq. 12)) THEN CALL stuff_bdy ( q3bdy3dtemp1 , grid%scalar_b(:,:,:,:,4) , 'T', ijds , ijde , spec_bdy_width , & ids , ide , jds , jde , kds , kde , & 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 452) +++ trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F (revision 481) @@ -649,9 +649,9 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!! -SELECT CASE (MARS_MODE) !! ONLY ALLOW FOR MODES DEFINED IN Registry.EM - CASE(4-10,12-19,22-41,43:) !! -- CHANGE THIS if YOU ADDED CASES in REGISTRY.EM - PRINT *, 'NOT SUPPORTED, to be done' - STOP -END SELECT +!SELECT CASE (MARS_MODE) !! ONLY ALLOW FOR MODES DEFINED IN Registry.EM +! CASE(4-10,13-19,22-41,43:) !! -- CHANGE THIS if YOU ADDED CASES in REGISTRY.EM +! PRINT *, 'NOT SUPPORTED, to be done' +! STOP +!END SELECT !!!!!!!!!!!!!!!!!!! FOR REFERENCE ; FROM REGISTRY.EM !package default mars==0 - - @@ -685,4 +685,11 @@ wtnom(3) = 'dust_mass' wtnom(4) = 'dust_number' + CASE(12) + wtnom(1) = 'h2o_vap' + wtnom(2) = 'h2o_ice' + wtnom(3) = 'dust_mass' + wtnom(4) = 'dust_number' + wtnom(5) = 'ccn_mass' + wtnom(6) = 'ccn_number' CASE(20) wtnom(1) = 'qtrac1' @@ -920,5 +927,5 @@ CASE(3) qsurf_val(:)=0. !!! temporaire, a definir - CASE(11) + CASE(11-12) qsurf_val(1)=0. qsurf_val(2)=MARS_WICE(i,j) !! logique avec wtnom(2) = 'h2o_ice' defini ci-dessus