Changeset 377 for codes/icosagcm/trunk/src/dcmip_initial_conditions_test_1_2_3_v5.f90

Timestamp:

04/14/16 23:12:41 (8 years ago)

Author:

dubos

Message:

New : positive advection option for theta

File:

• codes/icosagcm/trunk/src/dcmip_initial_conditions_test_1_2_3_v5.f90 (modified) (5 diffs)

codes/icosagcm/trunk/src/dcmip_initial_conditions_test_1_2_3_v5.f90

@@ -1196 +1196 @@
 ! Test 3-1
 !==========
-SUBROUTINE test3_gravity_wave (lon,lat,p,z,zcoords,u,v,w,t,phis,ps,rho,q)
+SUBROUTINE test3_gravity_wave (X,lon,lat,p,z,zcoords,u,v,w,t,phis,ps,rho,q)
 
 IMPLICIT NONE
@@ -1204 +1204 @@
 
         real(rstd), intent(in)  :: lon, &       ! Longitude (radians)
-                                   lat          ! Latitude (radians)
+                                   lat, &       ! Latitude (radians)
+                                   X            ! Reduced Earth reduction factor (DCMIP value = 125)
 
         real(rstd), intent(inout) :: p, &       ! Pressure  (Pa)
@@ -1227 +1228 @@
 !     test case parameters
 !----------------------------------------------------------------------- 
-        real(rstd), parameter ::        X       = 125.d0,               &       ! Reduced Earth reduction factor
+        real(rstd), parameter ::        &
                                 Om      = 0.d0,                 &       ! Rotation Rate of Earth
-                                as      = a/X,                  &       ! New Radius of small Earth     
                                 u0      = 20.d0,                &       ! Reference Velocity 
 !                               u0      = 0.d0,                 &       ! FIXME : no zonal wind for NH tests
@@ -1243 +1243 @@
                                 N2      = N*N,                  &       ! Brunt-Vaisala frequency Squared
                                 bigG    = (g*g)/(N2*cp)                 ! Constant
-                            
+
+      real(rstd) :: as                                                  ! New Radius of small Earth     
+
       real(rstd) :: height                                                      ! Model level height
       real(rstd) :: sin_tmp, cos_tmp                                    ! Calculation of great circle distance
@@ -1251 +1253 @@
       real(rstd) :: theta_pert                                          ! Pot-temp perturbation
 
+      as = a/X
+
 !-----------------------------------------------------------------------
 !    THE VELOCITIES