Index: LMDZ5/trunk/libf/dyn3d_common/adaptdt.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/adaptdt.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/adaptdt.F	(revision 2603)
@@ -12,5 +12,4 @@
       include "comdissip.h"
       include "comgeom2.h"
-      include "logic.h"
       include "ener.h"
       include "description.h"
Index: LMDZ5/trunk/libf/dyn3d_common/advn.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/advn.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/advn.F	(revision 2603)
@@ -19,5 +19,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
       include "comgeom.h"
       include "iniprint.h"
@@ -484,5 +483,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
       include "iniprint.h"
 c
Index: LMDZ5/trunk/libf/dyn3d_common/bernoui.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/bernoui.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/bernoui.F	(revision 2603)
@@ -25,7 +25,6 @@
 c   -------------
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
+      include "dimensions.h"
+      include "paramet.h"
 c
 c   Arguments:
Index: LMDZ5/trunk/libf/dyn3d_common/convmas.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/convmas.F90	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/convmas.F90	(revision 2603)
@@ -9,5 +9,4 @@
   include "paramet.h"
   include "comgeom.h"
-  include "logic.h"
 !===============================================================================
 ! Arguments:
Index: LMDZ5/trunk/libf/dyn3d_common/disvert.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/disvert.F90	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/disvert.F90	(revision 2603)
@@ -12,4 +12,5 @@
   USE comvert_mod, ONLY: ap, bp, nivsigs, nivsig, dpres, presnivs, &
                          pa, preff, scaleheight
+  USE logic_mod, ONLY: ok_strato
 
   IMPLICIT NONE
@@ -18,5 +19,4 @@
   include "paramet.h"
   include "iniprint.h"
-  include "logic.h"
 
 !-------------------------------------------------------------------------------
Index: LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F	(revision 2603)
@@ -15,4 +15,5 @@
      &                       nivsig,nivsigs,pa,preff,scaleheight
       USE comconst_mod, ONLY: kappa
+      USE logic_mod, ONLY: hybrid
 
       IMPLICIT NONE
@@ -20,5 +21,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
       include "iniprint.h"
 c
Index: LMDZ5/trunk/libf/dyn3d_common/divgrad.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/divgrad.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/divgrad.F	(revision 2603)
@@ -20,9 +20,8 @@
 c   -------------
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comgeom.h"
-#include "comdissipn.h"
-#include "logic.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
+      include "comdissipn.h"
 c
       INTEGER klevel
Index: LMDZ5/trunk/libf/dyn3d_common/gradiv.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/gradiv.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/gradiv.F	(revision 2603)
@@ -19,8 +19,7 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comdissipn.h"
-#include "logic.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comdissipn.h"
 
       INTEGER klevel
Index: LMDZ5/trunk/libf/dyn3d_common/inidissip.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/inidissip.F90	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/inidissip.F90	(revision 2603)
@@ -20,5 +20,4 @@
   include "paramet.h"
   include "comdissipn.h"
-  include "logic.h"
   include "iniprint.h"
 
Index: LMDZ5/trunk/libf/dyn3d_common/inigeom.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/inigeom.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/inigeom.F	(revision 2603)
@@ -19,4 +19,5 @@
       use fyhyp_m, only: fyhyp
       USE comconst_mod, ONLY: pi, g, omeg, rad
+      USE logic_mod, ONLY: fxyhypb, ysinus
       USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy,
      &		alphax,alphay,taux,tauy,transx,transy,pxo,pyo
@@ -26,5 +27,4 @@
       include "paramet.h"
       include "comgeom2.h"
-      include "logic.h"
       include "comdissnew.h"
 
Index: LMDZ5/trunk/libf/dyn3d_common/initdynav.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/initdynav.F90	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/initdynav.F90	(revision 2603)
@@ -40,5 +40,4 @@
   include "comgeom.h"
   include "ener.h"
-  include "logic.h"
   include "description.h"
   include "iniprint.h"
Index: LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F	(revision 2603)
@@ -46,5 +46,4 @@
       include "comgeom.h"
       include "ener.h"
-      include "logic.h"
       include "description.h"
       include "iniprint.h"
Index: LMDZ5/trunk/libf/dyn3d_common/inithist.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/inithist.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/inithist.F	(revision 2603)
@@ -45,5 +45,4 @@
       include "comgeom.h"
       include "ener.h"
-      include "logic.h"
       include "description.h"
       include "iniprint.h"
Index: LMDZ5/trunk/libf/dyn3d_common/interpre.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/interpre.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/interpre.F	(revision 2603)
@@ -15,5 +15,4 @@
       include "comdissip.h"
       include "comgeom2.h"
-      include "logic.h"
       include "ener.h"
       include "description.h"
Index: LMDZ5/trunk/libf/dyn3d_common/limx.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/limx.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/limx.F	(revision 2603)
@@ -17,5 +17,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
       include "comgeom.h"
 c
Index: LMDZ5/trunk/libf/dyn3d_common/limy.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/limy.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/limy.F	(revision 2603)
@@ -19,5 +19,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
       include "comgeom.h"
 c
Index: LMDZ5/trunk/libf/dyn3d_common/limz.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/limz.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/limz.F	(revision 2603)
@@ -17,5 +17,4 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
       include "comgeom.h"
 c
Index: LMDZ5/trunk/libf/dyn3d_common/nxgrarot.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/nxgrarot.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/nxgrarot.F	(revision 2603)
@@ -19,8 +19,7 @@
 c
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comdissipn.h"
-#include "logic.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comdissipn.h"
 c
       INTEGER klevel
Index: LMDZ5/trunk/libf/dyn3d_common/sortvarc.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/sortvarc.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/sortvarc.F	(revision 2603)
@@ -8,4 +8,6 @@
       USE control_mod, ONLY: resetvarc 
       USE comconst_mod, ONLY: dtvr, daysec, g, rad, omeg
+      USE logic_mod, ONLY: read_start
+      
       IMPLICIT NONE
 
@@ -30,5 +32,4 @@
       INCLUDE "comgeom.h"
       INCLUDE "ener.h"
-      INCLUDE "logic.h"
       INCLUDE "iniprint.h"
 
Index: LMDZ5/trunk/libf/dyn3d_common/tourpot.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/tourpot.F90	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/tourpot.F90	(revision 2603)
@@ -9,5 +9,4 @@
   include "paramet.h"
   include "comgeom.h"
-  include "logic.h"
 !===============================================================================
 ! Arguments:
Index: LMDZ5/trunk/libf/dyn3d_common/traceurpole.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/traceurpole.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/traceurpole.F	(revision 2603)
@@ -10,5 +10,4 @@
       include "comdissip.h"
       include "comgeom2.h"
-      include "logic.h"
       include "ener.h"
       include "description.h"
Index: LMDZ5/trunk/libf/dyn3d_common/writedynav.F90
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/writedynav.F90	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/writedynav.F90	(revision 2603)
@@ -35,5 +35,4 @@
   include "comgeom.h"
   include "ener.h"
-  include "logic.h"
   include "description.h"
   include "iniprint.h"
Index: LMDZ5/trunk/libf/dyn3d_common/writehist.F
===================================================================
--- LMDZ5/trunk/libf/dyn3d_common/writehist.F	(revision 2602)
+++ LMDZ5/trunk/libf/dyn3d_common/writehist.F	(revision 2603)
@@ -39,5 +39,4 @@
       include "comgeom.h"
       include "ener.h"
-      include "logic.h"
       include "description.h"
       include "iniprint.h"
