Changeset 628

Timestamp:

12/11/17 14:39:35 (6 years ago)

Author:

dubos

Message:

devel : new "conservative" variant for vertical transport of momentum

Location:

codes/icosagcm/devel/src

Files:

• base/earth_const.f90 (modified) (1 diff)
• dynamics/caldyn_gcm.F90 (modified) (1 diff)
• dynamics/caldyn_kernels_base.F90 (modified) (1 diff)

codes/icosagcm/devel/src/base/earth_const.f90

@@ -20 +20 @@
 
   INTEGER, PARAMETER,PUBLIC :: thermo_none=-99, thermo_theta=1, thermo_entropy=2, &
-       thermo_moist=3, thermo_boussinesq=4, thermo_dry=10, thermo_fake_moist=11, thermo_moist_debug=100
-  INTEGER, PUBLIC :: caldyn_thermo, physics_thermo
+       thermo_moist=3, thermo_boussinesq=4, thermo_dry=10, thermo_fake_moist=11, thermo_moist_debug=100, &
+       caldyn_vert_noncons=1, caldyn_vert_cons=2
+  INTEGER, PUBLIC :: caldyn_thermo, caldyn_vert_variant, physics_thermo
   !$OMP THREADPRIVATE(caldyn_thermo) 
   !$OMP THREADPRIVATE(physics_thermo) 

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

@@ -37 +37 @@
     CALL getin("dysl_caldyn_vert",dysl_caldyn_vert)
 
+    def='advective'
+    CALL getin('caldyn_vert',def)
+    SELECT CASE(TRIM(def))
+    CASE('advective')
+       caldyn_vert_variant=caldyn_vert_noncons
+    CASE('conservative')
+       IF(.NOT. dysl_caldyn_vert) THEN
+          IF (is_mpi_root) PRINT *,'caldyn_vert=cons requires dysl_caldyn_vert=.TRUE.'
+          STOP
+       END IF
+       caldyn_vert_variant=caldyn_vert_cons
+    CASE DEFAULT
+       IF (is_mpi_root) PRINT *,'Bad selector for variable caldyn_vert : <', &
+            TRIM(def),'> options are <conservative>, <advective>'
+       STOP
+    END SELECT
+    IF (is_master) PRINT *, 'caldyn_vert=',def
+    
     def='energy'
     CALL getin('caldyn_conserv',def)

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

@@ -180 +180 @@
     REAL(rstd),INTENT(INOUT) :: dtheta_rhodz(iim*jjm,llm,nqdyn)
     REAL(rstd),INTENT(OUT) :: dps(iim*jjm)
-    INTEGER, PARAMETER :: caldyn_vert_cons=1, caldyn_vert_variant=caldyn_vert_cons
 
     ! temporary variable