Changeset 217 for codes/icosagcm/trunk/src/physics.f90

Timestamp:

07/16/14 10:08:16 (10 years ago)

Author:

dubos

Message:

Removed "automatic" physics + bugfix

File:

• codes/icosagcm/trunk/src/physics.f90 (modified) (2 diffs)

codes/icosagcm/trunk/src/physics.f90

@@ -11 +11 @@
   TYPE(t_field),POINTER :: f_dulon(:), f_dulat(:)
 
-  CHARACTER(LEN=255) :: physics_type="automatic"
+  CHARACTER(LEN=255) :: physics_type
 !$OMP THREADPRIVATE(physics_type)
 
@@ -26 +26 @@
     IMPLICIT NONE
 
-    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 init_pack_before ! Compute physics_inout%ngrid and offsets used by pack/unpack
-    
-    physics_type='automatic'
+    physics_inout%dt_phys = dt*itau_physics
+    physics_type='none'
     CALL getin("physics",physics_type)
-
     SELECT CASE(TRIM(physics_type))
-    CASE ('automatic')
-       etat0_type='jablonowsky06'
-       CALL getin("etat0",etat0_type)
-       SELECT CASE(TRIM(etat0_type))
-       CASE('held_suarez')
-          phys_type = phys_HS94
-       CASE DEFAULT
-          IF(is_mpi_root) PRINT*,"NO PHYSICAL PACKAGE USED"
-          phys_type = phys_none
-       END SELECT
-
+    CASE ('none')
+       IF(is_mpi_root) PRINT*,"NO PHYSICAL PACKAGE USED"
+       phys_type = phys_none
+    CASE ('held_suarez')
+       phys_type = phys_HS94
     CASE ('dcmip')
+       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 init_pack_before ! Compute physics_inout%ngrid and offsets used by pack/unpack
        CALL init_physics_dcmip
+       CALL init_pack_after ! Defines Ai, lon, lat in physics_inout
        phys_type = phys_DCMIP
     CASE DEFAULT
        IF(is_mpi_root) PRINT*, 'init_physics : Bad selector for variable physics <',&
-            TRIM(physics_type), '> options are <automatic>, <dcmip>, <dry>'
+            TRIM(physics_type), '> options are <none>, <held_suarez>, <dcmip>'
        STOP
     END SELECT
 
     IF(is_mpi_root) PRINT *, 'phys_type = ',phys_type
-    physics_inout%dt_phys = dt*itau_physics
-    CALL init_pack_after ! Defines Ai, lon, lat in physics_inout
   END SUBROUTINE init_physics