Changeset 1713

Timestamp:

Jan 18, 2013, 4:02:08 PM (12 years ago)

Author:

Laurent Fairhead

Message:

Corrections pour faire tourner les cas twpice et arm_cu

---

Some corrections for the twpice and arm_cu cases

File:

• LMDZ5/trunk/libf/phy1d/lmdz1d.F (modified) (7 diffs)

LMDZ5/trunk/libf/phy1d/lmdz1d.F

@@ -362 +362 @@
       call infotrac_init 
 
-      allocate(q(llm,nqtot)) 
+      allocate(q(llm,nqtot)) ; q(:,:)=0.
       allocate(dq(llm,nqtot)) 
       allocate(dq_dyn(llm,nqtot)) 
@@ -674 +674 @@
 
 !---------------------------------------------------------------------
+! Listing output for debug prt_level>=1
+!---------------------------------------------------------------------
+       if (prt_level>=1) then
+         print *,' avant physiq : -------- day time ',day,time
+         write(*,*) 'firstcall,lastcall,phis',
+     :               firstcall,lastcall,phis
+         write(*,'(a10,2a4,4a13)') 'BEFOR1 IT=','it','l',
+     :        'presniv','plev','play','phi'
+         write(*,'(a10,2i4,4f13.2)') ('BEFOR1 IT= ',it,l,
+     :         presnivs(l),plev(l),play(l),phi(l),l=1,llm)
+         write(*,'(a11,2a4,a11,6a8)') 'BEFOR2','it','l',
+     :         'presniv','u','v','temp','q1','q2','omega2'
+         write(*,'(a11,2i4,f11.2,5f8.2,e10.2)') ('BEFOR2 IT= ',it,l,
+     :   presnivs(l),u(l),v(l),temp(l),q(l,1),q(l,2),omega2(l),l=1,llm)
+       endif
+
+!---------------------------------------------------------------------
 !   Call physiq :
 !---------------------------------------------------------------------
-
-       if (prt_level.ge.1) then
-         print *,' avant physiq : -------- day time ',day,time
-         print *,' temp ',temp
-         print *,' u ',u
-         print *,' q ',q
-         print *,' omega2 ',omega2
-       endif
-!       call writefield_phy('u', u,llm)
 
         call physiq(ngrid,llm,
@@ -693 +701 @@
      :              du_phys,dv_phys,dt_phys,dq,dpsrf,
      :              dudyn,PVteta)
-!       call writefield_phy('u', u,llm)
-
         firstcall=.false.
-        if (prt_level.ge.1) then
-          print*,'APRES PHYS'
-          print *,' temp ',temp
-          print *,' q ',q
-          print *,' dq ',dq
-          print*,'dq_dyn',dq_dyn
-          print *,' dt_phys ',dt_phys
-          print *,' dpsrf ',dpsrf
-          print *,' dudyn ',dudyn
-          print *,' PVteta',PVteta
+
+!---------------------------------------------------------------------
+! Listing output for debug prt_level>=1
+!---------------------------------------------------------------------
+        if (prt_level>=1) then
+          write(*,'(a11,2a4,4a13)') 'AFTER1 IT=','it','l',
+     :        'presniv','plev','play','phi'
+          write(*,'(a11,2i4,4f13.2)') ('AFTER1 it= ',it,l,
+     :    presnivs(l),plev(l),play(l),phi(l),l=1,llm)
+          write(*,'(a11,2a4,a11,6a8)') 'AFTER2','it','l',
+     :         'presniv','u','v','temp','q1','q2','omega2'
+          write(*,'(a11,2i4,f11.2,5f8.2,e10.2)') ('AFTER2 it= ',it,l,
+     :    presnivs(l),u(l),v(l),temp(l),q(l,1),q(l,2),omega2(l),l=1,llm)
+          write(*,'(a11,2a4,a11,5a8)') 'AFTER3','it','l',
+     :         'presniv','du_phys','dv_phys','dt_phys','dq1','dq2'
+           write(*,'(a11,2i4,f11.2,5f8.2)') ('AFTER3 it= ',it,l,
+     :      presnivs(l),86400*du_phys(l),86400*dv_phys(l),
+     :       86400*dt_phys(l),86400*dq(l,1),dq(l,2),l=1,llm)
+          write(*,*) 'dpsrf',dpsrf
         endif
 !---------------------------------------------------------------------
@@ -711 +726 @@
 !---------------------------------------------------------------------
 
-      fcoriolis=2.*sin(rpi*xlat/180.)*romega
-
+       fcoriolis=2.*sin(rpi*xlat/180.)*romega
        if (forcing_radconv) then
          fcoriolis=0.0
@@ -721 +735 @@
 
        if (forcing_toga .or. forcing_GCSSold .or. forcing_twpice) then
-         fcoriolis=0.0
+         fcoriolis=0.0 ; ug=0. ; vg=0.
        endif
          if(forcing_rico) then
@@ -727 +741 @@
         endif
 
-      print*, 'fcoriolis ', fcoriolis, rlat(1)
+      print*, 'fcoriolis ', fcoriolis, xlat
 
         du_age(1:mxcalc)=
@@ -733 +747 @@
        dv_age(1:mxcalc)=
      : -fcoriolis*(u(1:mxcalc)-ug(1:mxcalc))
-!         call  writefield_phy('dv_age' ,dv_age,llm)
-!         call  writefield_phy('du_age' ,du_age,llm)
-!         call  writefield_phy('du_phys' ,du_phys,llm)
-!         call  writefield_phy('u_tend' ,u,llm)
-!         call  writefield_phy('u_g' ,ug,llm)
+
         u(1:mxcalc)=u(1:mxcalc) + timestep*(
      :              du_phys(1:mxcalc)