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

Timestamp:

02/11/13 12:47:36 (11 years ago)

Author:

dubos

Message:

Working on dyn/adv coupling

File:

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

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -41 +41 @@
     SELECT CASE(TRIM(def))
     CASE('lmdz')
-       caldyn_exner=1
+       caldyn_exner=lmdz
     CASE('direct')
-       caldyn_exner=2
+       caldyn_exner=direct
     CASE DEFAULT
        IF (is_mpi_root) PRINT*,'Bad selector for variable caldyn_exner : <', TRIM(def),'> options are <lmdz>, <direct>'
@@ -53 +53 @@
     SELECT CASE(TRIM(def))
     CASE('lmdz')
-       caldyn_hydrostat=1
+       caldyn_hydrostat=lmdz
     CASE('direct')
-       caldyn_hydrostat=2
+       caldyn_hydrostat=direct
     CASE DEFAULT
        IF (is_mpi_root) PRINT*,'Bad selector for variable caldyn_hydrostat : <', TRIM(def),'> options are <lmdz>, <direct>'
@@ -304 +304 @@
     REAL(rstd),ALLOCATABLE,SAVE :: Fe(:,:), Ftheta(:,:)  ! mass flux, theta flux
     REAL(rstd),ALLOCATABLE,SAVE :: convm(:,:)  ! mass flux convergence
-    REAL(rstd),ALLOCATABLE,SAVE :: w(:,:)      ! vertical velocity      
+    REAL(rstd),ALLOCATABLE,SAVE :: w(:,:)      ! vertical mass flux
     REAL(rstd),ALLOCATABLE,SAVE :: berni(:,:)  ! Bernouilli function