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

Timestamp:

07/09/14 00:58:30 (10 years ago)

Author:

dubos

Message:

Upgraded JW06 and DCMIP5 to new etat0 interface (tested)

File:

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

codes/icosagcm/trunk/src/etat0.f90

@@ -15 +15 @@
     USE mpipara, ONLY : is_mpi_root
     USE disvert_mod
+    ! New interface
+    USE etat0_dcmip5_mod, ONLY : getin_etat0_dcmip5=>getin_etat0
+    ! Old interface
     USE etat0_williamson_mod, ONLY : etat0_williamson_new
-    USE etat0_jablonowsky06_mod, ONLY : etat0_jablonowsky06=>etat0
     USE etat0_academic_mod, ONLY : etat0_academic=>etat0  
     USE etat0_dcmip1_mod, ONLY : etat0_dcmip1=>etat0
@@ -22 +24 @@
     USE etat0_dcmip3_mod, ONLY : etat0_dcmip3=>etat0  
     USE etat0_dcmip4_mod, ONLY : etat0_dcmip4=>etat0  
-    USE etat0_dcmip5_mod, ONLY : etat0_dcmip5=>etat0  
     USE etat0_heldsz_mod, ONLY : etat0_heldsz=>etat0  
     USE dynetat0_gcm_mod, ONLY : dynetat0_start=>etat0 
@@ -51 +52 @@
     
     SELECT CASE (TRIM(etat0_type))
+       !------------------- New interface ---------------------
     CASE ('isothermal')
        CALL getin_etat0_isothermal
        CALL etat0_collocated(f_phis,f_ps,f_mass,f_theta_rhodz,f_u, f_q)
+    CASE ('jablonowsky06')
+       CALL etat0_collocated(f_phis,f_ps,f_mass,f_theta_rhodz,f_u, f_q)
+     CASE ('dcmip5')
+        CALL getin_etat0_dcmip5
+        CALL etat0_collocated(f_phis,f_ps,f_mass,f_theta_rhodz,f_u, f_q)
+        
+        !------------------- Old interface --------------------
     CASE ('williamson91.6')
        init_mass=.FALSE.
        CALL etat0_williamson_new(f_phis,f_mass,f_theta_rhodz,f_u, f_q)
-    CASE ('jablonowsky06')
-!       CALL etat0_jablonowsky06(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
-       CALL etat0_collocated(f_phis,f_ps,f_mass,f_theta_rhodz,f_u, f_q)
     CASE ('academic')
        CALL etat0_academic(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
@@ -79 +85 @@
         END IF
        CALL etat0_dcmip4(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
-     CASE ('dcmip5')
-       CALL etat0_dcmip5(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
      CASE ('readnf_start') 
           print*,"readnf_start used"    
@@ -135 +139 @@
       q=f_q(ind)
       CALL compute_etat0_collocated(ps,mass, phis, theta_rhodz, u, q)
-
     ENDDO
   END SUBROUTINE etat0_collocated
@@ -143 +146 @@
     USE theta2theta_rhodz_mod
     USE wind_mod
-    USE etat0_jablonowsky06_mod, ONLY : compute_jablonowsky06 => compute_etat0_new
+    USE etat0_jablonowsky06_mod, ONLY : compute_jablonowsky06 => compute_etat0
+    USE etat0_dcmip5_mod, ONLY : compute_dcmip5 => compute_etat0
     IMPLICIT NONE
     REAL(rstd),INTENT(INOUT) :: ps(iim*jjm)
@@ -189 +193 @@
        CALL compute_jablonowsky06(iim*jjm,lon_i,lat_i, phis, ps, temp_i, ulon_i, ulat_i)
        CALL compute_jablonowsky06(3*iim*jjm,lon_e,lat_e, phis_e, ps_e, temp_e, ulon_e, ulat_e)
+    CASE('dcmip5')
+       CALL compute_dcmip5(iim*jjm,lon_i,lat_i, phis, ps, temp_i, ulon_i, ulat_i, q)
+       CALL compute_dcmip5(3*iim*jjm,lon_e,lat_e, phis_e, ps_e, temp_e, ulon_e, ulat_e, q_e)
     END SELECT