Changeset 341 for trunk/MESOSCALE/LMD_MM_MARS
- Timestamp:
- Nov 3, 2011, 2:28:57 PM (13 years ago)
- Location:
- trunk/MESOSCALE/LMD_MM_MARS
- Files:
-
- 1 added
- 6 edited
-
SRC/LES/modif_mars/Registry.EM (modified) (2 diffs)
-
SRC/WRFV2/Registry/Registry.EM (modified) (3 diffs)
-
SRC/WRFV2/mars_lmd/libf/phymars/physiq.F (modified) (4 diffs)
-
SRC/WRFV2/mars_lmd/libf/phymars/readtesassim.F90.modif (added)
-
SRC/WRFV2/mars_lmd/makegcm_mpi (modified) (2 diffs)
-
SRC/WRFV2/phys/module_lmd_driver.F (modified) (2 diffs)
-
makemeso (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/Registry.EM
r170 r341 995 995 state real CDA ij misc 1 - r "CDA" "DRAG COEFF AT LOWEST MODEL LVL" "" 996 996 state real UST ij misc 1 - r "UST" "U* IN SIMILARITY THEORY" "m s-1" 997 state real USTM ij misc 1 - rh "USTM" "U* IN SIMILARITY THEORY WITHOUT VCONV" "m s-1" #SAVEMARS2 ust 997 state real USTM ij misc 1 - rh "USTM" "U* IN SIMILARITY THEORY WITHOUT VCONV" "m s-1" #SAVEMARS2 ustar 998 998 i1 real HOL ij misc 1 - - "HOL" "PBL HEIGHT OVER MONIN-OBUKHOV LENGTH" "" 999 999 state real RMOL ij misc 1 - r "RMOL" "1./Monin Ob. Length" "" … … 1002 1002 state real CAPG ij misc 1 - r "CAPG" "HEAT CAPACITY FOR SOIL" "J K-1 m-3" 1003 1003 state real THC ij misc 1 - r "THC" "THERMAL INERTIA" "Cal cm-1 K-1 s-0.5" 1004 state real HFX ij misc 1 - rh "HFX" "UPWARD HEAT FLUX AT THE SURFACE" "W m-2" #SAVEMARS2 hfx1004 state real HFX ij misc 1 - rh "HFX" "UPWARD HEAT FLUX AT THE SURFACE" "W m-2" #SAVEMARS2 sensheat 1005 1005 state real QFX ij misc 1 - r "QFX" "UPWARD MOISTURE FLUX AT THE SURFACE" "kg m-2 s-1" 1006 1006 state real LH ij misc 1 - r "LH" "LATENT HEAT FLUX AT THE SURFACE" "W m-2" -
trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM
r324 r341 110 110 state real HFMAX_TH ij misc 1 - rd "HFMAX_TH" "MAXIMUM TH HEAT FLUX" "m.K/s" #SAVEMARS2 hfmax_th 111 111 state real WMAX_TH ij misc 1 - rd "WMAX_TH" "MAXIMUM TH VERTICAL VELOCITY" "m/s" #SAVEMARS2 wmax_th 112 state real Z0SET ij misc 1 - r hd"Z0SET" "SET SURFACE ROUGHNESS" "m" #SAVEMARS2 z0112 state real Z0SET ij misc 1 - rd "Z0SET" "SET SURFACE ROUGHNESS" "m" #SAVEMARS2 z0 113 113 114 114 #### … … 946 946 ##### LES mettre h pour les deux variables ci-dessous 947 947 state real UST ij misc 1 - r "UST" "U* IN SIMILARITY THEORY" "m s-1" 948 state real USTM ij misc 1 - rh "USTM" "U* IN SIMILARITY THEORY - LES MODE" "m s-1" #SAVEMARS2 ust 948 state real USTM ij misc 1 - rh "USTM" "U* IN SIMILARITY THEORY - LES MODE" "m s-1" #SAVEMARS2 ustar 949 949 i1 real HOL ij misc 1 - - "HOL" "PBL HEIGHT OVER MONIN-OBUKHOV LENGTH" "" 950 950 state real RMOL ij misc 1 - r "RMOL" "1./Monin Ob. Length" "" … … 953 953 state real CAPG ij misc 1 - r "CAPG" "HEAT CAPACITY FOR SOIL" "J K-1 m-3" 954 954 state real THC ij misc 1 - r "THC" "THERMAL INERTIA" "Cal cm-1 K-1 s-0.5" 955 state real HFX ij misc 1 - rh "HFX" "UPWARD HEAT FLUX AT THE SURFACE" "W m-2" #SAVEMARS2 hfx955 state real HFX ij misc 1 - rh "HFX" "UPWARD HEAT FLUX AT THE SURFACE" "W m-2" #SAVEMARS2 sensheat 956 956 state real QFX ij misc 1 - r "QFX" "UPWARD MOISTURE FLUX AT THE SURFACE" "kg m-2 s-1" 957 957 state real LH ij misc 1 - r "LH" "LATENT HEAT FLUX AT THE SURFACE" "W m-2" -
trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd/libf/phymars/physiq.F
r333 r341 178 178 REAL sl_ra, sl_di0 179 179 REAL sky 180 REAL hfx(ngridmx) !! pour LES avec isfflx!=0181 REAL ust (ngridmx) !! pour LES avec isfflx!=0180 REAL sensheat(ngridmx) !! pour LES avec isfflx!=0 181 REAL ustar(ngridmx) !! pour LES avec isfflx!=0 182 182 LOGICAL flag_LES !! pour LES avec isfflx!=0 183 183 REAL qsurflast(ngridmx) !! pour diagnostics … … 925 925 DO ig=1,ngrid 926 926 !! sensible heat flux in W/m2 927 hfx(ig) = zflubid(ig)-capcal(ig)*zdtsdif(ig)927 sensheat(ig) = zflubid(ig)-capcal(ig)*zdtsdif(ig) 928 928 !! u star in similarity theory in m/s 929 ust (ig) = 0.4929 ustar(ig) = 0.4 930 930 . * sqrt( pu(ig,1)*pu(ig,1) + pv(ig,1)*pv(ig,1) ) 931 931 . / log( 1.E+0 + zzlay(ig,1)/z0 ) … … 944 944 write (*,*) '************************************************' 945 945 946 ! DO ig=1,ngrid947 ! !! sensible heat flux in W/m2948 ! hfx(ig) = zflubid(ig)-capcal(ig)*zdtsdif(ig)949 ! !! u star in similarity theory in m/s950 ! ust(ig) = 0.4951 ! . * sqrt( pu(ig,1)*pu(ig,1) + pv(ig,1)*pv(ig,1) )952 ! . / log( 1.E+0 + zzlay(ig,1)/z0 )953 946 ! 954 947 DO l=1,nlayer … … 966 959 !write (*,*) 'GRD ',fluxgrd(igout) 967 960 !write (*,*) 'dTs/dt ',capcal(igout)*zdtsurf(igout) 968 !write (*,*) 'HFX ', hfx(igout)969 !write (*,*) 'UST ', ust(igout)970 961 ENDIF 971 962 !!! LES LES -
trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd/makegcm_mpi
r335 r341 177 177 ## set opt_link=" -Mfree -L/usr/local/pgi/linux86/lib -lpgf90 -lpgftnrtl -lpghpf -lpghpf2 -L$NCDFLIB -lnetcdf -Wl,-Bstatic" 178 178 # set opt_link=" -Mlarge_arrays -mcmodel=medium -Mfree -L/usr/local/pgi/linux86/lib -lpgf90 -lpgftnrtl -lpghpf -lpghpf2 -L$NCDFLIB -lnetcdf" 179 set optim90=" -O2 -I. -Munroll -Mcache_align" 180 set optimtru90=" -O2 -I. -Munroll -Mcache_align" 179 set optim90="-O2 -I. -Munroll -Mcache_align" # -Mbounds" 180 set optimtru90="-O2 -I. -Munroll -Mcache_align" # -Mbounds" 181 #set optim90=""#-Mvect=noaltcode -Msmartalloc -Mprefetch=distance:8 -Mfprelaxed" #-fast -I." 182 #set optimtru90=""#-Mvect=noaltcode -Msmartalloc -Mprefetch=distance:8 -Mfprelaxed"#-fast -I." 181 183 #set optim90="-O3 -I. -tp=nehalem-64 -fastsse -Mscalarsse -Mvect=sse -Mipa=fast" 182 184 #set optimtru90="-O3 -I. -tp=nehalem-64 -fastsse -Mscalarsse -Mvect=sse -Mipa=fast" 183 set opt_link=" -L$NCDFLIB -lnetcdf -Bstatic"185 set opt_link=" -L$NCDFLIB -lnetcdf" # -Bstatic" 184 186 set mod_loc_dir="" 185 187 set mod_suffix=mod … … 362 364 set optim90="$optim90"" -G1 " 363 365 else if $LINUX then 364 set optim90="-g -Mbounds "366 set optim90="-g -Mbounds -Ktrap=fp" 365 367 # set optim90="-mcmodel=medium" 366 368 else -
trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F
r324 r341 412 412 ENDIF 413 413 414 !!!! for 'subgrid' temporal diagnostics415 test2 = MODULO(elaps,history_interval*100.)414 !!!!! for 'subgrid' temporal diagnostics 415 !test2 = MODULO(elaps,history_interval*100.) 416 416 417 417 !!!******!! … … 478 478 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 479 479 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 480 IF (test2.EQ.0) THEN481 print *, 'compute stats'482 print *, 'RESET'483 uave = uave*0.484 vave = vave*0.485 tave = tave*0.486 wave = wave*0.487 ustd = ustd*0.488 vstd = vstd*0.489 tstd = tstd*0.490 wstd = wstd*0.491 ENDIF492 uave = uave + u * dt / (float(history_interval)*100.)493 vave = vave + v * dt / (float(history_interval)*100.)494 tave = tave + th * dt / (float(history_interval)*100.)495 wave = wave + w * dt / (float(history_interval)*100.)496 ustd = ustd + u * u * dt / (float(history_interval)*100.)497 vstd = vstd + v * v * dt / (float(history_interval)*100.)498 tstd = tstd + th * th * dt / (float(history_interval)*100.)499 wstd = wstd + w * w * dt / (float(history_interval)*100.)480 !IF (test2.EQ.0) THEN 481 ! print *, 'compute stats' 482 ! print *, 'RESET' 483 ! uave = uave*0. 484 ! vave = vave*0. 485 ! tave = tave*0. 486 ! wave = wave*0. 487 ! ustd = ustd*0. 488 ! vstd = vstd*0. 489 ! tstd = tstd*0. 490 ! wstd = wstd*0. 491 !ENDIF 492 ! uave = uave + u * dt / (float(history_interval)*100.) 493 ! vave = vave + v * dt / (float(history_interval)*100.) 494 ! tave = tave + th * dt / (float(history_interval)*100.) 495 ! wave = wave + w * dt / (float(history_interval)*100.) 496 ! ustd = ustd + u * u * dt / (float(history_interval)*100.) 497 ! vstd = vstd + v * v * dt / (float(history_interval)*100.) 498 ! tstd = tstd + th * th * dt / (float(history_interval)*100.) 499 ! wstd = wstd + w * w * dt / (float(history_interval)*100.) 500 500 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 501 501 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -
trunk/MESOSCALE/LMD_MM_MARS/makemeso
r335 r341 264 264 cp ../../SRC/WRFV2/Registry/Registry.EM Registry/ 265 265 fi 266 if [[ "${config}" == "les" ]] 267 then 268 cp ../../SRC/LES/WRFV2/Registry/Registry.EM Registry/ 269 fi 266 270 ### ensure the model will be recompiled from scratch with correct registry 267 271 cd Registry ; mv Registry Registry.bak ; Registry.bash ; cd .. … … 452 456 sed s+"-L../mars_lmd/libo -llmd"+"-L../mars_lmd/libo -llmd $NETCDF/lib/libnetcdf.a"+g configure.wrf > yeah ; mv -f yeah configure.wrf 453 457 sed s+"mpif90"+"${WHERE_MPI}/mpif90"+g configure.wrf | sed s+"mpicc"+"${WHERE_MPI}/mpicc"+g | sed s+"mpicc"+"mpicc -DMPI2_SUPPORT"+g > yeah 458 #sed s+"mpif90"+"${WHERE_MPI}/mpif90"+g configure.wrf | sed s+"mpicc"+"${WHERE_MPI}/mpicc"+g | sed s+"mpicc"+"mpicc -DMPI2_SUPPORT -w -O3"+g > yeah 454 459 #| sed s+"fastsse"+"fast"+g > yeah 455 #mv -f yeah configure.wrf #;;460 mv -f yeah configure.wrf ;; 456 461 # #sed s+"-fastsse"+"-O2 -Munroll -Mcache_align"+g configure.wrf > yeah 457 462 # ##sed s+"-fastsse"+"-O2 -fpic"+g configure.wrf > yeah ## marche pas, ILM problem … … 459 464 #sed s+"-fastsse"+"-O3 -tp=nehalem-64 -fastsse -Mscalarsse -Mvect=sse -Mipa=fast"+g configure.wrf > yeah 460 465 #sed s+"-fastsse"+"-O2 -Munroll -Mcache_align"+g configure.wrf > yeah 461 mv -f yeah configure.wrf ;; 466 #sed s+"-fastsse"+""+g configure.wrf > yeah 467 #sed s+"-fastsse"+"-fast"+g configure.wrf > yeah 468 #sed s+"-fastsse"+"-Mvect=noaltcode -Msmartalloc -Mprefetch=distance:8 -Mfprelaxed"+g configure.wrf > yeah 469 #mv -f yeah configure.wrf ;; 462 470 # MPICH, 64 bits, OK with periodic BC but no positive definite 463 471 mpi_64_test) cd arch ; ln -sf ../configure.defaults.fix64nest configure.defaults ; cd .. … … 523 531 then 524 532 echo 'DEBUG DEBUG DEBUG DEBUG' 525 sed s+"#-g"+"-g"+g configure.wrf > yeah 533 sed s+"#-g"+"-g -Ktrap=fp -Mbounds"+g configure.wrf > yeah 534 #sed s+"#-g"+"-g"+g configure.wrf > yeah 526 535 mv -f yeah configure.wrf 527 536 fi
Note: See TracChangeset
for help on using the changeset viewer.
