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

Timestamp:

10/30/15 15:41:06 (9 years ago)

Author:

dubos

Message:

Progress towards NH

File:

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

codes/icosagcm/trunk/src/dcmip_initial_conditions_test_1_2_3_v5.f90

@@ -1203 +1203 @@
 !-----------------------------------------------------------------------
 
-        real(rstd), intent(in)  :: lon, &               ! Longitude (radians)
-                                lat, &          ! Latitude (radians)
-                                z               ! Height (m)
-
-        real(rstd), intent(inout) :: p          ! Pressure  (Pa)
-                                
+        real(rstd), intent(in)  :: lon, &       ! Longitude (radians)
+                                   lat          ! Latitude (radians)
+
+        real(rstd), intent(inout) :: p, &       ! Pressure  (Pa)
+                                     z          ! Height (m)
+
 
         integer,  intent(in) :: zcoords         ! 0 or 1 see below
 
-        real(rstd), intent(out) :: u, &                 ! Zonal wind (m s^-1)
+        real(rstd), intent(out) :: u, &         ! Zonal wind (m s^-1)
                                 v, &            ! Meridional wind (m s^-1)
                                 w, &            ! Vertical Velocity (m s^-1)
@@ -1230 +1230 @@
                                 Om      = 0.d0,                 &       ! Rotation Rate of Earth
                                 as      = a/X,                  &       ! New Radius of small Earth     
-                                u0      = 20.d0,                &       ! Reference Velocity 
+!                               u0      = 20.d0,                &       ! Reference Velocity 
+                                u0      = 0.d0,                 &       ! FIXME : no zonal wind for NH tests
                                 Teq     = 300.d0,               &       ! Temperature at Equator    
                                 Peq     = 100000.d0,            &       ! Reference PS at Equator
@@ -1297 +1298 @@
 
                 height = (-g/N2)*log( (TS/bigG)*( (p/ps)**(Rd/cp) - 1.d0  ) + 1.d0 )
+                z = height ! modified : initialize z when pressure-based
 
         endif