Changeset 382

Timestamp:

05/25/16 10:02:22 (8 years ago)

Author:

ymipsl

Message:

Add etat0 for DCMIP2016 baroclinic wave testcase.

YM

Location:

codes/icosagcm/trunk/src

Files:

• etat0.f90 (modified) (4 diffs)
• etat0_dcmip2016_baroclinic_wave.f90 (added)

codes/icosagcm/trunk/src/etat0.f90

@@ -24 +24 @@
     USE etat0_williamson_mod, ONLY : getin_etat0_williamson=>getin_etat0
     USE etat0_temperature_mod, ONLY: getin_etat0_temperature=>getin_etat0
+    USE etat0_dcmip2016_baroclinic_wave_mod, ONLY : getin_etat0_dcmip2016_baroclinic_wave=>getin_etat0
     ! Ad hoc interfaces
     USE etat0_academic_mod, ONLY : etat0_academic=>etat0  
@@ -77 +78 @@
        autoinit_mass=.FALSE.
        CALL getin_etat0_williamson
+    CASE ('dcmip2016_baroclinic_wave')
+        CALL getin_etat0_dcmip2016_baroclinic_wave
     CASE DEFAULT
        collocated=.FALSE.
@@ -183 +186 @@
     USE etat0_williamson_mod, ONLY : compute_w91_6 => compute_etat0
     USE etat0_temperature_mod, ONLY: compute_etat0_temperature => compute_etat0
+    USE etat0_dcmip2016_baroclinic_wave_mod, ONLY : compute_dcmip2016_baroclinic_wave => compute_etat0
     IMPLICIT NONE
     REAL(rstd),INTENT(INOUT) :: ps(iim*jjm)
@@ -252 +256 @@
        CALL compute_w91_6(3*iim*jjm,lon_e,lat_e, phis_e, mass_e(:,1), temp_e(:,1), ulon_e(:,1), ulat_e(:,1))
        autoinit_mass = .FALSE. ! do not overwrite mass
+    CASE('dcmip2016_baroclinic_wave')
+       CALL compute_dcmip2016_baroclinic_wave(iim*jjm,lon_i,lat_i, phis, ps, temp_i, ulon_i, ulat_i, q)
+       CALL compute_dcmip2016_baroclinic_wave(3*iim*jjm,lon_e,lat_e, phis_e, ps_e, temp_e, ulon_e, ulat_e, q_e)
     END SELECT