Changeset 2598 for LMDZ5/trunk/libf/dyn3d

Timestamp:

Jul 22, 2016, 11:28:39 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Cleanup in the dynamics: turn serre.h into module serre_mod.F90
EM

Location:

LMDZ5/trunk/libf/dyn3d

Files:

• addfi.F (modified) (1 diff)
• conf_gcm.F90 (modified) (3 diffs)
• dynetat0.f90 (modified) (2 diffs)
• dynredem.F90 (modified) (2 diffs)
• gcm.F90 (modified) (1 diff)
• guide_mod.F90 (modified) (4 diffs)
• integrd.F (modified) (1 diff)
• leapfrog.F (modified) (1 diff)

LMDZ5/trunk/libf/dyn3d/addfi.F

@@ -49 +49 @@
       include "paramet.h"
       include "comgeom.h"
-      include "serre.h"
 c
 c    Arguments :

LMDZ5/trunk/libf/dyn3d/conf_gcm.F90

@@ -16 +16 @@
                           iflag_top_bound, mode_top_bound, tau_top_bound, &
                           ngroup
+  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
+                       alphax,alphay,taux,tauy
 
   IMPLICIT NONE
@@ -35 +37 @@
   include "paramet.h"
   include "logic.h"
-  include "serre.h"
   include "comdissnew.h"
   include "temps.h"
@@ -43 +44 @@
   !   ------
 
-  CHARACTER ch1*72,ch2*72,ch3*72,ch4*12
   REAL clonn,clatt,grossismxx,grossismyy
   REAL dzoomxx,dzoomyy, tauxx,tauyy
   LOGICAL  fxyhypbb, ysinuss
-  INTEGER i
 
   !  -------------------------------------------------------------------

LMDZ5/trunk/libf/dyn3d/dynetat0.f90

@@ -12 +12 @@
   USE assert_eq_m, ONLY: assert_eq
   USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, omeg, rad
+  USE serre_mod, ONLY: clon, clat, grossismx, grossismy
   IMPLICIT NONE
   include "dimensions.h"
@@ -20 +21 @@
   include "ener.h"
   include "description.h"
-  include "serre.h"
   include "logic.h"
   include "iniprint.h"

LMDZ5/trunk/libf/dyn3d/dynredem.F90

@@ -12 +12 @@
   USE dynredem_mod, ONLY: cre_var, put_var1, put_var2, err, modname, fil
   USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
+  USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
+                        taux,tauy
   IMPLICIT NONE
   include "dimensions.h"
@@ -21 +23 @@
   include "logic.h"
   include "description.h"
-  include "serre.h"
   include "iniprint.h"
 !===============================================================================

LMDZ5/trunk/libf/dyn3d/gcm.F90

@@ -75 +75 @@
   include "ener.h"
   include "description.h"
-  include "serre.h"
-  !include "com_io_dyn.h"
   include "iniprint.h"
   include "tracstoke.h"

LMDZ5/trunk/libf/dyn3d/guide_mod.F90

@@ -63 +63 @@
   SUBROUTINE guide_init
 
-    USE control_mod
+    USE control_mod, ONLY: day_step
+    USE serre_mod, ONLY: grossismx
 
     IMPLICIT NONE
@@ -70 +71 @@
     INCLUDE "paramet.h"
     INCLUDE "netcdf.inc"
-
-    ! For grossismx:
-    include "serre.h"
 
     INTEGER                :: error,ncidpl,rid,rcod
@@ -857 +855 @@
 
     use comconst_mod, only: pi
+    use serre_mod, only: clon, clat, grossismx, grossismy
     
     implicit none
@@ -863 +862 @@
     include "paramet.h"
     include "comgeom2.h"
-    include "serre.h"
 
 ! input arguments :

LMDZ5/trunk/libf/dyn3d/integrd.F

@@ -34 +34 @@
       include "logic.h"
       include "temps.h"
-      include "serre.h"
       include "iniprint.h"
 

LMDZ5/trunk/libf/dyn3d/leapfrog.F

@@ -64 +64 @@
       include "ener.h"
       include "description.h"
-      include "serre.h"
       include "iniprint.h"
       include "academic.h"