Changeset 416

Timestamp:

06/10/16 20:39:55 (8 years ago)

Author:

ymipsl

Message:

More option to parametrize dcmip2016 physics

YM

File:

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

codes/icosagcm/trunk/src/physics_dcmip2016.f90

@@ -15 +15 @@
 
   INTEGER, PARAMETER :: dry_baroclinic=0
-  INTEGER, PARAMETER :: moist_baroclinic=1
-  INTEGER, PARAMETER :: cyclone=2
-  INTEGER, PARAMETER :: supercell=3
-
-  
+  INTEGER, PARAMETER :: moist_baroclinic_full=1
+  INTEGER, PARAMETER :: moist_baroclinic_kessler=2
+  INTEGER, PARAMETER :: cyclone=3
+  INTEGER, PARAMETER :: supercell=4
+
+  LOGICAL,SAVE :: PBL   !  boundary layer 
+                        !  True : George Bryan 
+                        !  False : Reed & Jablonowsi
+  !$OMP THREADPRIVATE(PBL)
 CONTAINS
 
@@ -33 +37 @@
       CASE ('dry_baroclinic')
         testcase=dry_baroclinic
-      CASE ('moist_baroclinic')  
-        testcase=moist_baroclinic
+      CASE ('moist_baroclinic_full')  
+        testcase=moist_baroclinic_full
+      CASE ('moist_baroclinic_kessler')  
+        testcase=moist_baroclinic_kessler
       CASE ('cyclone')  
         testcase=cyclone
@@ -45 +51 @@
     END SELECT
 
+    PBL=.FALSE.
+    CALL getin("physics_dcmip2016_PBL",PBL)
 
     ngrid = physics_inout%ngrid
@@ -151 +159 @@
     ENDDO
     
-    
-    IF (testcase==moist_baroclinic .OR. testcase==cyclone  ) THEN
-      IF (testcase==moist_baroclinic) simple_physic_testcase=1
+    precl=0.
+    IF (testcase==moist_baroclinic_full .OR. testcase==cyclone  ) THEN
+      IF (testcase==moist_baroclinic_full) simple_physic_testcase=1
       IF (testcase==cyclone) simple_physic_testcase=0
       CALL simple_physics(ngrid, llm, dt_phys, lat, tfi, qfi(:,:,1) , ufi, vfi, pmid, pint, pdel, 1./pdel, ps, precl, &
-                          simple_physic_testcase, .FALSE., .FALSE.)
+                          simple_physic_testcase, .FALSE., PBL)
     ENDIF
 
   
-    IF (testcase==moist_baroclinic .OR. testcase==cyclone .OR. testcase==supercell ) THEN
+    IF (testcase==moist_baroclinic_full .OR. testcase==moist_baroclinic_kessler .OR. testcase==cyclone .OR. testcase==supercell ) THEN
        DO ij=1,ngrid
           lastz=0