Changeset 234 for codes

Timestamp:

07/17/14 16:41:08 (10 years ago)

Author:

ymipsl

Message:

scaleheight-> scale_height

YM

Location:

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src

Files:

• disvert_apbp.f90 (modified) (1 diff)
• disvert_std.f90 (modified) (1 diff)
• earth_const.f90 (modified) (2 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/disvert_apbp.f90

@@ -76 +76 @@
       WRITE(*,*) "bp()=",bp
       WRITE(*,*) "Approximative mid-layer pressure, assuming a surface pressure preff=",preff," Pa"
-      WRITE(*,*) "and approximative mid-layer height, assuming an atmospheric scale height of ",scaleheight/1000," (km)"
+      WRITE(*,*) "and approximative mid-layer height, assuming an atmospheric scale height of ",scale_height/1000," (km)"
       DO l=1,llm
-        WRITE(*,*) 'PRESNIVS(',l,')=',presnivs(l),'  Z ~ ',log(preff/presnivs(l))*scaleheight/1000,       &
-                   ' DZ ~ ',scaleheight/1000*log((ap(l)+bp(l)*preff)/ max(ap(l+1)+bp(l+1)*preff,1.e-10))
+        WRITE(*,*) 'PRESNIVS(',l,')=',presnivs(l),'  Z ~ ',log(preff/presnivs(l))*scale_height/1000,       &
+                   ' DZ ~ ',scale_height/1000*log((ap(l)+bp(l)*preff)/ max(ap(l+1)+bp(l+1)*preff,1.e-10))
       ENDDO
 !$OMP END MASTER

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/disvert_std.f90

@@ -70 +70 @@
       WRITE(*,*) "bp()=",bp
       WRITE(*,*) "Approximative mid-layer pressure, assuming a surface pressure preff=",preff," Pa"
-      WRITE(*,*) "and approximative mid-layer height, assuming an atmospheric scale height of ",scaleheight/1000," (km)"
+      WRITE(*,*) "and approximative mid-layer height, assuming an atmospheric scale height of ",scale_height/1000," (km)"
       DO l=1,llm
-        WRITE(*,*) 'PRESNIVS(',l,')=',presnivs(l),'  Z ~ ',log(preff/presnivs(l))*scaleheight/1000,       &
-                   ' DZ ~ ',scaleheight/1000*log((ap(l)+bp(l)*preff)/ max(ap(l+1)+bp(l+1)*preff,1.e-10))
+        WRITE(*,*) 'PRESNIVS(',l,')=',presnivs(l),'  Z ~ ',log(preff/presnivs(l))*scale_height/1000,       &
+                   ' DZ ~ ',scale_height/1000*log((ap(l)+bp(l)*preff)/ max(ap(l+1)+bp(l+1)*preff,1.e-10))
       ENDDO
 !$OMP END MASTER

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/earth_const.f90

@@ -11 +11 @@
   REAL(rstd),SAVE :: preff=101325.
   REAL(rstd),SAVE :: pa=50000.
-  REAL(rstd),SAVE :: scaleheight=8000. ! atmospheric scale height (m)
+  REAL(rstd),SAVE :: scale_height=8000. ! atmospheric scale height (m)
   REAL(rstd),SAVE :: scale_factor=1.
 
@@ -30 +30 @@
     CALL getin("cpp",cpp)  
     CALL getin("preff",preff)  
-    CALL getin("scaleheight",scaleheight)
+    CALL getin("scale_height",scale_height)
     
     boussinesq=.FALSE.