Changeset 309 for codes/icosagcm/branches

Timestamp:

12/15/14 08:59:31 (9 years ago)

Author:

millour

Message:

Add third possibility for sponge layer, iflag_sponge=3, for a
sponge layer extending over the 'nb_sponge_layers' topmost layers.
EM

Location:

codes/icosagcm/branches/SATURN_DYNAMICO

Files:

• ICOSAGCM/src/sponge.f90 (modified) (4 diffs)
• TEST/run_icosa.def (modified) (2 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/sponge.f90

@@ -8 +8 @@
                                !1 --> for sponge over 4 topmost layers
                                !2 --> for sponge from top to ~1% of top layer pressure
+                               !3 --> for sponge over topmost nb_sponge_layers
   INTEGER,SAVE :: mode_sponge !1 --> u and v relax towards 0
                               !2 --> u and v relax towards their zonal mean
                               !3 --> u,v and pot. temp. relax towards their zonal mean
-!$OMP THREADPRIVATE(tau_sponge,iflag_sponge,mode_sponge)
+  INTEGER,SAVE :: nb_sponge_layers ! number of layers over which the sponge extends
+!$OMP THREADPRIVATE(tau_sponge,iflag_sponge,mode_sponge,nb_sponge_layers)
   REAL,ALLOCATABLE,SAVE :: rdamp(:) ! quenching coefficient
   REAL,ALLOCATABLE,SAVE:: lambda(:) ! inverse or quenching time scale (Hz)
@@ -29 +31 @@
     tau_sponge = 1.e-4
     CALL getin("tau_sponge",tau_sponge)
-    IF (is_mpi_master .AND. omp_master) PRINT*,'tau_sponge = ',tau_sponge
+    PRINT*,'tau_sponge = ',tau_sponge
 
     iflag_sponge = 0
     CALL getin("iflag_sponge",iflag_sponge)
-    IF (is_mpi_master .AND. omp_master) PRINT*,'iflag_sponge = ',iflag_sponge
+    PRINT*,'iflag_sponge = ',iflag_sponge
     
     mode_sponge = 1
     CALL getin("mode_sponge",mode_sponge)
-    IF (is_mpi_master .AND. omp_master) PRINT*,'mode_sponge = ',mode_sponge
+    PRINT*,'mode_sponge = ',mode_sponge
+
+    IF (iflag_sponge==3) THEN
+      nb_sponge_layers=1
+      call getin("nb_sponge_layers",nb_sponge_layers)
+    ENDIF
 
     IF (iflag_sponge == 0) THEN
-      IF (is_mpi_master .AND. omp_master) PRINT*,'init_sponge: no sponge'
+      PRINT*,'init_sponge: no sponge'
       RETURN
     ENDIF
@@ -59 +66 @@
 ! higher than 100 times the topmost layer pressure
         lambda(:)=tau_sponge*max(presnivs(llm)/presnivs(:)-0.01,0.)
+    ELSE IF (iflag_sponge == 3) THEN
+        lambda(:)=0.
+        DO l = llm,llm-nb_sponge_layers+1,-1
+          lambda(l)=tau_sponge/(2.**(llm-l))
+        ENDDO
     ELSE
       PRINT*,'Bad selector for variable iflag_sponge : <',iflag_sponge,             &
-            '> options are 0,1,2'
+            '> options are 0,1,2,3'
       STOP
     ENDIF
@@ -72 +84 @@
 
     IF (is_mpi_master) THEN
-      PRINT*,'lambda = '
+      PRINT*,'init_sponge: l, lambda(l), rdamp(l):'
       DO l=ll_begin,ll_end
-        PRINT*,l,lambda(l)
-      ENDDO
-      PRINT*,'rdamp = '
-      DO l=ll_begin,ll_end
-        PRINT*,l,rdamp(l)
+        PRINT*,l,lambda(l),rdamp(l)
       ENDDO
     ENDIF

codes/icosagcm/branches/SATURN_DYNAMICO/TEST/run_icosa.def

@@ -146 +146 @@
 ### iflag_sponge=1 for sponge over 4 topmost layers
 ### iflag_sponge=2 for sponge from top to ~1% of top layer pressure
+### iflag_sponge=3 for sponge over topmost 'nb_sponge_layers'
 ### tau_sponge --> damping frequency at last layer
 ### e-5 medium / e-4 strong yet reasonable / e-3 very strong
@@ -153 +154 @@
 iflag_sponge = 1
 tau_sponge = 1.e-4
+# 'nb_sponge_layers', used only when iflag_sponge = 3
+nb_sponge_layers = 10
 mode_sponge = 1