Changeset 97 for trunk/src/cor30a.pro

Timestamp:

08/30/11 14:38:29 (13 years ago)

Author:

pinsard

Message:

suppress blank lines trailing blank

File:

• trunk/src/cor30a.pro (modified) (7 diffs)

trunk/src/cor30a.pro

@@ -88 +88 @@
 ;
 ; $URL$
+;
+; - fplod 20110830T085907Z aedon.locean-ipsl.upmc.fr (Darwin)
+;
+;   * add ug
 ;
 ; - fplod 20110822T085404Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -166 +170 @@
 Ribu=-grav*zu/ta*((dt-dter*jcool)+.61*ta*dq)/ut^2
 nits=3
-;;if (Ribu le 0.) then begin
-;;  zetu=CC*Ribu/(1+Ribu/Ribcu)
-;;endif else begin
-;;  zetu=CC*Ribu*(1+27./9*Ribu/CC)
-;;endelse
+;if (Ribu le 0.) then begin
+;  zetu=CC*Ribu/(1+Ribu/Ribcu)
+;endif else begin
+;  zetu=CC*Ribu*(1+27./9*Ribu/CC)
+;endelse
 sw=(Ribu le 0.)
 zetu=sw*(CC*Ribu/(1+Ribu/Ribcu))+(1-sw)*(CC*Ribu*(1+27./9*Ribu/CC))
-;;
+;
 L10=zu/zetu
-;;if (zetu gt 50 ) then nits=1
+;if (zetu gt 50 ) then nits=1
 usr=ut*von/(alog(zu/zo10)-psiu(zu/L10))
 tsr=-(dt-dter*jcool)*von*fdg/(alog(zt/zot10)-psit(zt/L10))
@@ -182 +186 @@
 tkt=.001
 
-;;charn=0.011
-;;if (ut gt 10.) then charn=0.011+(ut-10)/(18.-10)*(0.018-0.011)
-;;if (ut gt 18.) then charn=0.018
+;charn=0.011
+;if (ut gt 10.) then charn=0.011+(ut-10)/(18.-10)*(0.018-0.011)
+;if (ut gt 18.) then charn=0.018
 charn=(((0.011+(ut-10)/(18.-10)*(0.018-0.011)) > .011) < .018)
-;;
+;
 
 ;***************  bulk loop ************
@@ -198 +202 @@
   rr=zo*usr/visa
   L=zu/zet
-;;zoq=min([1.15e-4,5.5e-5/rr^.6])
+;zoq=min([1.15e-4,5.5e-5/rr^.6])
   zoq=(5.5e-5/rr^.6 < 1.15e-4)
-;;
+;
   zot=zoq
   usr=ut*von/(alog(zu/zo)-psiu(zu/L))
@@ -206 +210 @@
   qsr=-(dq-wetc*dter*jcool)*von*fdg/(alog(zq/zoq)-psit(zq/L))
   Bf=-grav/ta*usr*(tsr+.61*ta*qsr)
-;;if (Bf gt 0) then begin
-;;  ug=Beta*(Bf*zi)^.333
-;;endif else begin
-;;  ug=.2
-;;endelse
+;if (Bf gt 0) then begin
+;  ug=Beta*(Bf*zi)^.333
+;endif else begin
+;  ug=.2
+;endelse
   sw=(Bf gt 0)
   ug=sw*(Beta*(Bf*zi)^.333)+(1-sw)*.2
-;;
+;
   ut=sqrt(du*du+ug*ug)
   Rnl=0.97*(5.67e-8*(ts-dter*jcool+tdk)^4-Rl)
@@ -223 +227 @@
   alq=Al*qcol+be*hlb*cpw/LLe                                    ; Eq. 7 Buoy flux water
 
