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

Timestamp:

02/09/15 20:18:34 (9 years ago)

Author:

ymipsl

Message:

Merge recent developments from saturn branch onto trunk.

• lmdz generic physics interface
• performance improvment on mix mpi/openmp
• asynchrone and overlaping communication
• best domain distribution between process and threads
• ....

This version is compatible with the actual saturn version and the both branches are considered merged on dynamico component.

YM

File:

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

codes/icosagcm/trunk/src/etat0.f90

@@ -18 +18 @@
     USE etat0_dcmip5_mod, ONLY : getin_etat0_dcmip5=>getin_etat0
     USE etat0_williamson_mod, ONLY : getin_etat0_williamson=>getin_etat0
+    USE etat0_temperature_mod, ONLY: getin_etat0_temperature=>getin_etat0
     ! Old interface
     USE etat0_academic_mod, ONLY : etat0_academic=>etat0  
@@ -55 +56 @@
     CASE ('isothermal')
        CALL getin_etat0_isothermal
+       CALL etat0_collocated(f_phis,f_ps,f_mass,f_theta_rhodz,f_u, f_q)
+    CASE ('temperature_profile')
+       CALL getin_etat0_temperature
        CALL etat0_collocated(f_phis,f_ps,f_mass,f_theta_rhodz,f_u, f_q)
     CASE ('jablonowsky06')
@@ -161 +165 @@
     USE etat0_dcmip5_mod, ONLY : compute_dcmip5 => compute_etat0
     USE etat0_williamson_mod, ONLY : compute_w91_6 => compute_etat0
+    USE etat0_temperature_mod, ONLY: compute_etat0_temperature => compute_etat0
     IMPLICIT NONE
     REAL(rstd),INTENT(INOUT) :: ps(iim*jjm)
@@ -186 +191 @@
        CALL compute_etat0_isothermal(iim*jjm, phis, ps, temp_i, ulon_i, ulat_i, q)
        CALL compute_etat0_isothermal(3*iim*jjm, phis_e, ps_e, temp_e, ulon_e, ulat_e, q_e)
+    CASE ('temperature_profile')
+       CALL compute_etat0_temperature(iim*jjm, phis, ps, temp_i, ulon_i, ulat_i, q)
+       CALL compute_etat0_temperature(3*iim*jjm, phis_e, ps_e, temp_e, ulon_e, ulat_e, q_e)
     CASE('jablonowsky06')
        CALL compute_jablonowsky06(iim*jjm,lon_i,lat_i, phis, ps, temp_i, ulon_i, ulat_i)