Changeset 325

Timestamp:

02/01/15 21:10:39 (9 years ago)

Author:

dubos

Message:

Venus (Lebonnois et al., 2012) test case

Location:

codes/icosagcm/trunk/src

Files:

• etat0.f90 (modified) (2 diffs)
• etat0_venus.f90 (added)
• physics.f90 (modified) (6 diffs)

codes/icosagcm/trunk/src/etat0.f90

@@ -25 +25 @@
     USE etat0_dcmip4_mod, ONLY : etat0_dcmip4=>etat0  
     USE etat0_heldsz_mod, ONLY : etat0_heldsz=>etat0  
+    USE etat0_venus_mod,  ONLY : etat0_venus=>etat0  
     USE etat0_start_file_mod, ONLY : etat0_start_file=>etat0  
 
@@ -72 +73 @@
        PRINT *,"Held & Suarez (1994) test case"
        CALL etat0_heldsz(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
+    CASE ('venus')
+       CALL etat0_venus(f_ps, f_phis, f_theta_rhodz, f_u, f_q)
+       PRINT *, "Venus (Lebonnois et al., 2012) test case"
     CASE ('dcmip1')
        CALL etat0_dcmip1(f_ps,f_phis,f_theta_rhodz,f_u, f_q)

codes/icosagcm/trunk/src/physics.f90

@@ -5 +5 @@
   PRIVATE
 
-  INTEGER, PARAMETER :: phys_none=0, phys_HS94=1, phys_DCMIP=2
+  INTEGER, PARAMETER :: phys_none=0, phys_HS94=1, phys_DCMIP=2, phys_LB2012=3
 
   INTEGER :: phys_type
@@ -25 +25 @@
     USE physics_interface_mod
     USE physics_dcmip_mod, ONLY : init_physics_dcmip=>init_physics
+    USE etat0_venus_mod, ONLY : init_phys_venus=>init_physics
     IMPLICIT NONE
 
@@ -36 +37 @@
     CASE ('held_suarez')
        phys_type = phys_HS94
+    CASE ('Lebonnois2012')
+       phys_type = phys_LB2012
+       CALL init_phys_venus
     CASE ('dcmip')
        CALL allocate_field(f_dulon,field_t,type_real,llm, name='dulon')
@@ -46 +50 @@
     CASE DEFAULT
        IF(is_mpi_root) PRINT*, 'init_physics : Bad selector for variable physics <',&
-            TRIM(physics_type), '> options are <none>, <held_suarez>, <dcmip>'
+            TRIM(physics_type), '> options are <none>, <held_suarez>, <Lebonnois2012>, <dcmip>'
        STOP
     END SELECT
@@ -58 +62 @@
     USE physics_dcmip_mod, ONLY : write_physics_dcmip => write_physics
     USE etat0_heldsz_mod
+    USE etat0_venus_mod, ONLY : phys_venus => physics
     IMPLICIT NONE
     INTEGER, INTENT(IN)   :: it
@@ -82 +87 @@
        CASE(phys_HS94)
           CALL held_suarez(f_ps,f_theta_rhodz,f_ue) 
+       CASE(phys_LB2012)
+          CALL phys_venus(f_ps,f_theta_rhodz,f_ue) 
        CASE DEFAULT
           CALL physics_column(it, f_phis, f_ps, f_theta_rhodz, f_ue, f_q)