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

Timestamp:

08/01/15 01:52:51 (9 years ago)

Author:

dubos

Message:

Cleanup DCMIP4

File:

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

codes/icosagcm/trunk/src/etat0.f90

@@ -19 +19 @@
     USE etat0_dcmip1_mod, ONLY : getin_etat0_dcmip1=>getin_etat0
     USE etat0_dcmip2_mod, ONLY : getin_etat0_dcmip2=>getin_etat0
+    USE etat0_dcmip4_mod, ONLY : getin_etat0_dcmip4=>getin_etat0
     USE etat0_dcmip5_mod, ONLY : getin_etat0_dcmip5=>getin_etat0
     USE etat0_williamson_mod, ONLY : getin_etat0_williamson=>getin_etat0
@@ -24 +25 @@
     ! Ad hoc interfaces
     USE etat0_academic_mod, ONLY : etat0_academic=>etat0  
-    USE etat0_dcmip4_mod, ONLY : etat0_dcmip4=>etat0  
     USE etat0_heldsz_mod, ONLY : etat0_heldsz=>etat0  
     USE etat0_venus_mod,  ONLY : etat0_venus=>etat0  
@@ -65 +65 @@
        CALL getin_etat0_dcmip2
     CASE ('dcmip3')
+    CASE ('dcmip4')
+        CALL getin_etat0_dcmip4
     CASE ('dcmip5')
         CALL getin_etat0_dcmip5
@@ -86 +88 @@
        CALL etat0_venus(f_ps, f_phis, f_theta_rhodz, f_u, f_q)
        PRINT *, "Venus (Lebonnois et al., 2012) test case"
-    CASE ('dcmip4')
-        IF(nqtot<2) THEN
-           IF (is_mpi_root)  THEN
-              PRINT *, "nqtot must be at least 2 for test case DCMIP4"
-           END IF
-           STOP
-        END IF
-        CALL etat0_dcmip4(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
    CASE DEFAULT
       IF(collocated) THEN
@@ -170 +164 @@
     USE etat0_dcmip2_mod, ONLY : compute_dcmip2 => compute_etat0
     USE etat0_dcmip3_mod, ONLY : compute_dcmip3 => compute_etat0
+    USE etat0_dcmip4_mod, ONLY : compute_dcmip4 => compute_etat0
     USE etat0_dcmip5_mod, ONLY : compute_dcmip5 => compute_etat0
     USE etat0_williamson_mod, ONLY : compute_w91_6 => compute_etat0
@@ -213 +208 @@
        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('dcmip4')
+       CALL compute_dcmip4(iim*jjm,lon_i,lat_i, phis, ps, temp_i, ulon_i, ulat_i, q)
+       CALL compute_dcmip4(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)