Changeset 1422 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Apr 30, 2015, 12:33:45 PM (10 years ago)

Author:

milmd

Message:

In GENERIC, MARS and COMMON models replace some include files by modules (usefull for decoupling physics with dynamics).

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• dyn1d/comconst.h (deleted)
• dyn1d/comconst_mod.F90 (added)
• dyn1d/comvert.h (deleted)
• dyn1d/comvert_mod.F90 (added)
• dyn1d/description.h (deleted)
• dyn1d/ener.h (deleted)
• dyn1d/ener_mod.F90 (added)
• dyn1d/logic.h (deleted)
• dyn1d/logic_mod.F90 (added)
• dyn1d/serre.h (deleted)
• dyn1d/serre_mod.F90 (added)
• dyn1d/temps.h (deleted)
• dyn1d/temps_mod.F90 (added)
• dyn1d/testphys1d.F (modified) (2 diffs)
• eofdump_mod.F90 (modified) (2 diffs)
• inistats.F (modified) (2 diffs)
• iniwrite.F (modified) (2 diffs)
• newcondens.F (modified) (2 diffs)
• physiq.F (modified) (2 diffs)
• writediagfi.F (modified) (2 diffs)
• wstats.F90 (modified) (1 diff)

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F ¶

@@ -19 +19 @@
      &                      cpp, dtphys
       use dimradmars_mod, only: tauscaling,tauvis
+      USE comvert_mod, ONLY: ap,bp,aps,bps,pa,preff,sig
       IMPLICIT NONE
 
@@ -52 +53 @@
 !#include "comsaison.h"
 !#include "control.h"
-#include "comvert.h"
 #include "netcdf.inc"
 #include "comg1d.h"
-#include "logic.h"
 !#include "advtrac.h"
 

trunk/LMDZ.MARS/libf/phymars/eofdump_mod.F90 ¶

@@ -80 +80 @@
       use comgeomfi_h, only: long, lati
       use comcstfi_h
+      USE comvert_mod, ONLY: aps,bps
       implicit none
 !
@@ -85 +86 @@
 !
 #include "dimensions.h"
-#include "comvert.h"
 
       integer,intent(in) :: ngrid ! total number of physics grid points

trunk/LMDZ.MARS/libf/phymars/inistats.F ¶

@@ -2 +2 @@
 
       use mod_phys_lmdz_para, only : is_master
+      USE comvert_mod, ONLY: ap,bp,aps,bps,preff,pseudoalt,presnivs
+      USE comconst_mod, ONLY: daysec,dtphys,pi
       implicit none
 
@@ -7 +9 @@
 #include "paramet.h"
 #include "comgeom.h"
-#include "comvert.h"
-#include "comconst.h"
 #include "statto.h"
 #include "netcdf.inc"

trunk/LMDZ.MARS/libf/phymars/iniwrite.F ¶

@@ -3 +3 @@
       use comsoil_h, only: mlayer, nsoilmx
       USE comcstfi_h
+      USE comvert_mod, ONLY: ap,bp,aps,bps,pseudoalt
+      USE logic_mod, ONLY: fxyhypb,ysinus
+      USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy
+      USE temps_mod, ONLY: hour_ini
+      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
       IMPLICIT NONE
 
@@ -23 +28 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
 #include "netcdf.inc"
-#include "description.h"
-#include "serre.h"
 
 c   Arguments:

trunk/LMDZ.MARS/libf/phymars/newcondens.F ¶

@@ -11 +11 @@
        use planete_h
        USE comcstfi_h
+       USE comvert_mod, ONLY: bp
        IMPLICIT NONE
 c=======================================================================
@@ -59 +60 @@
 c
 #include "dimensions.h"
-#include "comvert.h"
 #include "callkeys.h"
 

trunk/LMDZ.MARS/libf/phymars/physiq.F ¶

@@ -45 +45 @@
       use eofdump_mod, only: eofdump
 #endif
+      USE comvert_mod, ONLY: ap,bp,aps,bps
 
       IMPLICIT NONE
@@ -150 +151 @@
 #include "comg1d.h"
 #include "nlteparams.h"
-#include "comvert.h"
 #include "chimiedata.h"
 #include "netcdf.inc"

trunk/LMDZ.MARS/libf/phymars/writediagfi.F ¶

@@ -44 +44 @@
      &                               is_master, gather
       USE mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo
+      USE temps_mod, ONLY: day_ini
       implicit none
 
@@ -49 +50 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "comvert.h"
 #include "comgeom.h"
-#include "description.h"
 #include "netcdf.inc"
-#include "temps.h"
 
 ! Arguments on input:

trunk/LMDZ.MARS/libf/phymars/wstats.F90 ¶

@@ -7 +7 @@
 
 #include "dimensions.h"
-#include "comconst.h"
 #include "statto.h"
 #include "netcdf.inc"