Changeset 1266 for trunk/LMDZ.MARS/libf/phymars/flusv.F

Timestamp:

May 19, 2014, 10:05:08 AM (11 years ago)

Author:

aslmd

Message:

LMDZ.MARS
IMPORTANT CHANGE

• Remove all reference/use of nlayermx and dimphys.h
• Made use of automatic arrays whenever arrays are needed with dimension nlayer
• Remove lots of obsolete reference to dimensions.h
• Converted iono.h and param_v4.h into corresponding modules

(with embedded subroutine to allocate arrays)
(no arrays allocated if thermosphere not used)

• Deleted param.h and put contents into module param_v4_h
• Adapted testphys1d, newstart, etc...
• Made DATA arrays in param_read to be initialized by subroutine

fill_data_thermos in module param_v4_h

• Optimized computations in paramfoto_compact (twice less dlog10 calculations)
• Checked consistency before/after modification in debug mode
• Checked performance is not impacted (same as before)

File:

• trunk/LMDZ.MARS/libf/phymars/flusv.F (modified) (6 diffs)

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

@@ -1 +1 @@
       SUBROUTINE flusv(KDLON,nsf,n,omega,g,tau,emis,bh,bsol,fah,fdh)
-      use dimradmars_mod, only: ndlo2, ndlon
+      use dimradmars_mod, only: ndlo2, ndlon, nflev
       IMPLICIT NONE
 c.......................................................................
@@ -37 +37 @@
 c 
 #include "dimensions.h"
-#include "dimphys.h"
-!#include "dimradmars.h"
 c.......................................................................
 c  declaration des arguments 
@@ -52 +50 @@
       INTEGER iv,i,j
       REAL beta,gama1,gama2,amu1,grgama,b0,b1
-      REAL a(NDLON,4*nlayermx),b(NDLON,4*nlayermx)
-     &    ,d(NDLON,4*nlayermx),e(NDLON,4*nlayermx)
-     &    ,y(NDLON,4*nlayermx)
-     &    ,alambda(NDLON,2*nlayermx)
-     &    ,e1(NDLON,2*nlayermx),e2(NDLON,2*nlayermx)
-     &    ,e3(NDLON,2*nlayermx),e4(NDLON,2*nlayermx)
-     &    ,cah(NDLON,2*nlayermx),cab(NDLON,2*nlayermx)
-     &    ,cdh(NDLON,2*nlayermx),cdb(NDLON,2*nlayermx)
-      REAL grg(NDLON,2*nlayermx),grh(NDLON,2*nlayermx)
-     &    ,grj(NDLON,2*nlayermx),grk(NDLON,2*nlayermx)
-     &    ,alpha1(NDLON,2*nlayermx),alpha2(NDLON,2*nlayermx)
-     &    ,sigma1(NDLON,2*nlayermx),sigma2(NDLON,2*nlayermx)
+      REAL a(NDLON,4*nflev),b(NDLON,4*nflev)
+     &    ,d(NDLON,4*nflev),e(NDLON,4*nflev)
+     &    ,y(NDLON,4*nflev)
+     &    ,alambda(NDLON,2*nflev)
+     &    ,e1(NDLON,2*nflev),e2(NDLON,2*nflev)
+     &    ,e3(NDLON,2*nflev),e4(NDLON,2*nflev)
+     &    ,cah(NDLON,2*nflev),cab(NDLON,2*nflev)
+     &    ,cdh(NDLON,2*nflev),cdb(NDLON,2*nflev)
+      REAL grg(NDLON,2*nflev),grh(NDLON,2*nflev)
+     &    ,grj(NDLON,2*nflev),grk(NDLON,2*nflev)
+     &    ,alpha1(NDLON,2*nflev),alpha2(NDLON,2*nflev)
+     &    ,sigma1(NDLON,2*nflev),sigma2(NDLON,2*nflev)
       INTEGER nq
       PARAMETER (nq=8)
@@ -272 +270 @@
 
       SUBROUTINE sys3v(KDLON,n,a,b,d,e,y)
-      use dimradmars_mod, only: ndlon, ndlo2
+      use dimradmars_mod, only: ndlon, ndlo2, nflev
       IMPLICIT NONE
 c.......................................................................
@@ -291 +289 @@
 c
 c.......................................................................
-c  include des dimensions locales
-c 
-#include "dimensions.h"
-#include "dimphys.h"
-!#include "dimradmars.h"
-c.......................................................................
 c  declaration des arguments 
 c
@@ -305 +297 @@
 c 
       INTEGER iv,i
-      REAL as(NDLON,4*nlayermx),ds(NDLON,4*nlayermx)
-     &    ,x(NDLON,4*nlayermx)
+      REAL as(NDLON,4*nflev),ds(NDLON,4*nflev)
+     &    ,x(NDLON,4*nflev)
 c.......................................................................
 c