Changeset 481 for trunk/MESOSCALE/LMD_MM_MARS/SRC
- Timestamp:
- Dec 19, 2011, 6:54:32 PM (13 years ago)
- Location:
- trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2
- Files:
-
- 5 edited
-
Registry/Registry.EM (modified) (2 diffs)
-
dyn_em/module_initialize_real.F (modified) (2 diffs)
-
dyn_em/solve_em.F (modified) (1 diff)
-
main/real_em.F (modified) (8 diffs)
-
phys/module_lmd_driver.F (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM
r341 r481 129 129 state real qdust ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "QDUST" "Dust mixing ratio" "kg kg-1" 130 130 state real qdustn ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "QDUSTN" "Dust_number mixing ratio" "kg kg-1" 131 state real qccn ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "QCCN" "CCN mixing ratio" "kg kg-1" 132 state real qccnn ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "QCCNN" "CCN number mixing ratio" "kg kg-1" 131 133 state real qco2 ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "QCO2" "CO2 mixing ratio" "kg kg-1" 132 134 state real chem_co ikjftb scalar 1 - i01rusdf=(bdy_interp:dt) "chem_co" "" "" … … 1366 1368 package dust2eq mars==3 - scalar:qdust,qdustn 1367 1369 package newwater mars==11 - scalar:qh2o,qh2o_ice,qdust,qdustn 1370 package newwatersca mars==12 - scalar:qh2o,qh2o_ice,qdust,qdustn,qccn,qccnn 1368 1371 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 1369 1372 ##### MARS OPTIONS -
trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/dyn_em/module_initialize_real.F
r315 r481 1293 1293 its , ite , jts , jte , kts , kte ) 1294 1294 endif 1295 if ( ( config_flags%mars == 1 ) .OR. ( config_flags%mars == 11 ) ) then1295 if ( ( config_flags%mars == 1 ) .OR. ( config_flags%mars == 11 ) .OR. ( config_flags%mars == 12 ) ) then 1296 1296 print *, '**** INTERPOLATE HV **** RANK 2 in SCALAR' 1297 1297 !print *, size(scalar(0,0,0,:)), P_QH2O, P_QH2O_ICE … … 1313 1313 endif 1314 1314 #ifdef NEWPHYS 1315 if ( config_flags%mars == 11 ) then1315 if ( config_flags%mars == 11 .OR. config_flags%mars == 12 ) then 1316 1316 print *, '**** INTERPOLATE DUSTQ **** RANK 4 in SCALAR' 1317 1317 CALL vert_interp_old ( grid%em_dustq_gc , grid%em_pd_gc , scalar(:,:,:,4) , grid%em_pb , & -
trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/dyn_em/solve_em.F
r315 r481 2709 2709 ! .OR. ( (config_flags%mars .eq. 11) .AND. (is .EQ. 2) ) & !! 11 pass only water vapor 2710 2710 .OR. ( config_flags%mars .eq. 11 ) & !! 11 pass EVERYTHING 2711 .OR. ( config_flags%mars .eq. 12 ) & !! 12 pass EVERYTHING 2711 2712 .OR. config_flags%nested ) THEN !! * pass all tracers if nested 2712 2713 CALL relax_bdy_scalar ( scalar_tend(ims,kms,jms,is), & -
trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/main/real_em.F
r76 r481 712 712 IF ( (config_flags%mars .eq. 1) .OR. & 713 713 (config_flags%mars .eq. 3) .OR. & 714 (config_flags%mars .eq. 11) ) THEN 714 (config_flags%mars .eq. 11) .OR. & 715 (config_flags%mars .eq. 12) ) THEN 715 716 CALL couple ( grid%em_mu_2 , grid%em_mub , q2bdy3dtemp1 , grid%scalar(:,:,:,3) , 't' , grid%msft , & 716 717 ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe ) 717 718 ENDIF 718 IF ( config_flags%mars .eq. 11) THEN719 IF ((config_flags%mars .eq. 11) .OR. (config_flags%mars .eq. 12)) THEN 719 720 CALL couple ( grid%em_mu_2 , grid%em_mub , q3bdy3dtemp1 , grid%scalar(:,:,:,4) , 't' , grid%msft , & 720 721 ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe ) … … 786 787 IF ( (config_flags%mars .eq. 1) .OR. & 787 788 (config_flags%mars .eq. 3) .OR. & 788 (config_flags%mars .eq. 11) ) THEN 789 (config_flags%mars .eq. 11) .OR. & 790 (config_flags%mars .eq. 12) ) THEN 789 791 CALL stuff_bdy ( q2bdy3dtemp1 , grid%scalar_b(:,:,:,:,3) , 'T' , ijds , ijde , spec_bdy_width , & 790 792 ids , ide , jds , jde , kds , kde , & … … 792 794 ips , ipe , jps , jpe , kps , kpe ) 793 795 ENDIF 794 IF ( config_flags%mars .eq. 11) THEN796 IF ((config_flags%mars .eq. 11) .OR. (config_flags%mars .eq. 12)) THEN 795 797 CALL stuff_bdy ( q3bdy3dtemp1 , grid%scalar_b(:,:,:,:,4) , 'T' , ijds , ijde , spec_bdy_width , & 796 798 ids , ide , jds , jde , kds , kde , & … … 863 865 IF ( (config_flags%mars .eq. 1) .OR. & 864 866 (config_flags%mars .eq. 3) .OR. & 865 (config_flags%mars .eq. 11) ) THEN 867 (config_flags%mars .eq. 11) .OR. & 868 (config_flags%mars .eq. 12) ) THEN 866 869 CALL couple ( grid%em_mu_2 , grid%em_mub , q2bdy3dtemp2 , grid%scalar(:,:,:,3) , 't' , grid%msft , & 867 870 ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe ) 868 871 ENDIF 869 IF ( config_flags%mars .eq. 11) THEN872 IF ((config_flags%mars .eq. 11) .OR. (config_flags%mars .eq. 12)) THEN 870 873 CALL couple ( grid%em_mu_2 , grid%em_mub , q3bdy3dtemp2 , grid%scalar(:,:,:,4) , 't' , grid%msft , & 871 874 ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, ips, ipe, jps, jpe, kps, kpe ) … … 941 944 IF ( (config_flags%mars .eq. 1) .OR. & 942 945 (config_flags%mars .eq. 3) .OR. & 943 (config_flags%mars .eq. 11) ) THEN 946 (config_flags%mars .eq. 11) .OR. & 947 (config_flags%mars .eq. 12) ) THEN 944 948 CALL stuff_bdytend ( q2bdy3dtemp2 , q2bdy3dtemp1 , REAL(interval_seconds) ,grid%scalar_bt(:,:,:,:,3) , 'T' , & 945 949 ijds , ijde , spec_bdy_width , & … … 948 952 ips , ipe , jps , jpe , kps , kpe ) 949 953 ENDIF 950 IF ( config_flags%mars .eq. 11) THEN954 IF ((config_flags%mars .eq. 11) .OR. (config_flags%mars .eq. 12)) THEN 951 955 CALL stuff_bdytend ( q3bdy3dtemp2 , q3bdy3dtemp1 , REAL(interval_seconds) , grid%scalar_bt(:,:,:,:,4) , 'T' , & 952 956 ijds , ijde , spec_bdy_width , & … … 1112 1116 IF ( (config_flags%mars .eq. 1) .OR. & 1113 1117 (config_flags%mars .eq. 3) .OR. & 1114 (config_flags%mars .eq. 11) ) THEN 1118 (config_flags%mars .eq. 11) .OR. & 1119 (config_flags%mars .eq. 12) ) THEN 1115 1120 CALL stuff_bdy ( q2bdy3dtemp1 , grid%scalar_b(:,:,:,:,3) , 'T', ijds , ijde , spec_bdy_width , & 1116 1121 ids , ide , jds , jde , kds , kde , & … … 1118 1123 ips , ipe , jps , jpe , kps , kpe ) 1119 1124 ENDIF 1120 IF ( config_flags%mars .eq. 11) THEN1125 IF ((config_flags%mars .eq. 11) .OR. (config_flags%mars .eq. 12)) THEN 1121 1126 CALL stuff_bdy ( q3bdy3dtemp1 , grid%scalar_b(:,:,:,:,4) , 'T', ijds , ijde , spec_bdy_width , & 1122 1127 ids , ide , jds , jde , kds , kde , & -
trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F
r341 r481 649 649 !!!!!!!!!!!!!!!!!!!!!!!!!!!! 650 650 651 SELECT CASE (MARS_MODE) !! ONLY ALLOW FOR MODES DEFINED IN Registry.EM652 CASE(4-10,12-19,22-41,43:) !! -- CHANGE THIS if YOU ADDED CASES in REGISTRY.EM653 PRINT *, 'NOT SUPPORTED, to be done'654 STOP655 END SELECT651 !SELECT CASE (MARS_MODE) !! ONLY ALLOW FOR MODES DEFINED IN Registry.EM 652 ! CASE(4-10,13-19,22-41,43:) !! -- CHANGE THIS if YOU ADDED CASES in REGISTRY.EM 653 ! PRINT *, 'NOT SUPPORTED, to be done' 654 ! STOP 655 !END SELECT 656 656 !!!!!!!!!!!!!!!!!!! FOR REFERENCE ; FROM REGISTRY.EM 657 657 !package default mars==0 - - … … 685 685 wtnom(3) = 'dust_mass' 686 686 wtnom(4) = 'dust_number' 687 CASE(12) 688 wtnom(1) = 'h2o_vap' 689 wtnom(2) = 'h2o_ice' 690 wtnom(3) = 'dust_mass' 691 wtnom(4) = 'dust_number' 692 wtnom(5) = 'ccn_mass' 693 wtnom(6) = 'ccn_number' 687 694 CASE(20) 688 695 wtnom(1) = 'qtrac1' … … 920 927 CASE(3) 921 928 qsurf_val(:)=0. !!! temporaire, a definir 922 CASE(11 )929 CASE(11-12) 923 930 qsurf_val(1)=0. 924 931 qsurf_val(2)=MARS_WICE(i,j) !! logique avec wtnom(2) = 'h2o_ice' defini ci-dessus
Note: See TracChangeset
for help on using the changeset viewer.
