Changeset 54

Timestamp:

07/31/12 17:37:27 (12 years ago)

Author:

dubos

Message:

Test cases DCMIP2 - no Rayleigh relaxation yet

Location:

codes/icosagcm/trunk/src

Files:

• dcmip_initial_conditions_test_1_2_3_v5.f90 (modified) (1 diff)
• etat0.f90 (modified) (2 diffs)
• etat0_dcmip2.f90 (added)

codes/icosagcm/trunk/src/dcmip_initial_conditions_test_1_2_3_v5.f90

@@ -58 +58 @@
 
   PRIVATE
-  PUBLIC :: test3_gravity_wave ! (lon,lat,p,z,zcoords,u,v,w,t,phis,ps,rho,q)
-
+  PUBLIC :: test3_gravity_wave, & ! (lon,lat,p,z,zcoords,u,v,w,t,phis,ps,rho,q)
+       test2_steady_state_mountain, &
+       test2_schaer_mountain
 !-----------------------------------------------------------------------
 !     Physical Parameters

codes/icosagcm/trunk/src/etat0.f90

@@ -1 +1 @@
 MODULE etat0_mod
-
 
 CONTAINS
   
   SUBROUTINE etat0(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
-  USE icosa
-  USE etat0_jablonowsky06_mod, ONLY : etat0_jablonowsky06=>etat0
-  USE etat0_academic_mod, ONLY : etat0_academic=>etat0  
-  USE etat0_ncar_mod, ONLY : etat0_ncar=>etat0  
-  USE etat0_dcmip3_mod, ONLY : etat0_dcmip3=>etat0  
-  IMPLICIT NONE
+    USE icosa
+    USE etat0_jablonowsky06_mod, ONLY : etat0_jablonowsky06=>etat0
+    USE etat0_academic_mod, ONLY : etat0_academic=>etat0  
+    USE etat0_dcmip1_mod, ONLY : etat0_dcmip1=>etat0
+    USE etat0_dcmip2_mod, ONLY : etat0_dcmip2=>etat0
+    USE etat0_dcmip3_mod, ONLY : etat0_dcmip3=>etat0  
+    IMPLICIT NONE
     TYPE(t_field),POINTER :: f_ps(:)
     TYPE(t_field),POINTER :: f_phis(:)
@@ -16 +16 @@
     TYPE(t_field),POINTER :: f_u(:)
     TYPE(t_field),POINTER :: f_q(:)
-
+    
     CHARACTER(len=255) :: etat0_type
-    
     etat0_type='jablonowsky06'
     CALL getin("etat0",etat0_type)
     
     SELECT CASE (TRIM(etat0_type))
-      CASE ('jablonowsky06')
-        CALL etat0_jablonowsky06(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
-      CASE ('academic')
-        CALL etat0_academic(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
-      CASE ('ncar')
-        CALL etat0_ncar(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
-      CASE ('dcmip3')
-        CALL etat0_dcmip3(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
-      CASE DEFAULT
-        PRINT*, 'Bad selector for varaiable etat0 <',etat0_type,'> options are <jablonowsky06>, <academic>, <ncar> '
-        STOP
-    END SELECT 
-
-  END SUBROUTINE etat0  
+    CASE ('jablonowsky06')
+       CALL etat0_jablonowsky06(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
+    CASE ('academic')
+       CALL etat0_academic(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
+    CASE ('dcmip1')
+       CALL etat0_dcmip1(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
+    CASE ('dcmip2_mountain','dcmip2_schaer_noshear','dcmip2_schaer_shear')
+       CALL etat0_dcmip2(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
+    CASE ('dcmip3')
+       CALL etat0_dcmip3(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
+    CASE DEFAULT
+       PRINT*, 'Bad selector for variable etat0 <',etat0_type, &
+            '> options are <jablonowsky06>, <academic>, <dcmip[1-3]> '
+       STOP
+    END SELECT
+    
+  END SUBROUTINE etat0
          
 END MODULE etat0_mod