Changeset 2347 for LMDZ5/trunk/libf/phylmd/dyn1d

Timestamp:

Aug 24, 2015, 9:26:48 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Make iniphysiq a module.
Fix call to iniphysiq in lmdz1d (missing arguments and arrays of wrong sizes).
EM

Location:

LMDZ5/trunk/libf/phylmd/dyn1d

Files:

• 1DUTILS.h (modified) (1 diff)
• iniphysiq.F90 (deleted)
• iniphysiq_mod.F90 (added)
• lmdz1d.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/dyn1d/1DUTILS.h

@@ -1 +1 @@
 #include "conf_gcm.F90"
-#include "q_sat.F"
 
 !

LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90

@@ -23 +23 @@
       USE mod_1D_amma_read
       USE print_control_mod, ONLY: prt_level
+      USE iniphysiq_mod, ONLY: iniphysiq
 
       implicit none
@@ -619 +620 @@
       zcvfi=airefi
 !
-      rlat_rad(:)=rlat(:)*rpi/180.
-      rlon_rad(:)=rlon(:)*rpi/180.
-
-      call iniphysiq(iim,jjm,llm,rday,day_ini,timestep,                        &
-     &     rlat_rad,rlon_rad,airefi,zcufi,zcvfi,ra,rg,rd,rcpd,(/1/))
+      rlat_rad(1)=rlat(1)*rpi/180.
+      rlon_rad(1)=rlon(1)*rpi/180.
+
+     ! Ehouarn: iniphysiq requires arrays related to (3D) dynamics grid,
+     ! e.g. for cell boundaries, which are meaningless in 1D; so pad these 
+     ! with '0.' when necessary
+      call iniphysiq(iim,jjm,llm,rday,day_ini,timestep,  &
+           (/rlat_rad(1),0./),(/0./), &
+           (/0.,0./),(/rlon_rad(1),0./),  &
+           (/ (/airefi,0./),(/0.,0./) /), &
+           (/zcufi,0.,0.,0./), &
+           (/zcvfi,0./), &
+           ra,rg,rd,rcpd,1)
       print*,'apres iniphysiq'