Changeset 2435 for LMDZ5/branches/testing/libf/phylmd/dyn1d

Timestamp:

Jan 28, 2016, 5:02:13 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2396:2434 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/dyn1d/iniphysiq_mod.F90 (modified) (1 diff)
• libf/phylmd/dyn1d/lmdz1d.F90 (modified) (7 diffs)
• libf/phylmd/dyn1d/mod_interface_dyn_phys.F90 (modified) (1 diff)

LMDZ5/branches/testing/libf/phylmd/dyn1d/iniphysiq_mod.F90

@@ -1 @@
-link ../../dynlonlat_phylonlat/phylmd/iniphysiq_mod.F90
+link ../../dynphy_lonlat/phylmd/iniphysiq_mod.F90

LMDZ5/branches/testing/libf/phylmd/dyn1d/lmdz1d.F90

@@ -15 +15 @@
        falb_dir, falb_dif, &
        ftsol, pbl_tke, pctsrf, radsol, rain_fall, snow_fall, ratqs, &
-       rlat, rlon, rnebcon, rugoro, sig1, w01, solaire_etat0, sollw, sollwdown, &
+       rnebcon, rugoro, sig1, w01, solaire_etat0, sollw, sollwdown, &
        solsw, t_ancien, q_ancien, u_ancien, v_ancien, wake_cstar, wake_deltaq, &
        wake_deltat, wake_delta_pbl_TKE, delta_tsurf, wake_fip, wake_pe, &
@@ -36 +36 @@
    USE iniphysiq_mod, ONLY: iniphysiq
    USE mod_const_mpi, ONLY: comm_lmdz
+   USE physiq_mod, ONLY: physiq
 
       implicit none
@@ -219 +220 @@
       logical :: firstcall=.true.
       logical :: lastcall=.false.
-      real :: phis    = 0.0
-      real :: dpsrf 
+      real :: phis(1)    = 0.0
+      real :: dpsrf(1)
 
 !---------------------------------------------------------------------
@@ -242 +243 @@
       integer :: k,l,i,it=1,mxcalc
       integer jcode
-      integer jjmp1
-      parameter (jjmp1=jjm+1-1/jjm)
-      REAL dudyn(iim+1,jjmp1,llm)
       INTEGER read_climoz 
 !Al1
@@ -559 +557 @@
       qsol = qsolinp
       qsurf = fq_sat(tsurf,psurf/100.)
-      rlat=xlat
-      rlon=xlon
       day1= day_ini
       time=daytime-day
@@ -655 +651 @@
       zcvfi=airefi
 !
-      rlat_rad(1)=rlat(1)*rpi/180.
-      rlon_rad(1)=rlon(1)*rpi/180.
+      rlat_rad(1)=xlat*rpi/180.
+      rlon_rad(1)=xlon*rpi/180.
 
      ! Ehouarn: iniphysiq requires arrays related to (3D) dynamics grid,
@@ -938 +934 @@
 
        call physiq(ngrid,llm, &
-            firstcall,lastcall, day,time,timestep, &
+            firstcall,lastcall,timestep, &
             plev,play,phi,phis,presnivs, &
             u,v, rot, temp,q,omega2, &
-            du_phys,dv_phys,dt_phys,dq,dpsrf, &
-            dudyn)
+            du_phys,dv_phys,dt_phys,dq,dpsrf)
         firstcall=.false.
 

LMDZ5/branches/testing/libf/phylmd/dyn1d/mod_interface_dyn_phys.F90

@@ -1 @@
-link ../../dynlonlat_phylonlat/mod_interface_dyn_phys.F90
+link ../../dynphy_lonlat/mod_interface_dyn_phys.F90