Changeset 388 for codes

Timestamp:

05/30/16 13:27:18 (8 years ago)

Author:

ymipsl

Message:

• Add dcmip2016 cyclone etat0 estcase
• Add fisrt guess of dcmip2016 etat0 supercell testcase

YM

Location:

codes/icosagcm/trunk/src

Files:

• dcmip2016_supercell.f90 (added)
• etat0.f90 (modified) (4 diffs)
• etat0_dcmip2016_baroclinic_wave.f90 (modified) (1 diff)
• etat0_dcmip2016_cyclone.f90 (added)
• etat0_dcmip2016_supercell.f90 (added)
• geometry.f90 (modified) (2 diffs)

codes/icosagcm/trunk/src/etat0.f90

@@ -25 +25 @@
     USE etat0_temperature_mod, ONLY: getin_etat0_temperature=>getin_etat0
     USE etat0_dcmip2016_baroclinic_wave_mod, ONLY : getin_etat0_dcmip2016_baroclinic_wave=>getin_etat0
+    USE etat0_dcmip2016_cyclone_mod, ONLY : getin_etat0_dcmip2016_cyclone=>getin_etat0
+    USE etat0_dcmip2016_supercell_mod, ONLY : getin_etat0_dcmip2016_supercell=>getin_etat0
     ! Ad hoc interfaces
     USE etat0_academic_mod, ONLY : etat0_academic=>etat0  
@@ -80 +82 @@
     CASE ('dcmip2016_baroclinic_wave')
         CALL getin_etat0_dcmip2016_baroclinic_wave
+    CASE ('dcmip2016_cyclone')
+        CALL getin_etat0_dcmip2016_cyclone
+    CASE ('dcmip2016_supercell')
+        CALL getin_etat0_dcmip2016_supercell
     CASE DEFAULT
        collocated=.FALSE.
@@ -187 +193 @@
     USE etat0_temperature_mod, ONLY: compute_etat0_temperature => compute_etat0
     USE etat0_dcmip2016_baroclinic_wave_mod, ONLY : compute_dcmip2016_baroclinic_wave => compute_etat0
+    USE etat0_dcmip2016_cyclone_mod, ONLY : compute_dcmip2016_cyclone => compute_etat0
+    USE etat0_dcmip2016_supercell_mod, ONLY : compute_dcmip2016_supercell => compute_etat0
     IMPLICIT NONE
     REAL(rstd),INTENT(INOUT) :: ps(iim*jjm)
@@ -259 +267 @@
        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)
+    CASE('dcmip2016_cyclone')
+       CALL compute_dcmip2016_cyclone(iim*jjm,lon_i,lat_i, phis, ps, temp_i, ulon_i, ulat_i, q)
+       CALL compute_dcmip2016_cyclone(3*iim*jjm,lon_e,lat_e, phis_e, ps_e, temp_e, ulon_e, ulat_e, q_e)
+    CASE('dcmip2016_supercell')
+       CALL compute_dcmip2016_supercell(iim*jjm,lon_i,lat_i, phis, ps, temp_i, ulon_i, ulat_i, q)
+       CALL compute_dcmip2016_supercell(3*iim*jjm,lon_e,lat_e, phis_e, ps_e, temp_e, ulon_e, ulat_e, q_e)
     END SELECT
 

codes/icosagcm/trunk/src/etat0_dcmip2016_baroclinic_wave.f90

@@ -33 +33 @@
        STOP
     END IF
+!    CALL set_advection_scheme(1,advect_none)
+!    CALL set_advection_scheme(2,advect_none)
 !    CALL set_advection_scheme(3,advect_none)
     

codes/icosagcm/trunk/src/geometry.f90

@@ -274 +274 @@
       CALL swap_dimensions(ind)
       CALL swap_geometry(ind)
+      xyz_i(:,1) = 0 ; xyz_i(:,2) = 0 ;  xyz_i(:,3) = 1
+      
       DO j=jj_begin,jj_end
         DO i=ii_begin,ii_end
@@ -435 +437 @@
       CALL swap_dimensions(ind)
       CALL swap_geometry(ind)
+      lon_i(:)=0 ; lat_i(:)=0
+      lon_e(:)=0 ; lat_e(:)=0
       DO j=jj_begin-1,jj_end+1
         DO i=ii_begin-1,ii_end+1