Changeset 1912 for trunk/LMDZ.MARS/libf

Timestamp:

Apr 3, 2018, 8:13:24 AM (7 years ago)

Author:

emillour

Message:

Mars GCM:
Tidying the gravity wave routines by turning them into modules:
orodrag.F -> orodrag_mod.F : note that the declared size of pvar(), which is
used in call to gwstress was wrong.
calldrag_noro.F -> calldrag_noro_mod.F
drag_noro.F -> drag_noro_mod.F
gwstress.F -> gwstress_mod.F
EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• calldrag_noro_mod.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/calldrag_noro.F) (3 diffs)
• drag_noro_mod.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/drag_noro.F) (3 diffs)
• gwstress_mod.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/gwstress.F) (3 diffs)
• orodrag_mod.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/orodrag.F) (5 diffs)
• physiq_mod.F (modified) (1 diff)

trunk/LMDZ.MARS/libf/phymars/calldrag_noro_mod.F

@@ +1 @@
+      MODULE calldrag_noro_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+      
       SUBROUTINE calldrag_noro(ngrid,nlayer,ptimestep,
      &                 pplay,pplev,pt,pu,pv,pdtgw,pdugw,pdvgw) 
@@ -6 +12 @@
        use surfdat_h, only: zstd, zsig, zgam, zthe
        use dimradmars_mod, only: ndomainsz
+       use drag_noro_mod, only: drag_noro
        IMPLICIT NONE
 c=======================================================================
@@ -202 +209 @@
       ENDDO         !   (boucle jd=1, ndomain)
 
-      return
-      end 
-
+      END SUBROUTINE calldrag_noro
+      
+      END MODULE calldrag_noro_mod
+

trunk/LMDZ.MARS/libf/phymars/drag_noro_mod.F

@@ +1 @@
+      MODULE drag_noro_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+      
       SUBROUTINE drag_noro (klon,klev,dtime,pplay,pplev,
      e                   pvar, psig, pgam, pthe,
@@ -51 +57 @@
 c
       use dimradmars_mod, only:  ndlo2
-      USE comcstfi_h
+      USE orodrag_mod, ONLY: orodrag
+      USE comcstfi_h, ONLY: g, r
       IMPLICIT none
 c======================================================================
@@ -160 +167 @@
       ENDDO
 c
-      RETURN
-      END
+
+      END SUBROUTINE drag_noro
+      
+      END MODULE drag_noro_mod

trunk/LMDZ.MARS/libf/phymars/gwstress_mod.F

@@ +1 @@
+      MODULE gwstress_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+
       SUBROUTINE GWSTRESS
      *         (  klon  , klev
@@ -49 +55 @@
       integer klon,klev,kidia,kfdia
 
-#include "yoegwd.h"
+      include "yoegwd.h"
 
 C-----------------------------------------------------------------------
@@ -129 +135 @@
   301 CONTINUE
 C
-      RETURN
-      END
+
+      END SUBROUTINE GWSTRESS
+      
+      END MODULE gwstress_mod

trunk/LMDZ.MARS/libf/phymars/orodrag_mod.F

@@ +1 @@
+      MODULE orodrag_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+      
       SUBROUTINE ORODRAG( klon,klev 
      I                 , KGWD, KGWDIM, KDX, KTEST
@@ -71 +77 @@
 C-----------------------------------------------------------------------
       use dimradmars_mod, only: ndlo2
-      USE comcstfi_h
+      USE gwstress_mod, ONLY: gwstress
+      USE comcstfi_h, ONLY: g, cpp
       implicit none
 C
@@ -79 +86 @@
       integer, save :: kfdia ! =NDLO2
 
-#include "yoegwd.h"
+      include "yoegwd.h"
 C-----------------------------------------------------------------------
 C
@@ -116 +123 @@
       integer ji,jk,jl,klevm1,ilevp1
 C      real gkwake
-      real ztmst,pvar,ztauf,zrtmst,zdelp,zb,zc,zbet
+      real ztmst,pvar(NDLO2,4),ztauf,zrtmst,zdelp,zb,zc,zbet
       real zconb,zabsv,zzd1,ratio,zust,zvst,zdis,ztemp
 C
@@ -283 +290 @@
 C
 C
-      RETURN
-      END
+
+      END SUBROUTINE ORODRAG
+      
+      END MODULE orodrag_mod

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -46 +46 @@
      &                     obliquit
       USE comcstfi_h, only: r, cpp, mugaz, g, rcp, pi, rad
+      USE calldrag_noro_mod, ONLY: calldrag_noro
       use param_v4_h, only: nreact,n_avog, 
      &                      fill_data_thermos, allocate_param_thermos