-;;  if (alq gt 0) then begin
-;;    xlamx=6./(1+(bigc*alq/usr^4)^.75)^.333                    ; Eq 13 Saunders
-;;    tkt=xlamx*visw/(sqrt(rhoa/rhow)*usr)                      ;Eq.11 Sub. thk
-;;  endif else begin
-;;    xlamx=6.0
-;;;;  tkt=min([.01,xlamx*visw/(sqrt(rhoa/rhow)*usr)])           ;Eq.11 Sub. thk
-;;    tkt=(xlamx*visw/(sqrt(rhoa/rhow)*usr) < .01)
-;;;;
-;;  endelse
+;  if (alq gt 0) then begin
+;    xlamx=6./(1+(bigc*alq/usr^4)^.75)^.333                     ; Eq 13 Saunders
+;    tkt=xlamx*visw/(sqrt(rhoa/rhow)*usr)                       ;Eq.11 Sub. thk
+;  endif else begin
+;    xlamx=6.0
+;  tkt=min([.01,xlamx*visw/(sqrt(rhoa/rhow)*usr)])              ;Eq.11 Sub. thk
+;    tkt=(xlamx*visw/(sqrt(rhoa/rhow)*usr) < .01)
+;
+;  endelse
   sw=(alq gt 0)
   xlamx=sw*(6./(1+(bigc*alq/usr^4)^.75)^.333)+(1-sw)*6.0
   tkt=sw*(xlamx*visw/(sqrt(rhoa/rhow)*usr))+(1-sw)*(xlamx*visw/(sqrt(rhoa/rhow)*usr) < .01)
-;;
+;
 
   dter=qcol*tkt/tcw ;  Eq.12 Cool skin
@@ -257 +261 @@
 ;y=[[Rns],[-1.*Rnl],[-1.*hlb],[-1.*hsb],[-1.*RF],[tau]]
 
-;;****************   Webb et al. correection  ************
+;****************   Webb et al. correection  ************
 ;wbar=1.61*hlb/LLe/(1+1.61*Q)/rhoa+hsb/rhoa/cpa/ta      ;formulation in hlb already includes webb
 ;hl_webb=rhoa*wbar*Q*LLe
-;;**************   compute transfer coeffs relative to ut @meas. ht **********
-;;Cd=tau/rhoa/ut/max([.1,du])
+;**************   compute transfer coeffs relative to ut @meas. ht **********
+;Cd=tau/rhoa/ut/max([.1,du])
 ;Cd=tau/rhoa/ut/(du > .1)
-;;;
+;
 Ch=-usr*tsr/ut/(dt-dter*jcool)
 Ce=-usr*qsr/(dq-dqer*jcool)/ut
-;;************  10-m neutral coeff realtive to ut ********
+;************  10-m neutral coeff realtive to ut ********
 ;Cdn_10=von*von/alog(10./zo)/alog(10./zo)
 ;Chn_10=von*von*fdg/alog(10./zo)/alog(10./zot)
 ;Cen_10=von*von*fdg/alog(10./zo)/alog(10./zoq)
 
-y=[[Rns],[-1.*Rnl],[-1.*hlb],[-1.*hsb],[-1.*RF],[tau],[Ch],[Ce]]
-;;y=[hsb,hlb,tau,zo,zot,zoq,L,usr,tsr,qsr,dter,dqer,tkt,RF,wbar,Cd,Ch,Ce,Cdn_10,Chn_10,Cen_10,ug ]
+y=[[Rns],[-1.*Rnl],[-1.*hlb],[-1.*hsb],[-1.*RF],[tau],[Ch],[Ce],[ug]]
+;y=[hsb,hlb,tau,zo,zot,zoq,L,usr,tsr,qsr,dter,dqer,tkt,RF,wbar,Cd,Ch,Ce,Cdn_10,Chn_10,Cen_10,ug ]
 ;   1   2   3   4  5   6  7  8   9  10   11   12  13  14  15  16 17 18    19      20    21  22
 ;       hsb=                    sensible heat flux (w/m^2)
 ;       hlb=                    latent heat flux (w/m^2)
 ;       RF=                     rain heat flux(w/m^2)
-;       wbar=                   webb mean w (m/s)
+;       wbar=                   webb mean w (m/s)
 ;       tau=                    stress (nt/m^2)
 ;       zo=                     velocity roughness length (m)