Changeset 131
- Timestamp:
- May 25, 2011, 4:19:36 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 10 edited
-
000-USERS (modified) (1 diff)
-
mars/README (modified) (1 diff)
-
mars/libf/phymars/callradite.F (modified) (1 diff)
-
mars/libf/phymars/dimradmars.h (modified) (2 diffs)
-
mars/libf/phymars/meso_physiq.F (modified) (6 diffs)
-
mesoscale/PLOT/MINIMAL/map_latlon.pro (modified) (3 diffs)
-
mesoscale/PLOT/SPEC/GW/gravitwave2.pro (modified) (5 diffs)
-
mesoscale/PLOT/SPEC/GW/gravitwave_inc.pro (modified) (3 diffs)
-
mesoscale/PLOT/SPEC/GW/gravitwaveprof.pro (modified) (2 diffs)
-
mesoscale/PLOT/SPEC/MAP/defs/THARSIS_newphys_bugnoRAC_RACgcm_TAUTES.map_uvt_inc.pro (added)
-
mesoscale/PLOT/SPEC/MAP/map_uvt.pro (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/000-USERS
r126 r131 21 21 Jean-Baptiste Madeleine LMD [CNRS] 03 - 03 - 2011 Mars GCM 22 22 Julien Faure LMD [CNRS/UPMC] 07 - 03 - 2011 Mars GCM, MMM and LES 23 Anni Maattanen LATMOS [CNRS] 25 - 05 - 2011 Mars GCM, MMM and LES 24 Benjamin Charnay LMD [CNRS] 25 - 05 - 2011 Venus and Titan GCMs 25 Robin Wordworth LMD [CNRS] 25 - 05 - 2011 Generic GCMs 26 Jean-Yves Chauffray LMD [CNRS] 25 - 05 - 2011 Mars GCM 27 Luca Montabone LMD [CNRS] 25 - 05 - 2011 Mars GCM -
trunk/mars/README
r120 r131 632 632 --> fix by moving the closing "endif" [in addition to corrections mentioned in the previous point] 633 633 634 == 17/ 10/2011 == EM634 == 17/05/2011 == EM 635 635 >> set internal computations using double precision in growthrate.F and 636 636 watercloud.F (otherwise we sometimes end up with Nans). 637 637 >> add extra checks in newcondens.F to avoid possibility of out of bounds 638 638 evaluation of array masse() 639 639 640 == 25/05/2011 == AS 641 >> found that the 10/05/2011 bug fix in newsedim.F is also useful for GCM runs. 642 >> no more need to modify callradite.F prior to compilation [but still dimradmars.h must be modified] 643 --> in callradite.F we now have 644 -- DEFAULT name_iaer(1) is "dust_conrath" 645 -- IF (doubleq.AND.active) name_iaer(1) = "dust_doubleq" 646 -- IF (water.AND.activice) name_iaer(2) = "h2o_ice" -
trunk/mars/libf/phymars/callradite.F
r126 r131 263 263 c PLEASE MAKE SURE that you set up the right number of 264 264 c scatterers in dimradmars.h (naerkind); 265 name_iaer(1) = "dust_conrath" !! poussiere classique 266 c name_iaer(1) = "dust_doubleq" 267 cc name_iaer(2) = "dust_submicron" !! JB: experimental 268 c name_iaer(2) = "h2o_ice" 265 name_iaer(1) = "dust_conrath" !! default choice is good old Conrath profile 266 name_iaer(2) = "dummy" !! default choice is no radiatively-active clouds 267 IF (doubleq.AND.active) name_iaer(1) = "dust_doubleq" !! two-moment scheme 268 IF (water.AND.activice) name_iaer(2) = "h2o_ice" !! radiatively-active clouds 269 IF (submicron.AND.active) name_iaer(2) = "dust_submicron" !! JBM experimental stuff 269 270 c ---------------------------------------------------------- 270 271 -
trunk/mars/libf/phymars/dimradmars.h
r126 r131 27 27 ! (ex: naerkind=2 if you use one dust mode and active ice ...) 28 28 integer naerkind 29 30 !parameter (naerkind=2)29 ! parameter (naerkind=1) 30 parameter (naerkind=2) 31 31 !!!!!! CHANGE CHANGE nsizemax BELOW BELOW 32 32 … … 77 77 ! the radiative calculations. 78 78 79 !INTEGER, PARAMETER :: nsizemax = 6080 INTEGER, PARAMETER :: nsizemax = 179 INTEGER, PARAMETER :: nsizemax = 60 80 ! INTEGER, PARAMETER :: nsizemax = 1 81 81 82 82 ! Various initialisation for LW radiative code -
trunk/mars/libf/phymars/meso_physiq.F
r86 r131 1060 1060 DO ig=1,ngrid 1061 1061 zdtsurf(ig) = zdtsurf(ig) + zdtsurfc(ig) 1062 !!!**WRF: newphys: ici la pression n'est plus mise a jour ds le GCM1063 !!!**WRF: mais il faut retablir ca dans le cas du mesoscale ?1064 !!!**WRF: ...non probablement OK1065 ! ps(ig)=pplev(ig,1) + pdpsrf(ig)*ptimestep1066 1062 ENDDO 1067 1063 … … 1091 1087 c ---------------------------------------- 1092 1088 IF (water) THEN 1093 1094 c **WRF: new arguments here rnuclei,rice,nuice1095 c plus no more iqmin +igcm_h2o_vap replaces iq, what are the consequences?1096 c checks needed when tracers simulations1097 1089 1098 1090 call watercloud(ngrid,nlayer,ptimestep, … … 1216 1208 zdqssed(1:ngrid,1:nq)=0 1217 1209 1218 c1219 c **WRF: new arguments rnuclei, rice, need checks1220 c1221 1210 call callsedim(ngrid,nlayer, ptimestep, 1222 1211 & pplev,zzlev, pt, rdust, rice, … … 1293 1282 ENDDO 1294 1283 1295 ccc1296 ccc **WRF very specific to GCM1297 ccc1298 1284 c Prescribe a cold trap at south pole (except at high obliquity !!) 1299 1285 c Temperature at the surface is set there to be the temperature … … 1325 1311 c ALWAYS PLACE these lines after newcondens !!! 1326 1312 c ------------------------------------------------------------- 1327 c1328 1313 c **WRF : OK avec le mesoscale, pas d'indices bizarres au pole 1329 c1330 1314 do ig=1,ngrid 1331 1315 if ((co2ice(ig).eq.0).and. … … 1478 1462 if (water) then 1479 1463 1480 !!1481 !!***WRF: ok, des nouveaux trucs cools de la nouvelle physique1482 !!1483 1464 call zerophys(ngrid,mtot) 1484 1465 call zerophys(ngrid,icetot) -
trunk/mesoscale/PLOT/MINIMAL/map_latlon.pro
r114 r131 375 375 ;yeah=UNIQ(lev) & lev=lev[yeah] 376 376 377 colcont = 75 378 if (pal eq 16) then colcont=0 ;noir 379 if (pal eq 4) then colcont=255 ;blanc 377 380 378 381 if (isotropic eq 'true') then begin … … 387 390 max_value=max_contour, $ 388 391 min_value=min_contour, $ 389 c_labels=findgen(n_elements(lev))* 0., $392 c_labels=findgen(n_elements(lev))*1., $ 390 393 ; c_charsize=!P.charsize/2, $ 391 color= 75;0;50;75;100tropclair;150;0;, $394 color=colcont;75;0;50;75;100tropclair;150;0;, $ 392 395 ; /noerase, $ 393 396 ; xtitle=xtitleset, $ … … 410 413 min_value=min_contour, $ 411 414 c_labels=findgen(n_elements(lev))*0., $ 412 color= 0;, $415 color=colcont;, $ 413 416 ; /noerase, $ 414 417 ; xtitle=xtitleset, $ -
trunk/mesoscale/PLOT/SPEC/GW/gravitwave2.pro
r117 r131 13 13 folder='/d5/aslmd/GRAVITWAVE/GW_MARS_highwind_narrowmountain_2D.morepoints.160818/' 14 14 folder='/d5/aslmd/GRAVITWAVE/GW_MARS_highwind_3D_loweropacity_morepoints_LT15.161544/' 15 folder='/home/aslmd/GRAVITWAVE/GW_MARS_highwind_3D_loweropacity_morepoints_LTcst.168440/' 16 folder='/home/aslmd/GRAVITWAVE/GW_MARS_highwind_3D_loweropacity_morepoints_widehill.168468/' 15 folder='/home/aslmd/GRAVITWAVE/GW_MARS_highwind_3D_loweropacity_morepoints.161542/' 16 ;folder='/home/aslmd/GRAVITWAVE/GW_MARS_highwind_3D_loweropacity_morepoints_LTcst.168440/' 17 ;folder='/home/aslmd/GRAVITWAVE/GW_MARS_highwind_3D_loweropacity_morepoints_widehill.168468/' 17 18 file=folder+'wrfout_d01_9999-09-09_09:00:00_z' 18 19 charvar='W' & charvarc='W' 19 charvar='tk' & charvarc='W' 20 charvar='W' & charvarc='tk' & cond=0 21 ;charvar='tk' & charvarc='W' 20 22 ;charvar='tk' & charvarc='W' & cond=1 21 charvar='tk' & charvarc='tk' & cond=1 23 ;charvar='tk' & charvarc='tk' & cond=1 24 ;charvar='tk' & charvarc='tk' & cond=0 22 25 ;;charvar='tpot' & charvarc='tpot' 23 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 24 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 26 charvar='HR_NLTE' & charvarc='tk' & cond=0 27 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 28 ;folder='/home/aslmd/GRAVITWAVE/' 29 ;file=folder+'GW_MARS_highwind_3D_loweropacity_morepoints_diff.nc' 30 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 25 31 ; 26 32 ; … … 39 45 charvar=charvarc, $ 40 46 invar=invarc 47 ;getcdf, $ 48 ; file=file, $ 49 ; charvar='vert', $ 50 ; invar=vert 41 51 getcdf, $ 42 file=file, $43 charvar='vert', $44 invar=vert52 file='/home/aslmd/GRAVITWAVE/GW_MARS_highwind_3D.157077/wrfout_d01_9999-09-09_09:00:00_z', $ 53 charvar='vert', $ 54 invar=vert 45 55 getcdf, $ 46 56 file=file, $ … … 53 63 ;for nt=27,27 do begin 54 64 for nt=1,40 do begin 65 ;for nt=9,9 do begin 66 ;for nt=0,20 do begin 55 67 zefile='gravitwave_'+charvar+'_'+charvarc+'_'+string(nt+100,'(I0)') 56 if (n_elements(cond) ne 0) then zefile = 'cond_' + zefile68 if (n_elements(cond) ne 0) then if (cond ne 0) then zefile = 'cond_' + zefile 57 69 ; 58 70 ; 59 71 ; 60 PS_Start, filename=zefile+'.ps' 61 print, zefile+'.ps' 62 !P.Charsize = 1.2 63 !p.charthick = 2.0 64 !p.thick = 2.0 65 !x.thick = 2.0 66 !y.thick = 2.0 72 PS_Start, filename=zefile+'.ps' & print, zefile+'.ps' 67 73 ; 68 74 ; 69 75 ; 70 76 s = size(invar) & middle = floor(s[2]/2) & print, 'PLOT at y subs ', middle 71 what_I_plot = reform(invar(*,middle,*,nt)) 77 what_I_plot = reform(invar(*,middle,*,nt)) & print, min(what_I_plot), max(what_I_plot) 72 78 overcontour = reform(invarc(*,middle,*,nt)) 73 79 if (n_elements(cond) ne 0) then begin 80 if (cond ne 0) then begin 74 81 column = columnp 75 82 ;column = reform(columnp(*,1,*,1)) … … 80 87 if (charvarc eq 'tk') then overcontour = overcontour - yeye 81 88 endif 89 endif 82 90 xx = findgen(n_elements(what_I_plot(*,0))) 83 91 zz = vert / 1000. 84 85 ;w = where(what_I_plot lt 0.) 86 w = where(what_I_plot lt -1.) 87 ;w = where(what_I_plot lt -3.) 88 if (w(0) ne -1) then begin 89 for i=0,n_elements(w)-1 do begin 90 ind = ARRAY_INDICES(what_I_plot, w(i)) 91 print, 'x '+string(ind(0),'(I0)')+' z '+string(zz(ind(1)),'(I0)')+' t '+string(nt*925./3700.,'(F4.1)'), what_I_plot(ind[0],ind[1]) 92 endfor 93 endif 92 ; 93 ;;w = where(what_I_plot lt 2.) 94 ;;w = where(what_I_plot lt 0.) 95 ;w = where(what_I_plot lt -1.) 96 ;;w = where(what_I_plot lt -3.) 97 ;if (w(0) ne -1) then begin 98 ;for i=0,n_elements(w)-1 do begin 99 ; ind = ARRAY_INDICES(what_I_plot, w(i)) 100 ; print, 'x '+string(ind(0),'(I0)')+' z '+string(zz(ind(1)),'(I0)')+' t '+string(nt*925./3700.,'(F4.1)'), what_I_plot(ind[0],ind[1]) 101 ;endfor 102 ;endif 103 ; 104 ; 105 ; 106 if (charvar eq 'HR_NLTE') then begin 107 what_I_plot = what_I_plot * 3700. ;; en K/hour 108 ;w = where((zz le 60.) and (zz ge 50.)) ;; pour enlever la ligne d'altitude ou le NLTE est active 109 ;if (w(0) ne -1) then what_I_plot(*,w) = 0. 110 endif 94 111 ; 95 112 ; … … 99 116 xx, $ ; 1D latitude 100 117 zz, $ ; 1D longitude 101 ; minfield =minfield_init, $ ; minimum value of plotted field (=0: calculate)102 ; maxfield =maxfield_init, $ ; maximum value of plotted field (=0: calculate)118 ; minfield_init, $ ; minimum value of plotted field (=0: calculate) 119 ; maxfield_init, $ ; maximum value of plotted field (=0: calculate) 103 120 overcontour=overcontour, $ ; another 2D field to overplot with contour lines (=0: no) 104 121 ; overvector_x=overvector_x, $ ; wind vector - x component (=0: no) -
trunk/mesoscale/PLOT/SPEC/GW/gravitwave_inc.pro
r114 r131 2 2 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 3 3 ;;;;;;; W 4 colors = 32 5 minfield_init = -6. 6 maxfield_init = 6. 7 format = '(F4.1)' 8 pal = 4 4 colors = 64 5 minfield_init = -10. 6 maxfield_init = 10. 7 ndiv = 10 8 format = '(I0)' 9 pal = 17 ;4 ;16 ;18 ;4 9 10 title_user = 'Vertical velocity (m s!U-1!N)' 11 lev=80.+10.*findgen(30) 10 12 ;;;;;;;; tk 11 minfield_init = 110. 12 maxfield_init = 210. 13 format = '(I0)' 14 pal = 33 15 title_user = 'Temperature (K)' 16 ;;;;;;; tk - tsat 17 minfield_init = -4. ;-8. 18 maxfield_init = 4. ;+8. 19 ndiv = 8 20 format = '(F4.1)' 21 pal = 0 22 title_user = 'T!Datm!N - T!Dsat!N (K)' 23 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 13 ;minfield_init = 110. 14 ;maxfield_init = 230. 15 ;ndiv = 12 16 ;format = '(I0)' 17 ;pal = 33 18 ;title_user = 'Temperature (K)' 19 ;lev = [-10.,-8.,-6.,-4.,-2.,2.,4.,6.,8.,10.] 20 ;lev=80.+10.*findgen(30) 21 ;;;;;;;; tk - tsat 22 ;minfield_init = -4. ;-8. 23 ;maxfield_init = 4. ;+8. 24 ;ndiv = 8 25 ;format = '(F4.1)' 26 ;pal = 0 27 ;title_user = 'T!Datm!N - T!Dsat!N (K)' 28 ;lev = [-6.,-5.,-4.,-3.,-2.,-1.,0.] 29 ;;;;;;;;; hr_nlte 30 ; minfield_init = -6. 31 ; maxfield_init = 6. 32 ; ndiv = 6 33 ; format = '(F4.1)' 34 ; pal = 33 35 ; title_user = 'NLTE heating rate (K / hour)' 36 lev=[-20.,-18.,-16.,-14.,-12.,-10.,-8.,-6.,-4.,-2.,2.,4.,6.,8.,10.,12.,14.,16.,18.,20.] 37 title_user = 'NLTE cooling rate (K hour!U-1!N)' 38 w=where(abs(what_I_plot) le 1e5) & if (w[0] ne -1) then what_I_plot[w] = - what_I_plot[w] 39 minfield_init = 0. 40 maxfield_init = 20. 41 ndiv = 10 42 pal = 1 ;4 ;22 43 lev=80.+10.*findgen(30) 44 format = '(I0)' 45 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 24 46 missing_value=1.e30 25 47 lim_max = maxfield_init & w=where((what_I_plot ge lim_max) and (what_I_plot le 1e9)) & if (w[0] ne -1) then what_I_plot[w]=lim_max … … 34 56 windowy = [0.,130.] 35 57 windowx = [10., 110.] 58 ;windowy = [50.,130.] 36 59 intervalx = 10. 37 60 intervaly = 10. … … 39 62 poscb=0.55 40 63 ;isotropic='false' 41 lev = 10.*findgen(100)42 lev = [-6.,-4.,-2.,2.,4.,6.]43 lev = [-8.,-5.,-1.,1.,5.,8.]44 lev = [-6.,-5.,-4.,-3.,-2.,-1.,0.]64 ;lev = 10.*findgen(100) 65 ;lev = [-6.,-4.,-2.,2.,4.,6.] 66 ;;lev = [-8.,-5.,-1.,1.,5.,8.] 67 ;;lev = [-6.,-5.,-4.,-3.,-2.,-1.,0.] 45 68 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 46 69 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 47 -
trunk/mesoscale/PLOT/SPEC/GW/gravitwaveprof.pro
r117 r131 28 28 experiment='GW_MARS_highwind_3D_loweropacity_lotspoints.161468' 29 29 experiment='GW_MARS_highwind_3D_loweropacity_morepoints.161542' 30 experiment='GW_MARS_highwind_3D_loweropacity_morepoints_LT15.161544'31 experiment='GW_MARS_highwind_3D_loweropacity_morepoints_LTcst.168440'32 experiment='GW_MARS_highwind_3D_loweropacity_morepoints_widehill.168468'30 ;experiment='GW_MARS_highwind_3D_loweropacity_morepoints_LT15.161544' 31 ;experiment='GW_MARS_highwind_3D_loweropacity_morepoints_LTcst.168440' 32 ;experiment='GW_MARS_highwind_3D_loweropacity_morepoints_widehill.168468' 33 33 file=path+experiment+'_wrfout_d01_9999-09-09_09:00:00_z' 34 34 file=path+experiment+'/wrfout_d01_9999-09-09_09:00:00_z' … … 57 57 ;nts=1 & nte=1 & nxs=6 & nxe=6 58 58 nts=1 & nte=100 & nxs=50 & nxe=50 59 nts=1 & nte=100 & nxs=60 & nxe=60 60 nts=1 & nte=100 & nxs=20 & nxe=20 59 61 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 60 62 ; -
trunk/mesoscale/PLOT/SPEC/MAP/map_uvt.pro
r96 r131 148 148 endelse 149 149 help, what_I_plot, lon, lat 150 print, min(what_I_plot) 151 print, max(what_I_plot) 152 print, min(overcontour) 153 print, max(overcontour) 154 print, min(overvector_x) 155 print, min(overvector_y) 150 print, 'COLOR PLOT min/max ', min(what_I_plot), max(what_I_plot) 151 print, 'CONTOUR PLOT min/max ', min(overcontour), max(overcontour) 152 print, 'VECTOR PLOT min/max ', min(overvector_x), min(overvector_y) 156 153 ; 157 154 ;
Note: See TracChangeset
for help on using the changeset viewer.
