Changeset 381

Timestamp:

05/25/16 10:00:49 (8 years ago)

Author:

ymipsl

Message:

Add DCMIP2016 physics

(first guess)

YM

Location:

codes/icosagcm/trunk/src

Files:

• dcmip2016_kessler_physic.f90 (added)
• dcmip2016_simple_physics.f90 (added)
• physics.f90 (modified) (13 diffs)
• physics_dcmip2016.f90 (added)
• physics_interface.f90 (modified) (1 diff)
• terminator.f90 (added)

codes/icosagcm/trunk/src/physics.f90

@@ -5 +5 @@
   PRIVATE
 
-  INTEGER, PARAMETER :: phys_none=0, phys_HS94=1, phys_DCMIP=2, phys_lmdz_generic=3, phys_LB2012=4, phys_external=5
+  INTEGER, PARAMETER :: phys_none=0, phys_HS94=1, phys_DCMIP=2, phys_lmdz_generic=3, phys_LB2012=4, phys_external=5, phys_DCMIP2016=6
 
   INTEGER :: phys_type
@@ -25 +25 @@
     USE physics_interface_mod
     USE physics_dcmip_mod, ONLY : init_physics_dcmip=>init_physics
+    USE physics_dcmip2016_mod, ONLY : init_physics_dcmip2016=>init_physics
     USE etat0_venus_mod, ONLY : init_phys_venus=>init_physics
     USE physics_lmdz_generic_mod, ONLY : init_physics_lmdz_generic=>init_physics
@@ -57 +58 @@
        CALL init_pack_after ! Defines Ai, lon, lat in physics_inout
        phys_type = phys_DCMIP
+    CASE ('dcmip2016')
+       CALL allocate_field(f_dulon,field_t,type_real,llm, name='dulon')
+       CALL allocate_field(f_dulat,field_t,type_real,llm, name='dulat')
+       CALL allocate_field(f_temp,field_t,type_real,llm, name='temp')
+       CALL allocate_field(f_temp,field_t,type_real,llm, name='temp')
+       CALL init_pack_before ! Compute physics_inout%ngrid and offsets used by pack/unpack
+       CALL init_physics_dcmip2016
+       CALL init_pack_after ! Defines Ai, lon, lat in physics_inout
+       phys_type = phys_DCMIP2016
     CASE DEFAULT
        IF(is_mpi_root) PRINT*, 'init_physics : Bad selector for variable physics <',&
@@ -73 +83 @@
     USE physics_external_mod, ONLY : physics_external => physics
     USE physics_dcmip_mod, ONLY : write_physics_dcmip => write_physics
+    USE physics_dcmip2016_mod, ONLY : write_physics_dcmip2016 => write_physics
     USE etat0_heldsz_mod
     USE etat0_venus_mod, ONLY : phys_venus => physics
@@ -119 +130 @@
        CASE (phys_DCMIP)
           CALL write_physics_dcmip
+       CASE (phys_DCMIP2016)
+          CALL write_physics_dcmip2016
        END SELECT
     END IF
@@ -128 +141 @@
     USE physics_interface_mod
     USE physics_dcmip_mod, ONLY : full_physics_dcmip => full_physics
+    USE physics_dcmip2016_mod, ONLY : full_physics_dcmip2016 => full_physics
     USE theta2theta_rhodz_mod
     USE mpipara
@@ -147 +161 @@
 
     CALL theta_rhodz2temperature(f_ps,f_theta_rhodz,f_temp)
-
+    
     DO ind=1,ndomain
        IF (.NOT. assigned_domain(ind)) CYCLE
@@ -163 +177 @@
     CASE (phys_DCMIP)
        CALL full_physics_dcmip
+    CASE (phys_DCMIP2016)
+       CALL full_physics_dcmip2016
     CASE DEFAULT
        IF(is_mpi_master) PRINT *,'Internal error : illegal value of phys_type', phys_type
@@ -197 +213 @@
   END SUBROUTINE physics_column
 
-  SUBROUTINE pack_physics(info, phis, ps, temp, ue, q)
+  SUBROUTINE pack_physics(info, phis, ps, temp, ue, q )
     USE icosa
     USE wind_mod
@@ -203 +219 @@
     USE theta2theta_rhodz_mod
     USE physics_interface_mod
+    USE exner_mod
     IMPLICIT NONE
     TYPE(t_pack_info) :: info
@@ -208 +225 @@
     REAL(rstd) :: ps(iim*jjm)
     REAL(rstd) :: temp(iim*jjm,llm)
+    REAL(rstd) :: pks(iim*jjm)
+    REAL(rstd) :: pk(iim*jjm,llm)
     REAL(rstd) :: ue(3*iim*jjm,llm)
     REAL(rstd) :: q(iim*jjm,llm,nqtot)
@@ -219 +238 @@
     CALL compute_pression(ps,p,0)
 !$OMP BARRIER
+    CALL compute_exner(ps,p,pks,pk,0) 
+!$OMP BARRIER
     CALL compute_wind_centered(ue,uc)
     CALL compute_wind_centered_lonlat_compound(uc, ulon, ulat)
@@ -224 +245 @@
     CALL pack_domain(info, phis, physics_inout%phis)
     CALL pack_domain(info, p, physics_inout%p)
+    CALL pack_domain(info, pk, physics_inout%pk)
     CALL pack_domain(info, Temp, physics_inout%Temp)
     CALL pack_domain(info, ulon, physics_inout%ulon)

codes/icosagcm/trunk/src/physics_interface.f90

@@ -11 +11 @@
      REAL(rstd), DIMENSION(:), POINTER :: Ai, lon, lat, phis
      ! Input, time-dependent
-     REAL(rstd), DIMENSION(:,:), POINTER :: p, Temp, ulon, ulat
+     REAL(rstd), DIMENSION(:,:), POINTER :: p, pk, Temp, ulon, ulat
      REAL(rstd), DIMENSION(:,:,:), POINTER :: q
      ! Output arrays