Changeset 1443 for trunk/LMDZ.COMMON

Timestamp:

Jun 5, 2015, 3:05:35 PM (9 years ago)

Author:

emillour

Message:

Titan and Venus GCMs:
Follow-up to the changes in dynamics/physics interface: ener.h, logic.h, serre.h and temps.h are now modules.
EM

Location:

trunk/LMDZ.COMMON/libf

Files:

• dyn3d/logic.h (deleted)
• dyn3d/temps.h (deleted)
• dyn3d_common/ener.h (deleted)
• dyn3d_common/fxhyp_m.F90 (modified) (1 diff)
• dyn3d_common/fyhyp_m.F90 (modified) (1 diff)
• dyn3d_common/invert_zoom_x_m.F90 (modified) (1 diff)
• dyn3d_common/principal_cshift_m.F90 (modified) (1 diff)
• dyn3d_common/serre.h (deleted)
• dyn3dpar/logic.h (deleted)
• dyn3dpar/temps.h (deleted)
• dynlonlat_phylonlat/phytitan/ini_archive.F (modified) (1 diff)
• dynlonlat_phylonlat/phytitan/newstart.F (modified) (2 diffs)
• dynlonlat_phylonlat/phytitan/readstart.F (modified) (2 diffs)
• dynlonlat_phylonlat/phytitan/start2archive.F (modified) (2 diffs)
• dynlonlat_phylonlat/phytitan/write_archive.F (modified) (1 diff)
• dynlonlat_phylonlat/phytitan/writerestart.F (modified) (1 diff)
• dynlonlat_phylonlat/phyvenus/ini_archive.F (modified) (1 diff)
• dynlonlat_phylonlat/phyvenus/newstart.F (modified) (2 diffs)
• dynlonlat_phylonlat/phyvenus/readstart.F (modified) (2 diffs)
• dynlonlat_phylonlat/phyvenus/start2archive.F (modified) (2 diffs)
• dynlonlat_phylonlat/phyvenus/write_archive.F (modified) (1 diff)
• dynlonlat_phylonlat/phyvenus/writerestart.F (modified) (1 diff)

trunk/LMDZ.COMMON/libf/dyn3d_common/fxhyp_m.F90

@@ -22 +22 @@
     use nrtype, only: pi, pi_d, twopi, twopi_d, k8
     use principal_cshift_m, only: principal_cshift
+    use serre_mod, only: clon,grossismx,dzoomx,taux
 
     include "dimensions.h"
     ! for iim
-
-    include "serre.h"
-    ! for clon, grossismx, dzoomx, taux
 
     REAL, intent(out):: xprimm025(:), rlonv(:), xprimv(:) ! (iim + 1)

trunk/LMDZ.COMMON/libf/dyn3d_common/fyhyp_m.F90

@@ -18 +18 @@
     use coefpoly_m, only: coefpoly
     use nrtype, only: k8
+    use serre_mod, only: clat, dzoomy, grossismy, tauy
 
     include "dimensions.h"
     ! for jjm
-
-    include "serre.h"
-    ! for clat, grossismy, dzoomy, tauy
 
     REAL, intent(out):: rlatu(jjm + 1), yyprimu(jjm + 1)

trunk/LMDZ.COMMON/libf/dyn3d_common/invert_zoom_x_m.F90

@@ -11 +11 @@
     use coefpoly_m, only: coefpoly
     use nrtype, only: pi, pi_d, twopi_d, k8
+    use serre_mod, only: clon
 
     include "dimensions.h"
     ! for iim
-
-    include "serre.h"
-    ! for clon
 
     REAL(K8), intent(in):: Xf(0:), xtild(0:), Xprimt(0:) ! (0:2 * nmax)

trunk/LMDZ.COMMON/libf/dyn3d_common/principal_cshift_m.F90

@@ -12 +12 @@
 
     use nrtype, only: twopi
+    use serre_mod, only: clon
 
     include "dimensions.h"
     ! for iim
-
-    include "serre.h"
-    ! for clon
 
     integer, intent(in):: is2

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/ini_archive.F

@@ -37 +37 @@
 #include "paramet.h"
 #include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
 #include "description.h"
-#include "serre.h"
 #include "netcdf.inc"
 

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/newstart.F

@@ -28 +28 @@
      .                       aps,bps,scaleheight,pseudoalt,
      .                       disvert_type,pressure_exner
-
+      USE serre_mod, ONLY: clon,clat,grossismx,grossismy,
+     &                     dzoomx,dzoomy,taux,tauy
+      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
+      USE logic_mod, ONLY: iflag_trac,fxyhypb,ysinus
+      USE temps_mod, ONLY: day_ref,annee_ref
       implicit none
 
