Changeset 55

Timestamp:

07/31/12 17:45:50 (12 years ago)

Author:

dubos

Message:

Some DCMIP test case cleanup for consistency

Location:

codes/icosagcm/trunk/src

Files:

• etat0_dcmip1.f90 (moved) (moved from codes/icosagcm/trunk/src/etat0_ncar.f90) (2 diffs)
• etat0_dcmip3.f90 (modified) (4 diffs)

codes/icosagcm/trunk/src/etat0_dcmip1.f90

@@ -1 @@
-MODULE etat0_ncar_mod
+MODULE etat0_dcmip1_mod
   USE icosa
   PRIVATE
@@ -257 +257 @@
   
 
-END MODULE etat0_ncar_mod
+END MODULE etat0_dcmip1_mod

codes/icosagcm/trunk/src/etat0_dcmip3.f90

@@ -10 +10 @@
 
   PRIVATE
-! some of the following should be obtained via getin
-!  REAL(rstd),PARAMETER :: ztop=10000.   ! Height position of the model top (m)
-!  REAL(rstd),PARAMETER :: ptop=27391.9  ! Pressure at the model top (Pa)
-!  REAL(rstd),PARAMETER :: Xscale=1.     ! Small-planet scaling factor (1=Earth)
-!  REAL(rstd),PARAMETER :: Omega =0      ! Planetary rotation rate (s-1)
-  REAL(rstd),PARAMETER :: u0=20.         ! Maximum amplitude of the zonal wind (m.s-1)
-  REAL(rstd),PARAMETER :: zs=0.          ! Surface elevation (m)
-  REAL(rstd),PARAMETER :: N=0.01         ! Brunt-Vaisala frequency (s-1)
-  REAL(rstd),PARAMETER :: Teq=300.       ! Surface temperature at the equator (K)
-  REAL(rstd),PARAMETER :: Peq=1e5        ! Reference surface pressure at the equator (hPa)
-  REAL(rstd),PARAMETER :: d=5000.        ! Witdth parameter for theta
-  REAL(rstd),PARAMETER :: lonc=2*pi/3    ! Longitudinal centerpoint of theta
-  REAL(rstd),PARAMETER :: latc=0         ! Longitudinal centerpoint of theta
-  REAL(rstd),PARAMETER :: dtheta=1.      ! Maximum amplitude of theta (K)
-  REAL(rstd),PARAMETER :: Lz=20000.      ! Vertical wave lenght of the theta perturbation
 
   PUBLIC  etat0
+
 CONTAINS
 
@@ -68 +54 @@
   USE wind_mod
   IMPLICIT NONE
+  REAL(rstd),PARAMETER :: u0=20.         ! Maximum amplitude of the zonal wind (m.s-1)
+  REAL(rstd),PARAMETER :: N=0.01         ! Brunt-Vaisala frequency (s-1)
+  REAL(rstd),PARAMETER :: Teq=300.       ! Surface temperature at the equator (K)
+  REAL(rstd),PARAMETER :: Peq=1e5        ! Reference surface pressure at the equator (hPa)
+  REAL(rstd),PARAMETER :: d=5000.        ! Witdth parameter for theta
+  REAL(rstd),PARAMETER :: lonc=2*pi/3    ! Longitudinal centerpoint of theta
+  REAL(rstd),PARAMETER :: latc=0         ! Longitudinal centerpoint of theta
+  REAL(rstd),PARAMETER :: dtheta=1.      ! Maximum amplitude of theta (K)
+  REAL(rstd),PARAMETER :: Lz=20000.      ! Vertical wave lenght of the theta perturbation
+
   REAL(rstd), INTENT(OUT) :: ps(iim*jjm)
   REAL(rstd), INTENT(OUT) :: phis(iim*jjm)
@@ -85 +81 @@
   INTEGER :: i,j,l,ij
   REAL(rstd) :: Rd        ! gas constant of dry air, P=rho.Rd.T
-  REAL(rstd) :: alpha, rm, zs
+  REAL(rstd) :: alpha, rm
   REAL(rstd) :: lon,lat, C0, C1, GG
   REAL(rstd) :: p0psk, pspsk,r,zz, thetab, thetap
@@ -156 +152 @@
      CALL compute_temperature2theta_rhodz(ps,T,theta_rhodz,0)
   ELSE
-!     CALL compute_theta2theta_rhodz(ps,theta,theta_rhodz,0)
      CALL compute_temperature2theta_rhodz(ps,T,theta_rhodz,0)
   END IF