Changeset 1006 for trunk/LMDZ.GENERIC/libf

Timestamp:

Jul 19, 2013, 10:25:38 AM (11 years ago)

Author:

emillour

Message:

Generic GCM:

• update the sponge layer: trun it into a module and (more important) compute the sponge quenching analytically rather than via Forward Euler approximation.

EM

Location:

trunk/LMDZ.GENERIC/libf

Files:

• dyn3d/comdissip.h (modified) (2 diffs)
• dyn3d/defrun_new.F (modified) (5 diffs)
• dyn3d/gcm.F (modified) (3 diffs)
• dyn3d/sponge.F (deleted)
• dyn3d/sponge.h (deleted)
• dyn3d/sponge_mod.F90 (added)
• phystd/callsedim.F (modified) (1 diff)

trunk/LMDZ.GENERIC/libf/dyn3d/comdissip.h

@@ -1 @@
-c-----------------------------------------------------------------------
-c INCLUDE dissip.h
+!-----------------------------------------------------------------------
+! INCLUDE dissip.h
 
-      COMMON/comdissip/
-     $    niterdis,coefdis,tetavel,tetatemp,gamdissip
+      COMMON/comdissip/                                                 &
+     &    niterdis,coefdis,tetavel,tetatemp,gamdissip
 
 
@@ -10 +10 @@
       REAL tetavel,tetatemp,coefdis,gamdissip
 
-c-----------------------------------------------------------------------
+!-----------------------------------------------------------------------

trunk/LMDZ.GENERIC/libf/dyn3d/defrun_new.F

@@ -37 +37 @@
 ! to use  'getin'
       USE ioipsl_getincom
+      use sponge_mod,only: callsponge,nsponge,mode_sponge,tetasponge
       IMPLICIT NONE
 
@@ -45 +46 @@
 #include "serre.h"
 #include "comdissnew.h"
-#include "sponge.h"
 c
 c   arguments:
@@ -451 +451 @@
 
         WRITE(tapeout,*) ""
-        WRITE(tapeout,*) "Avec sponge layer"
+        WRITE(tapeout,*) "Use a sponge layer?"
         callsponge=.true. ! default value
         call getin("callsponge",callsponge)
@@ -457 +457 @@
 
         WRITE(tapeout,*) ""
-        WRITE(tapeout,*) "Sponge:  mode0(u=v=0), mode1(u=umoy,v=0), ",
-     & "mode2(u=umoy,v=vmoy)"
+        WRITE(tapeout,*) "Sponge: number of layers over which",
+     &                    " sponge extends"
+        nsponge=3 ! default value
+        call getin("nsponge",nsponge)
+        WRITE(tapeout,*)" nsponge = ",nsponge
+
+        WRITE(tapeout,*)""
+        WRITE(tapeout,*)"Sponge mode: (forcing is towards ..."
+        WRITE(tapeout,*)"  over upper nsponge layers)"
+        WRITE(tapeout,*)"  0: (h=hmean,u=v=0)"
+        WRITE(tapeout,*)"  1: (h=hmean,u=umean,v=0)"
+        WRITE(tapeout,*)"  2: (h=hmean,u=umean,v=vmean)"
         mode_sponge=2 ! default value
         call getin("mode_sponge",mode_sponge)
@@ -464 +474 @@
 
         WRITE(tapeout,*) ""
-        WRITE(tapeout,*) "Sponge:  hauteur de sponge (km)"
-        hsponge=90.0 ! default value
-        call getin("hsponge",hsponge)
-        WRITE(tapeout,*)" hsponge = ",hsponge
-
-        WRITE(tapeout,*) ""
-        WRITE(tapeout,*) "Sponge:  tetasponge (secondes)"
+        WRITE(tapeout,*) "Sponge: characteristic time scale tetasponge"
+        WRITE(tapeout,*) "(seconds) at topmost layer (time scale then "
+        WRITE(tapeout,*) " doubles with decreasing layer index)."
         tetasponge=50000.0
         call getin("tetasponge",tetasponge)

trunk/LMDZ.GENERIC/libf/dyn3d/gcm.F

@@ -1 +1 @@
       PROGRAM gcm
 
+      use sponge_mod,only: callsponge,mode_sponge,sponge
       IMPLICIT NONE
 
@@ -46 +47 @@
 #include "serre.h"
 #include "tracstoke.h"
-#include "sponge.h"
 #include"advtrac.h"
 
@@ -444 +444 @@
 c        Sponge layer
 c        ~~~~~~~~~~~~
-         DO ij=1, ip1jmp1
-            pext(ij)=ps(ij)*aire(ij)
-         ENDDO
+
          IF (callsponge) THEN
-            CALL sponge(ucov,vcov,teta,pext,dtdiss,mode_sponge)
+           pext(1:ip1jmp1)=ps(1:ip1jmp1)*aire(1:ip1jmp1)
+           CALL sponge(ucov,vcov,teta,pext,dtdiss,mode_sponge)
          ENDIF
 

trunk/LMDZ.GENERIC/libf/phystd/callsedim.F

@@ -75 +75 @@
       IF (firstcall) THEN
         firstcall=.false.
+        ! add some tests on presence of required tracers/aerosols:
+        if (water) then
+          if (igcm_h2o_ice.eq.0) then
+            write(*,*) "callsedim error: water=.true.",
+     &                 " but igcm_h2o_ice=0"
+          stop
+          endif
+          if (iaero_h2o.eq.0) then
+            write(*,*) "callsedim error: water=.true.",
+     &                 " but iaero_ho2=0"
+          stop
+          endif
+        endif
       ENDIF ! of IF (firstcall)