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

Timestamp:

02/09/13 02:01:07 (11 years ago)

Author:

dubos

Message:

Some steps towards coupling with transport

File:

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

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -2 +2 @@
   USE icosa
 
+  PRIVATE
+
+  INTEGER, PARAMETER :: energy=1, enstrophy=2
   TYPE(t_field),POINTER :: f_out_u(:), f_p(:), f_rhodz(:), f_qu(:)
   REAL(rstd),POINTER :: out_u(:,:), p(:,:), rhodz(:,:), qu(:,:)
@@ -25 +28 @@
     SELECT CASE(TRIM(def))
     CASE('energy')
-       caldyn_conserv=1
+       caldyn_conserv=energy
     CASE('enstrophy')
-       caldyn_conserv=2
+       caldyn_conserv=enstrophy
     CASE DEFAULT
        IF (is_mpi_root) PRINT *,'Bad selector for variable caldyn_conserv : <', TRIM(def),'> options are <energy>, <enstrophy>'
@@ -110 +113 @@
 
     SELECT CASE(caldyn_conserv)
-    CASE(1) ! energy-conserving
+    CASE(energy) ! energy-conserving
        DO ind=1,ndomain
           CALL swap_dimensions(ind)
@@ -145 +148 @@
        ENDDO       
        
-    CASE(2) ! enstrophy-conserving
+    CASE(enstrophy) ! enstrophy-conserving
        DO ind=1,ndomain
           CALL swap_dimensions(ind)
@@ -412 +415 @@
 
     SELECT CASE(caldyn_conserv)
-    CASE(1) ! energy-conserving TRiSK
+    CASE(energy) ! energy-conserving TRiSK
 
        DO l=1,llm
@@ -461 +464 @@
        ENDDO
 
-    CASE(2) ! enstrophy-conserving TRiSK
+    CASE(enstrophy) ! enstrophy-conserving TRiSK
   
        DO l=1,llm