Changeset 552

Timestamp:

09/18/17 15:07:22 (7 years ago)

Author:

dubos

Message:

trunk : backported commit 534 from devel

File:

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

codes/icosagcm/trunk/src/dynamics/caldyn_gcm.f90

@@ -21 +21 @@
     INTEGER            :: ind
     REAL(rstd),POINTER :: planetvel(:)
+
+    hydrostatic=.TRUE.
+    CALL getin("hydrostatic",hydrostatic)
   
     def='energy'
@@ -37 +40 @@
 
     nqdyn=1 ! default value
+    physics_thermo = thermo_none
 
     def='theta'
     CALL getin('thermo',def)
     SELECT CASE(TRIM(def))
+    CASE('boussinesq')
+       boussinesq=.TRUE.
+       caldyn_thermo=thermo_boussinesq
+       IF(.NOT. hydrostatic) THEN
+          PRINT *, 'thermo=boussinesq and hydrostatic=.FALSE. : Non-hydrostatic boussinesq equations are not supported'
+          STOP
+       END IF
     CASE('theta')
        caldyn_thermo=thermo_theta