Commit 33757f08 authored by ldemaine's avatar ldemaine
Browse files

bugs fix 1

parent e785d2a7
......@@ -7755,35 +7755,7 @@ c$$$ real,intent(in) :: pratio
parameter (degtorad=pi/180.0d0)
slopes_scale = 1
call get_slopes(dset,xlon,xlat,slopes_scale,zradius,
& theta_s,psy_s,ier)
c$$$! TODO: cas où l'altitude est inférieure à la première maille de mcd
c$$$! exemple d'utilisation pour trouver la température
c$$$ elseif ((name.eq.'temp')) then
c$$$! Default linear interpolation between levels:
c$$$ a=profile(levlow)+(profile(levhi)-profile(levlow))*levweight(1)
c$$$! If below first atmospheric level, use linear
c$$$! interpolation with surface temperature
c$$$ if ((levlow.eq.levhi).and.(levlow.eq.1)) then
c$$$ goto 1000
c$$$ endif ! of if ((levlow.eq.levhi).and.(levlow.eq.1))
c$$$ elseif ((name.eq.'u').or.(name.eq.'v')) then
c$$$! Default linear interpolation between levels:
c$$$ a=profile(levlow)+(profile(levhi)-profile(levlow))*levweight(1)
c$$$! If below first atmopheric level, mimic log boundary layer
c$$$! with roughness length z_0; below z_0, set wind velocity to zero
c$$$ if ((levlow.eq.levhi).and.(levlow.eq.1)) then
c$$$ goto 1000
c$$$ endif
open(1, file='Test_slope/TEST_1.txt', status = 'new')
open(1, file='Test_slope/TEST_4.txt', status = 'new')
write(1,*) ''
write(1,*) '|-----------------------------------------|'
......@@ -7793,17 +7765,30 @@ c$$$ endif
write(1,*) '| xlon', xlon
write(1,*) '| xlat', xlat
write(1,*) '| zsurface', zsurface
write(1,*) '| zsurf_0', zref
write(1,*) '| theta_s', theta_s
write(1,*) '| psy_s', psy_s
write(1,*) '| zradius', zradius
write(1,*) '| temp', temp
c$$$ write(1,*) '| temp_0', temp_0
write(1,*) '| temp_gcm', temp_gcm
write(1,*) '| sheight', sheight
write(1,*) '| zonwind', zonwind
write(1,*) '| merwind', merwind
write(1,*) '|'
write(1,*) '|-----------------------------------------|'
write(1,*) '|'
slopes_scale = 1
call get_slopes(dset,xlon,xlat,slopes_scale,zradius,
& theta_s,psy_s,ier)
write(1,*) '| slopes_scale', slopes_scale
write(1,*) '| theta_s', theta_s
write(1,*) '| psy_s', psy_s
c$$$! TODO: cas où l'altitude est inférieure à la première maille de mcd
upslope_wind=0
crossslope_wind=0
......@@ -7811,7 +7796,8 @@ c$$$ write(1,*) '| temp_0', temp_0
zref = 10000*sin(theta_s)
zref = 10000*sin(theta_s*degtorad)
write(1,*) '| zref', zref
if (zsurface.le.zref) then
......@@ -7869,9 +7855,16 @@ c$$$ & /(1.-(sigma(levhi_0)/sigma(levlow_0)))
endif
enddo
endif
write(1,*) '| levhi_0', levhi_0
write(1,*) '| levlow_0', levlow_0
write(1,*) '| levweight_0', levweight_0
write(1,*) '| pratio_0', pratio_0
temp_0 = temp_gcm(levlow_0)
& + (temp_gcm(levhi_0)-temp_gcm(levlow_0))*levweight_0
write(1,*) '| temp_0', temp_0
!cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
! Computation of float terme
......@@ -7886,7 +7879,9 @@ c$$$ & /(1.-(sigma(levhi_0)/sigma(levlow_0)))
write(1,*) '| Cd', Cd
upslope_wind = sign(sqrt(Float / Cd), Float/Cd)
upslope_wind = sign(abs(sqrt(Float / Cd)), Float/Cd)
write(1,*) '| upslope_wind', upslope_wind
c$$$ do i=0,1000
c$$$
c$$$ write(1,*)'|-|------------'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment