Changeset 413 for codes/icosagcm/trunk/src/caldyn_gcm.f90

Timestamp:

06/10/16 17:49:07 (8 years ago)

Author:

dubos

Message:

Improved output

File:

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

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -35 +35 @@
     IF (is_master) PRINT *, 'caldyn_conserv=',def
 
+    nqdyn=1 ! default value
+
     def='theta'
-    CALL getin('caldyn_thermo',def)
+    CALL getin('thermo',def)
     SELECT CASE(TRIM(def))
     CASE('theta')
@@ -51 +53 @@
        physics_thermo=thermo_fake_moist
     CASE('moist')
-       caldyn_thermo=thermo_moist
+       caldyn_thermo=thermo_moist_debug
        physics_thermo=thermo_moist
+       nqdyn = 2
     CASE DEFAULT
        IF (is_mpi_root) PRINT *,'Bad selector for variable caldyn_thermo : <', &
@@ -58 +61 @@
        STOP
     END SELECT
-    
+
+    IF(is_master) THEN
+       SELECT CASE(caldyn_thermo)
+       CASE(thermo_theta)
+          PRINT *, 'caldyn_thermo = thermo_theta'
+       CASE(thermo_entropy)
+          PRINT *, 'caldyn_thermo = thermo_entropy'
+       CASE(thermo_moist_debug)
+          PRINT *, 'caldyn_thermo = thermo_moist_debug'
+       CASE DEFAULT
+          STOP
+       END SELECT
+
+       SELECT CASE(physics_thermo)
+       CASE(thermo_dry)
+          PRINT *, 'physics_thermo = thermo_dry'
+       CASE(thermo_fake_moist)
+          PRINT *, 'physics_thermo = thermo_fake_moist'
+       CASE(thermo_moist)
+          PRINT *, 'physics_thermo = thermo_moist'
+       END SELECT
+
+       PRINT *, 'nqdyn =', nqdyn
+    END IF
+
     CALL allocate_caldyn