Changeset 345 for codes/icosagcm/trunk/src/etat0.f90

Timestamp:

07/31/15 19:17:42 (9 years ago)

Author:

dubos

Message:

Cleanup DCMIP3

File:

• codes/icosagcm/trunk/src/etat0.f90 (modified) (8 diffs)

codes/icosagcm/trunk/src/etat0.f90

@@ -16 +16 @@
     USE mpipara, ONLY : is_mpi_root
     USE disvert_mod
-    ! New interface
+    ! Generic interface
     USE etat0_dcmip1_mod, ONLY : getin_etat0_dcmip1=>getin_etat0
     USE etat0_dcmip2_mod, ONLY : getin_etat0_dcmip2=>getin_etat0
@@ -22 +22 @@
     USE etat0_williamson_mod, ONLY : getin_etat0_williamson=>getin_etat0
     USE etat0_temperature_mod, ONLY: getin_etat0_temperature=>getin_etat0
-    ! Old interface
+    ! Ad hoc interfaces
     USE etat0_academic_mod, ONLY : etat0_academic=>etat0  
-    USE etat0_dcmip3_mod, ONLY : etat0_dcmip3=>etat0  
     USE etat0_dcmip4_mod, ONLY : etat0_dcmip4=>etat0  
     USE etat0_heldsz_mod, ONLY : etat0_heldsz=>etat0  
@@ -53 +52 @@
     CALL getin("etat0",etat0_type)
     
-    !------------------- New interface ---------------------
+    !------------------- Generic interface ---------------------
     collocated=.TRUE.
     SELECT CASE (TRIM(etat0_type))
@@ -65 +64 @@
     CASE ('dcmip2_mountain','dcmip2_schaer_noshear','dcmip2_schaer_shear')
        CALL getin_etat0_dcmip2
+    CASE ('dcmip3')
     CASE ('dcmip5')
         CALL getin_etat0_dcmip5
@@ -74 +74 @@
     END SELECT
 
-    !------------------- Old interface --------------------
+    !------------------- Ad hoc interfaces --------------------
     SELECT CASE (TRIM(etat0_type))
     CASE ('start_file')
@@ -86 +86 @@
        CALL etat0_venus(f_ps, f_phis, f_theta_rhodz, f_u, f_q)
        PRINT *, "Venus (Lebonnois et al., 2012) test case"
-    CASE ('dcmip3')
-       CALL etat0_dcmip3(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
     CASE ('dcmip4')
         IF(nqtot<2) THEN
@@ -171 +169 @@
     USE etat0_dcmip1_mod, ONLY : compute_dcmip1 => compute_etat0
     USE etat0_dcmip2_mod, ONLY : compute_dcmip2 => compute_etat0
+    USE etat0_dcmip3_mod, ONLY : compute_dcmip3 => compute_etat0
     USE etat0_dcmip5_mod, ONLY : compute_dcmip5 => compute_etat0
     USE etat0_williamson_mod, ONLY : compute_w91_6 => compute_etat0
@@ -211 +210 @@
        CALL compute_dcmip2(iim*jjm,lon_i,lat_i, phis, ps, temp_i, ulon_i, ulat_i)
        CALL compute_dcmip2(3*iim*jjm,lon_e,lat_e, phis_e, ps_e, temp_e, ulon_e, ulat_e)      
+    CASE('dcmip3')
+       CALL compute_dcmip3(iim*jjm,lon_i,lat_i, phis, ps, temp_i, ulon_i, ulat_i, q)
+       CALL compute_dcmip3(3*iim*jjm,lon_e,lat_e, phis_e, ps_e, temp_e, ulon_e, ulat_e, q_e)
     CASE('dcmip5')
        CALL compute_dcmip5(iim*jjm,lon_i,lat_i, phis, ps, temp_i, ulon_i, ulat_i, q)