Changeset 208

Timestamp:

07/10/14 11:28:31 (10 years ago)

Author:

ymipsl

Message:

Atmosphere scaleheight is not hard coded in disvert_std, and given in meters instead km
YM

Location:

codes/icosagcm/trunk/src

Files:

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

codes/icosagcm/trunk/src/disvert_apbp.f90

@@ -33 +33 @@
   REAL(rstd),INTENT(OUT) :: presnivs(:)
   
-  INTEGER,PARAMETER :: unit=42
   CHARACTER(len=255) :: filename
   INTEGER :: l,ok
@@ -69 +68 @@
     ! tell the world about it
     IF (is_mpi_root) THEN
+!$OMP MASTER
       WRITE(*,*) "ap()=",ap
       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," (km)"
+      WRITE(*,*) "and approximative mid-layer height, assuming an atmospheric scale height of ",scaleheight/1000," (km)"
       DO l=1,llm
-        WRITE(*,*) 'PRESNIVS(',l,')=',presnivs(l),'  Z ~ ',log(preff/presnivs(l))*scaleheight,       &
-                   ' DZ ~ ',scaleheight*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))*scaleheight/1000,       &
+                   ' DZ ~ ',scaleheight/1000*log((ap(l)+bp(l)*preff)/ max(ap(l+1)+bp(l+1)*preff,1.e-10))
       ENDDO
+!$OMP END MASTER
     ENDIF
   

codes/icosagcm/trunk/src/disvert_std.f90

@@ -26 +26 @@
   USE icosa
   USE mpipara
+  USE earth_const
   IMPLICIT NONE
   REAL(rstd),INTENT(OUT) :: ap(:)
@@ -59 +60 @@
     ap(1)=0.
     ap(llm+1) = pa * ( sig(llm+1) - bp(llm+1) )
-    
-    IF (is_mpi_root) PRINT*,'ap',ap
-    IF (is_mpi_root) PRINT*,'bp',bp
-    
-    IF (is_mpi_root) PRINT*, 'Niveaux de pressions approximatifs aux centres des'
-    IF (is_mpi_root) PRINT*, 'couches calcules pour une pression de surface =', preff
-    IF (is_mpi_root) PRINT*, 'et altitudes equivalentes pour une hauteur d echelle de'
-    IF (is_mpi_root) PRINT*, '8km'
-    
     DO l = 1, llm
       presnivs(l) = 0.5 *( ap(l)+bp(l)*preff + ap(l+1)+bp(l+1)*preff )
-  
-      IF (is_mpi_root) PRINT*, 'PRESNIVS(',l,')=',presnivs(l),'  Z ~ ',log(preff/presnivs(l))*8.,       &
-                               ' DZ ~ ',8.*log((ap(l)+bp(l)*preff)/ max(ap(l+1)+bp(l+1)*preff,1.e-10))
     ENDDO
+    
+    ! tell the world about it
+    IF (is_mpi_root) THEN
+!$OMP MASTER
+      WRITE(*,*) "ap()=",ap
+      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)"
+      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))
+      ENDDO
+!$OMP END MASTER
+    ENDIF
   
   END SUBROUTINE disvert

codes/icosagcm/trunk/src/earth_const.f90

@@ -11 +11 @@
   REAL(rstd),SAVE :: preff=101325.
   REAL(rstd),SAVE :: pa=50000.
-  REAL(rstd),SAVE :: scaleheight=8. ! atmospheric scale height (km)
+  REAL(rstd),SAVE :: scaleheight=8000. ! atmospheric scale height (m)
   REAL(rstd),SAVE :: scale_factor=1.