Changeset 1517

Timestamp:

Mar 23, 2016, 11:58:39 AM (9 years ago)

Author:

slebonnois

Message:

SL: bugs en 1D pour Venus et Titan

Location:

trunk

Files:

• LMDZ.TITAN/libf/phytitan/comcstfi.h (modified) (1 diff)
• LMDZ.TITAN/libf/phytitan/dyn1d/rcm1d.F (modified) (5 diffs)
• LMDZ.TITAN/libf/phytitan/iniinterp_horiz.F (added)
• LMDZ.TITAN/libf/phytitan/interp_horiz.F (added)
• LMDZ.VENUS/libf/phyvenus/comcstfi.h (modified) (1 diff)
• LMDZ.VENUS/libf/phyvenus/dyn1d/comgeom.h (deleted)
• LMDZ.VENUS/libf/phyvenus/dyn1d/comgeom2.h (deleted)
• LMDZ.VENUS/libf/phyvenus/dyn1d/mod_interface_dyn_phys.F90 (deleted)
• LMDZ.VENUS/libf/phyvenus/dyn1d/rcm1d.F (modified) (7 diffs)
• LMDZ.VENUS/libf/phyvenus/iniinterp_horiz.F (added)
• LMDZ.VENUS/libf/phyvenus/interp_horiz.F (added)

trunk/LMDZ.TITAN/libf/phytitan/comcstfi.h

@@ -2 +2 @@
 c INCLUDE comcstfi.h
 
-      COMMON/comcstfi/
-     * pi,rad,g,r,cpp,rcp,dtphys,daysec,mugaz,omeg
+      COMMON/comcstfi/rad,g,r,rcp,dtphys,daysec,mugaz,omeg
 
-      REAL pi,rad,g,r,cpp,rcp,dtphys,daysec,mugaz,omeg
+      REAL rad,g,r,rcp,dtphys,daysec,mugaz,omeg
 
 c-----------------------------------------------------------------------

trunk/LMDZ.TITAN/libf/phytitan/dyn1d/rcm1d.F

@@ -5 +5 @@
       use comgeomphy
       USE phys_state_var_mod
+      USE comconst_mod, ONLY: cpp,t0_venus,nu_venus
       use cpdet_mod, only: ini_cpdet
       use moyzon_mod, only: plevmoy
@@ -76 +77 @@
       character*2 str2
 
-c normalement dans dyn3d/comconst_mod.F90
-      COMMON/cpdetvenus/cppdyn,nu_venus,t0_venus
-      REAL cppdyn,nu_venus,t0_venus
+      real pi
 
 c=======================================================================
@@ -103 +102 @@
       mugaz=28.                  ! Masse molaire de l'atm (g.mol-1) 
       cpp=1.039e3
-      cppdyn=cpp
       r= 8.314511E+0 *1000.E+0/mugaz
       rcp= r/cpp
@@ -193 +191 @@
 
       CALL init_phys_lmdz(iim,jjm,llm,1,(/1/))
-      call initcomgeomphy
+      CALL iniphysiq(1,1,llm,daysec,day0,dtphys,
+     .            lati,long,area,cufi,cvfi,rad,g,r,cpp,1)
+
       call ini_cpdet
 
@@ -205 +205 @@
 c   par la pression de surface --->
       phisfi(1)=0.E+0
-
-      CALL iniphysiq(1,1,llm,daysec,day0,dtphys,
-     .            lati,long,area,cufi,cvfi,rad,g,r,cpp,1)
 
 c   Initialisation pour prendre en compte les vents en 1-D

trunk/LMDZ.VENUS/libf/phyvenus/comcstfi.h

@@ -2 +2 @@
 ! INCLUDE comcstfi.h
 
-      COMMON/comcstfi/rad,g,r,cpp,rcp,dtphys,daysec,mugaz,omeg
+      COMMON/comcstfi/rad,g,r,rcp,dtphys,daysec,mugaz,omeg
 
-      REAL rad,g,r,cpp,rcp,dtphys,daysec,mugaz,omeg
+      REAL rad,g,r,rcp,dtphys,daysec,mugaz,omeg
 
 !-----------------------------------------------------------------------

trunk/LMDZ.VENUS/libf/phyvenus/dyn1d/rcm1d.F

@@ -6 +6 @@
       USE phys_state_var_mod
       use chemparam_mod
+      USE comconst_mod, ONLY: cpp,t0_venus,nu_venus
       use cpdet_mod, only: ini_cpdet
       use moyzon_mod, only: tmoy
@@ -11 +12 @@
      .                       aps,bps,scaleheight,pseudoalt,
      .                       disvert_type,pressure_exner
+      use conc, only: rho
 
       IMPLICIT NONE
@@ -78 +80 @@
       character*2 str2
 
-c normalement dans dyn3d/comconst_mod.F90
-      COMMON/cpdetvenus/cppdyn,nu_venus,t0_venus
-      REAL cppdyn,nu_venus,t0_venus
       real pi
 
@@ -110 +109 @@
       cpp=1.0e3
 !     cpp=9.0e2      ! version constante
-      cppdyn=cpp
       r= 8.314511E+0 *1000.E+0/mugaz
       rcp= r/cpp
@@ -201 +199 @@
 
       CALL init_phys_lmdz(iim,jjm,llm,1,(/1/))
-      call initcomgeomphy
+      CALL iniphysiq(1,1,llm,daysec,day0,dtphys,
+     .            lati,long,area,cufi,cvfi,rad,g,r,cpp,1)
+
       call ini_cpdet
 
@@ -213 +213 @@
 c   par la pression de surface --->
       phisfi(1)=0.E+0
-
-      CALL iniphysiq(1,1,llm,daysec,day0,dtphys,
-     .            lati,long,area,cufi,cvfi,rad,g,r,cpp,1)
 
 c   Initialisation pour prendre en compte les vents en 1-D
@@ -399 +396 @@
      s     du,dv,dtemp,dq,dpsurf)
 
-c     print*,"DT APRES PHYSIQ=",day,time
+c     calcul de rho
+       rho = 0.
+c     print*,rho
+
+
+c     print*,"DT APRES PHYSIQ=",day,time,dtime
 c     print*,dtemp
 c     print*,temp