Changeset 2641 for LMDZ5/branches/testing/libf/phylmd/dyn1d/lmdz1d.F90

Timestamp:

Sep 29, 2016, 11:26:46 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2593:2640 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/dyn1d/lmdz1d.F90 (modified) (14 diffs)

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

@@ -16 +16 @@
        ftsol, pbl_tke, pctsrf, radsol, rain_fall, snow_fall, ratqs, &
        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, &
-       wake_s, zgam, &
-       zmax0, zmea, zpic, zsig, &
+       solsw, t_ancien, q_ancien, u_ancien, v_ancien, wake_cstar, &
+       wake_delta_pbl_TKE, delta_tsurf, wake_fip, wake_pe, &
+       wake_deltaq, wake_deltat, wake_s, wake_dens, &
+       zgam, zmax0, zmea, zpic, zsig, &
        zstd, zthe, zval, ale_bl, ale_bl_trig, alp_bl
-   use dimphy
-   use surface_data, only : type_ocean,ok_veget
-   use pbl_surface_mod, only : ftsoil, pbl_surface_init,                     &
-     &                            pbl_surface_final
-      use fonte_neige_mod, only : fonte_neige_init, fonte_neige_final 
-
-   use infotrac ! new
-   use control_mod
+   USE dimphy
+   USE surface_data, only : type_ocean,ok_veget
+   USE pbl_surface_mod, only : ftsoil, pbl_surface_init, &
+                                 pbl_surface_final
+   USE fonte_neige_mod, only : fonte_neige_init, fonte_neige_final 
+
+   USE infotrac ! new
+   USE control_mod
    USE indice_sol_mod
    USE phyaqua_mod
@@ -37 +37 @@
    USE mod_const_mpi, ONLY: comm_lmdz
    USE physiq_mod, ONLY: physiq
+   USE comvert_mod, ONLY: presnivs, ap, bp, dpres,nivsig, nivsigs, pa, &
+                          preff
+   USE temps_mod, ONLY: annee_ref, calend, day_end, day_ini, day_ref, &
+                        itau_dyn, itau_phy, start_time
 
       implicit none
 #include "dimensions.h"
 #include "YOMCST.h"
-#include "temps.h"
 !!#include "control.h"
 #include "clesphys.h"
@@ -47 +50 @@
 !#include "indicesol.h"
 
-#include "comvert.h"
 #include "compar1d.h"
 #include "flux_arp.h"
@@ -246 +248 @@
       integer jcode
       INTEGER read_climoz 
+!
+      integer :: it_end ! iteration number of the last call
 !Al1
       integer ecrit_slab_oc !1=ecrit,-1=lit,0=no file
       data ecrit_slab_oc/-1/
+!
+!     if flag_inhib_forcing = 0, tendencies of forcing are added
+!                           <> 0, tendencies of forcing are not added
+      INTEGER :: flag_inhib_forcing = 0
 
 !=====================================================================
@@ -745 +753 @@
         pbl_tke(:,2,:)=1.e-2
         PRINT *, ' pbl_tke dans lmdz1d '
-       DO nsrf = 1,4
-         PRINT *,'pbl_tke(1,:,',nsrf,') ',pbl_tke(1,:,nsrf)
-       ENDDO
+        if (prt_level .ge. 5) then 
+         DO nsrf = 1,4
+           PRINT *,'pbl_tke(1,:,',nsrf,') ',pbl_tke(1,:,nsrf)
+         ENDDO
+        end if
 
 !>jyg
@@ -777 +787 @@
         wake_pe = 0.
         wake_s = 0.
+        wake_dens = 0.
         ale_bl = 0.
         ale_bl_trig = 0.
@@ -800 +811 @@
 ! t_ancien,q_ancien,,frugs(:,is_oce),clwcon(:,1),rnebcon(:,1),ratqs(:,1)
 ! run_off_lic_0,pbl_tke(:,1:klev,nsrf), zmax0,f0,sig1,w01
-! wake_deltat,wake_deltaq,wake_s,wake_cstar,wake_fip,wake_delta_pbl_tke(:,1:klev,nsrf)
+! wake_deltat,wake_deltaq,wake_s,wake_dens,wake_cstar,
+! wake_fip,wake_delta_pbl_tke(:,1:klev,nsrf)
 !
 ! NB2: The content of the startphy.nc file depends on some flags defined in
@@ -898 +910 @@
 !=====================================================================
            
-      do while(it.le.nint(fnday*day_step))
+      it_end = nint(fnday*day_step)
+!test JLD     it_end = 10
+      do while(it.le.it_end)
 
        if (prt_level.ge.1) then
          print*,'XXXXXXXXXXXXXXXXXXX ITAP,day,time=',                       &
-     &             it,day,time,nint(fnday*day_step),day_step
+     &             it,day,time,it_end,day_step
          print*,'PAS DE TEMPS ',timestep
        endif
 !Al1 demande de restartphy.nc
-       if (it.eq.nint(fnday*day_step)) lastcall=.True.
+       if (it.eq.it_end) lastcall=.True.
 
 !---------------------------------------------------------------------
@@ -936 +950 @@
          write(*,*) 'firstcall,lastcall,phis',                               &
      &               firstcall,lastcall,phis
+       end if
+       if (prt_level>=5) then
          write(*,'(a10,2a4,4a13)') 'BEFOR1 IT=','it','l',                   &
      &        'presniv','plev','play','phi'
@@ -950 +966 @@
 !---------------------------------------------------------------------
        call physiq(ngrid,llm, &
-                    firstcall,lastcall,timestep, &
-                    plev,play,phi,phis,presnivs, &
-                    u,v, rot, temp,q,omega2, &
-                    du_phys,dv_phys,dt_phys,dq,dpsrf)
-                firstcall=.false.
-
-!---------------------------------------------------------------------
-! Listing output for debug prt_level>=1
-!---------------------------------------------------------------------
-        if (prt_level>=1) then
+                    firstcall,lastcall,timestep, &
+                    plev,play,phi,phis,presnivs, &
+                    u,v, rot, temp,q,omega2, &
+                    du_phys,dv_phys,dt_phys,dq,dpsrf)
+                firstcall=.false.
+
+!---------------------------------------------------------------------
+! Listing output for debug
+!---------------------------------------------------------------------
+        if (prt_level>=5) then
           write(*,'(a11,2a4,4a13)') 'AFTER1 IT=','it','l',                  &
      &        'presniv','plev','play','phi'
@@ -996 +1012 @@
         endif
 
-      IF (prt_level >= 1) print*, 'fcoriolis, xlat,mxcalc ', &
+      IF (prt_level >= 5) print*, 'fcoriolis, xlat,mxcalc ', &
                                    fcoriolis, xlat,mxcalc
 
@@ -1046 +1062 @@
 !! Increment state variables
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    IF (flag_inhib_forcing == 0) then ! if tendency of forcings should be added
+
 ! pour les cas sandu et astex, on reclacule u,v,q,temp et teta dans 1D_nudge_sandu_astex.h
 ! au dessus de 700hpa, on relaxe vers les profils initiaux
@@ -1064 +1082 @@
      &               +d_q_nudge(1:mxcalc,:) )
 
-        if (prt_level.ge.1) then
+        if (prt_level.ge.3) then
           print *,                                                          &
      &    'physiq-> temp(1),dt_phys(1),d_th_adv(1),dt_cooling(1) ',         &
@@ -1111 +1129 @@
 !cc        q(1:mxcalc,2)=tmpvar(1:mxcalc)
 
+   END IF ! end if tendency of tendency should be added
+
 !---------------------------------------------------------------------
 !   Air temperature :