Changeset 327 for codes/icosagcm/trunk/src/physics.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/physics.f90 (modified) (7 diffs)

codes/icosagcm/trunk/src/physics.f90

@@ -5 +5 @@
   PRIVATE
 
-  INTEGER, PARAMETER :: phys_none=0, phys_HS94=1, phys_DCMIP=2, phys_LB2012=3
+  INTEGER, PARAMETER :: phys_none=0, phys_HS94=1, phys_DCMIP=2, phys_lmdz_generic=3, phys_LB2012=4 
 
   INTEGER :: phys_type
@@ -26 +26 @@
     USE physics_dcmip_mod, ONLY : init_physics_dcmip=>init_physics
     USE etat0_venus_mod, ONLY : init_phys_venus=>init_physics
+    USE physics_lmdz_generic_mod, ONLY : init_physics_lmdz_generic=>init_physics
     IMPLICIT NONE
 
@@ -40 +41 @@
        phys_type = phys_LB2012
        CALL init_phys_venus
+
+    CASE ('phys_lmdz_generic')
+       CALL init_physics_lmdz_generic
+       phys_type=phys_lmdz_generic
     CASE ('dcmip')
        CALL allocate_field(f_dulon,field_t,type_real,llm, name='dulon')
@@ -50 +55 @@
     CASE DEFAULT
        IF(is_mpi_root) PRINT*, 'init_physics : Bad selector for variable physics <',&
-            TRIM(physics_type), '> options are <none>, <held_suarez>, <Lebonnois2012>, <dcmip>'
+            TRIM(physics_type), '> options are <none>, <held_suarez>, <Lebonnois2012>, <dcmip>, <phys_lmdz_generic>'
        STOP
     END SELECT
@@ -57 +62 @@
   END SUBROUTINE init_physics
 
-  SUBROUTINE physics(it,f_phis, f_ps, f_theta_rhodz, f_ue, f_q)
-    USE icosa
-    USE physics_interface_mod
+  SUBROUTINE physics(it,f_phis, f_ps, f_theta_rhodz, f_ue, f_wflux, f_q)
+    USE icosa
+    USE physics_interface_mod
+    USE physics_lmdz_generic_mod, ONLY : physics_lmdz_generic => physics
     USE physics_dcmip_mod, ONLY : write_physics_dcmip => write_physics
     USE etat0_heldsz_mod
@@ -69 +75 @@
     TYPE(t_field),POINTER :: f_theta_rhodz(:)
     TYPE(t_field),POINTER :: f_ue(:)
+    TYPE(t_field),POINTER :: f_wflux(:)
     TYPE(t_field),POINTER :: f_q(:)
     REAL(rstd),POINTER :: phis(:)
@@ -87 +94 @@
        CASE(phys_HS94)
           CALL held_suarez(f_ps,f_theta_rhodz,f_ue) 
+       CASE (phys_lmdz_generic)
+         CALL physics_lmdz_generic(it ,f_phis, f_ps, f_theta_rhodz, f_ue, f_wflux, f_q)
        CASE(phys_LB2012)
           CALL phys_venus(f_ps,f_theta_rhodz,f_ue)