Changeset 1047 for trunk/LMDZ.MARS/libf/phymars/dustdevil.F

Timestamp:

Sep 23, 2013, 9:56:47 AM (11 years ago)

Author:

emillour

Message:

Mars GCM:

• IMPORTANT CHANGE: Removed all reference/use of ngridmx (dimphys.h) in routines (necessary prerequisite to using parallel dynamics); in most cases this just means adding 'ngrid' as routine argument, and making local saved variables allocatable (and allocated at first call). In the process, had to convert many *.h files to equivalent modules: yomaer.h => yomaer_h.F90 , surfdat.h => surfdat_h.F90 , comsaison.h => comsaison_h.F90 , yomlw.h => yomlw_h.F90 , comdiurn.h => comdiurn_h.F90 , dimradmars.h => dimradmars_mod.F90 , comgeomfi.h => comgeomfi_h.F90, comsoil.h => comsoil_h.F90 , slope.h => slope_mod.F90
• Also updated EOF routines, everything is now in eofdump_mod.F90
• Removed unused routine lectfux.F (in dyn3d)

EM

File:

• trunk/LMDZ.MARS/libf/phymars/dustdevil.F (modified) (8 diffs)

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

@@ -3 +3 @@
 
       use tracer_mod, only: alpha_devil
+      use surfdat_h, only: z0_default
       IMPLICIT NONE
 
@@ -28 +29 @@
 c   -------------
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"      
 c#include "comconst.h"        ! TEMPORAIRE AVEC ANLDEVIL !!!!
-#include "surfdat.h"
-#include "comgeomfi.h"
+!#include "surfdat.h"
+!#include "comgeomfi.h"
 !#include "tracer.h"
 c   arguments:
@@ -62 +63 @@
 
 
-      REAL devila(ngridmx)
-      integer ltop(ngridmx)
+      REAL devila(ngrid)
+      integer ltop(ngrid)
       real b,rho,Fs,wind
 
@@ -77 +78 @@
 
 c   TEMPORAIRE AVEC ANLDEVIL : *************
-c        real b_diag(ngridmx)
-c       real localtime(ngridmx)
+c        real b_diag(ngrid)
+c       real localtime(ngrid)
 c       common/temporaire/localtime
-c      real ztop(ngridmx),magwind(ngridmx),t1(ngridmx)
+c      real ztop(ngrid),magwind(ngrid),t1(ngrid)
 c      real rcp ,cpp
 c      rcp = kappa
@@ -95 +96 @@
         write(*,*) 'In dustdevil :'
         write(*,*) '    q2top= ',q2top,'     seuil= ', seuil 
-c       un petit test de coherence:
-         IF(ngrid.NE.ngridmx) THEN
-            PRINT*,'STOP dans coefdifv'
-            PRINT*,'probleme de dimensions :'
-            PRINT*,'ngrid  =',ngrid
-            PRINT*,'ngridmx  =',ngridmx
-            STOP
-         ENDIF
 
 c A rough estimation of the horizontal drag coefficient Cd
@@ -218 +211 @@
 c     TEMPORAIRE AVEC ANLDEVIL:
 c     IF (ngrid.gt.1) THEN
-c      do ig=2,ngridmx-1
+c      do ig=2,ngrid-1
 c       write(77,88) lati(ig)*180./pi,localtime(ig),
 c    &        -12.*log(pplev(ig,ltop(ig))/pplev(ig,1)),
@@ -226 +219 @@
 c88    format (f7.3,1x,f7.3,1x,f6.3,1x,f6.4,1x,f7.4,1x,
 c    &        f7.3,1x,f7.3,1x,f9.3)
-c      do ig=1,ngridmx
+c      do ig=1,ngrid
 c       ztop(ig) = -12.*log(pplev(ig,ltop(ig))/pplev(ig,1))
 c       magwind(ig) = sqrt(pu(ig,1)**2+pv(ig,1)**2)
@@ -232 +225 @@
 c      end do
 
-c       call WRITEDIAGFI(ngridmx,'dqs_dev','dqs devil',
+c       call WRITEDIAGFI(ngrid,'dqs_dev','dqs devil',
 c    &               'kg.m-2.s-1',2,pdqs_dev)
-c       call WRITEDIAGFI(ngridmx,'wind','wind',
+c       call WRITEDIAGFI(ngrid,'wind','wind',
 c    &               'm.s-1',2,magwind)
-c       call WRITEDIAGFI(ngridmx,'ztop','top pbl',
+c       call WRITEDIAGFI(ngrid,'ztop','top pbl',
 c    &               'km',2,ztop)
-c       call WRITEDIAGFI(ngridmx,'tsurf','tsurf',
+c       call WRITEDIAGFI(ngrid,'tsurf','tsurf',
 c    &               'K',2,ptsurf)
-c       call WRITEDIAGFI(ngridmx,'T1','T(1)',
+c       call WRITEDIAGFI(ngrid,'T1','T(1)',
 c    &               'K',2,t1)
-c       call WRITEDIAGFI(ngridmx,'b','b',
+c       call WRITEDIAGFI(ngrid,'b','b',
 c    &               ' ',2,b_diag)
 c     END If