@@ -35 +39 @@
 #include "comdissnew.h"
 #include "comgeom2.h"
-#include "logic.h"
-#include "temps.h"
-#include "ener.h"
 #include "description.h"
-#include "serre.h"
 #include "dimsoil.h"
 #include "netcdf.inc"

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/readstart.F

@@ -10 +10 @@
      .                       aps,bps,scaleheight,pseudoalt,
      .                       disvert_type,pressure_exner
-      
+      USE serre_mod, ONLY: clon,clat,grossismx,grossismy
+      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
+      USE temps_mod, ONLY: day_ref,annee_ref,day_ini,itau_dyn,
+     &                     start_time
+      USE logic_mod, ONLY: fxyhypb,ysinus,iflag_trac
       IMPLICIT NONE
 
@@ -30 +34 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "temps.h"
 #include "comgeom.h"
-#include "ener.h"
 #include "description.h"
-#include "serre.h"
-#include "logic.h"
 #include "netcdf.inc"
 

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/start2archive.F

@@ -25 +25 @@
      .                       aps,bps,scaleheight,pseudoalt,
      .                       disvert_type,pressure_exner
+      USE logic_mod, ONLY: iflag_trac
 
       implicit none
@@ -32 +33 @@
 #include "comdissnew.h"
 #include "comgeom.h"
-#include "logic.h"
-#include "temps.h"
-#include "ener.h"
 #include "description.h"
 #include "dimsoil.h"

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/write_archive.F

@@ -43 +43 @@
 #include "comgeom.h"
 #include "description.h"
-#include "temps.h"
 #include "netcdf.inc"
 

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phytitan/writerestart.F

@@ -19 +19 @@
 #include "paramet.h"
 #include "comgeom.h"
-#include "ener.h"
-#include "logic.h"
 #include "netcdf.inc"
 #include "description.h"
-#include "serre.h"
 
 c   Arguments:

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/ini_archive.F

@@ -37 +37 @@
 #include "paramet.h"
 #include "comgeom.h"
-#include "temps.h"
-#include "ener.h"
-#include "logic.h"
 #include "description.h"
-#include "serre.h"
 #include "netcdf.inc"
 

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/newstart.F

@@ -28 +28 @@
      .                       aps,bps,scaleheight,pseudoalt,
      .                       disvert_type,pressure_exner
-
+      USE serre_mod, ONLY: clon,clat,grossismx,grossismy,
+     &                     dzoomx,dzoomy,taux,tauy
+      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
+      USE logic_mod, ONLY: iflag_trac,fxyhypb,ysinus
+      USE temps_mod, ONLY: day_ref,annee_ref
       implicit none
 
@@ -35 +39 @@
 #include "comdissnew.h"
 #include "comgeom2.h"
-#include "logic.h"
-#include "temps.h"
-#include "ener.h"
 #include "description.h"
-#include "serre.h"
 #include "dimsoil.h"
 #include "netcdf.inc"

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/readstart.F

@@ -10 +10 @@
      .                       aps,bps,scaleheight,pseudoalt,
      .                       disvert_type,pressure_exner
-      
+      USE serre_mod, ONLY: clon,clat,grossismx,grossismy
+      USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
+      USE temps_mod, ONLY: day_ref,annee_ref,day_ini,itau_dyn,
+     &                     start_time
+      USE logic_mod, ONLY: fxyhypb,ysinus,iflag_trac
       IMPLICIT NONE
 
@@ -30 +34 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "temps.h"
 #include "comgeom.h"
-#include "ener.h"
 #include "description.h"
-#include "serre.h"
-#include "logic.h"
 #include "netcdf.inc"
 

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/start2archive.F

@@ -25 +25 @@
      .                       aps,bps,scaleheight,pseudoalt,
      .                       disvert_type,pressure_exner
+      USE logic_mod, ONLY: iflag_trac
 
       implicit none
@@ -32 +33 @@
 #include "comdissnew.h"
 #include "comgeom.h"
-#include "logic.h"
-#include "temps.h"
-#include "ener.h"
 #include "description.h"
 #include "dimsoil.h"

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/write_archive.F

@@ -43 +43 @@
 #include "comgeom.h"
 #include "description.h"
-#include "temps.h"
 #include "netcdf.inc"
 

trunk/LMDZ.COMMON/libf/dynlonlat_phylonlat/phyvenus/writerestart.F

@@ -19 +19 @@
 #include "paramet.h"
 #include "comgeom.h"
-#include "ener.h"
-#include "logic.h"
 #include "netcdf.inc"
 #include "description.h"
-#include "serre.h"
 
 c   Arguments: