Changeset 861 for codes/icosagcm/devel

Timestamp:

05/09/19 01:27:19 (5 years ago)

Author:

dubos

Message:

devel : compute_X => compute_X_unst or compute_X_hex in init_caldyn

Location:

codes/icosagcm/devel/src/dynamics

Files:

• caldyn_gcm.F90 (modified) (3 diffs)
• caldyn_hevi.f90 (modified) (1 diff)

codes/icosagcm/devel/src/dynamics/caldyn_gcm.F90

@@ -17 +17 @@
   SUBROUTINE init_caldyn
     USE compute_mod, ONLY : compute_pvort_only
-    USE compute_pvort_only_mod, ONLY : compute_pvort_only_hex
+    USE compute_pvort_only_mod, ONLY : compute_pvort_only_hex, compute_pvort_only_unst
 
     CHARACTER(len=255) :: def
@@ -149 +149 @@
 
     CALL allocate_caldyn
-
-    IF(grid_type==grid_ico) THEN
+    
+    SELECT CASE(grid_type)
+    CASE(grid_ico)
        ! NB : unused now, would be useful for non-traditional / deep-atmosphere
        DO ind=1,ndomain
@@ -159 +160 @@
           CALL compute_planetvel(planetvel)
        END DO
-    END IF
-
-    compute_pvort_only => compute_pvort_only_hex
+       compute_pvort_only => compute_pvort_only_hex
+    CASE(grid_unst)
+       compute_pvort_only => compute_pvort_only_unst
+    END SELECT
 
   END SUBROUTINE init_caldyn

codes/icosagcm/devel/src/dynamics/caldyn_hevi.f90

@@ -150 +150 @@
        qv=f_qv(ind)
        hv=f_hv(ind)
+!       PRINT *, 'caldyn_hevi : u, mass, qu qv, hv', &
+!            SHAPE(u), SHAPE(mass), SHAPE(qu), SHAPE(qv), SHAPE(hv)
        CALL compute_pvort_only(u,mass,qu,qv,hv)
        IF(caldyn_kinetic==kinetic_consistent) THEN