Changeset 1523 for trunk/LMDZ.TITAN/libf

Timestamp:

Mar 28, 2016, 5:27:51 PM (9 years ago)

Author:

emillour

Message:

All models: More updates to make planetary codes (+Earth) setups converge.

• in dyn3d_common:
• convmas.F => convmas.F90
• enercin.F => enercin.F90
• flumass.F => flumass.F90
• massbar.F => massbar.F90
• tourpot.F => tourpot.F90
• vitvert.F => vitvert.F90

• in misc:
• move "q_sat" from "dyn3d_common" to "misc" (in Earth model, it is also called by the physics)
• move "write_field" from "dyn3d_common" to "misc"(may be called from physics or dynamics and depends on neither).

• in phy_common:
• move "write_field_phy" here since it may be called from any physics package)
• add module "regular_lonlat_mod" to store global information on lon-lat grid

• in dynlonlat_phylonlat/phy*:
• turn "iniphysiq.F90" into module "iniphysiq_mod.F90" (and of course adapt gcm.F[90] and 1D models accordingly)

EM

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• dyn1d/iniphysiq.F90 (deleted)
• dyn1d/iniphysiq_mod.F90 (added)
• dyn1d/rcm1d.F (modified) (3 diffs)
• dyn1d/write_field.F90 (deleted)
• write_field_phy.F90 (deleted)

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

@@ -11 +11 @@
      .                       aps,bps,scaleheight,pseudoalt,
      .                       disvert_type,pressure_exner
+      USE iniphysiq_mod, ONLY: iniphysiq
       IMPLICIT NONE
 
@@ -191 +192 @@
 
       CALL init_phys_lmdz(iim,jjm,llm,1,(/1/))
-      CALL iniphysiq(1,1,llm,daysec,day0,dtphys,
-     .            lati,long,area,cufi,cvfi,rad,g,r,cpp,1)
-
-      call ini_cpdet
 
 c   la surface de chaque maille est inutile en 1D --->
@@ -201 +198 @@
       cufi(1)=1.E+0
       cvfi(1)=1.E+0
+
+c Ehouarn: iniphysiq requires arrays related to (3D) dynamics grid,
+c e.g. for cell boundaries, which are meaningless in 1D; so pad these 
+c with '0.' when necessary
+      CALL iniphysiq(1,1,llm,daysec,day0,dtphys,
+     &            (/lati(1),0./),(/0./),
+     &            (/0.,0./),(/long(1),0./),
+     &            (/ (/area,0./),(/0.,0./) /),
+     &            (/cufi,0.,0.,0./),
+     &            (/cvfi,0./),
+     &            rad,g,r,cpp,1)
+
+      call ini_cpdet
 
 c   le geopotentiel au sol est inutile en 1D car tout est controle