Changeset 2787 for LMDZ5/branches/testing/libf/phylmd/dyn1d/mod_1D_cases_read2.F90

Timestamp:

Jan 30, 2017, 5:54:45 PM (7 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2727:2785 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/dyn1d/mod_1D_cases_read2.F90 (modified) (11 diffs)

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

@@ -178 +178 @@
 
         print*,'Allocations OK'
-        call read_cas(nid,nlev_cas,nt_cas                                       &
+        call read_cas2(nid,nlev_cas,nt_cas                                       &
      &     ,z_cas,plev_cas,t_cas,q_cas,rh_cas,th_cas,rv_cas,u_cas,v_cas         &
      &     ,ug_cas,vg_cas,vitw_cas,du_cas,hu_cas,vu_cas,dv_cas,hv_cas,vv_cas    &
@@ -241 +241 @@
         allocate(z_cas(nlev_cas,nt_cas),zh_cas(nlev_cas+1))
         allocate(ap_cas(nlev_cas+1),bp_cas(nt_cas+1))
-        allocate(t_cas(nlev_cas,nt_cas),q_cas(nlev_cas,nt_cas),qv_cas(nlev_cas,nt_cas),ql_cas(nlev_cas,nt_cas),qi_cas(nlev_cas,nt_cas),rh_cas(nlev_cas,nt_cas))
+        allocate(t_cas(nlev_cas,nt_cas),q_cas(nlev_cas,nt_cas),qv_cas(nlev_cas,nt_cas),ql_cas(nlev_cas,nt_cas), &
+             qi_cas(nlev_cas,nt_cas),rh_cas(nlev_cas,nt_cas))
         allocate(th_cas(nlev_cas,nt_cas),thl_cas(nlev_cas,nt_cas),thv_cas(nlev_cas,nt_cas),rv_cas(nlev_cas,nt_cas))
         allocate(u_cas(nlev_cas,nt_cas),v_cas(nlev_cas,nt_cas),vitw_cas(nlev_cas,nt_cas),omega_cas(nlev_cas,nt_cas))
@@ -382 +383 @@
 END MODULE mod_1D_cases_read2
 !=====================================================================
-      subroutine read_cas(nid,nlevel,ntime                          &
+      subroutine read_cas2(nid,nlevel,ntime                          &
      &     ,zz,pp,temp,qv,rh,theta,rv,u,v,ug,vg,w,                   &
      &     du,hu,vu,dv,hv,vv,dt,dtrad,ht,vt,dq,hq,vq,                     &
@@ -423 +424 @@
 
        do i=1,nbvar3d
-         print *,'Dans read_cas, on va lire ',nid,i,name_var(i)
+         print *,'Dans read_cas2, on va lire ',nid,i,name_var(i)
        enddo
        do i=1,nbvar3d
@@ -433 +434 @@
        enddo
        do i=1,nbvar3d
-         print *,'Dans read_cas, on va lire ',var3didin(i),name_var(i)
+         print *,'Dans read_cas2, on va lire ',var3didin(i),name_var(i)
          if(i.LE.35) then
 #ifdef NC_DOUBLE
@@ -440 +441 @@
          ierr = NF_GET_VAR_REAL(nid,var3didin(i),resul)
 #endif
-         print *,'Dans read_cas, on a lu ',ierr,var3didin(i),name_var(i)
+         print *,'Dans read_cas2, on a lu ',ierr,var3didin(i),name_var(i)
          if(ierr/=NF_NOERR) then
             print *,'Pb a la lecture de cas.nc: ',name_var(i)
@@ -451 +452 @@
          ierr = NF_GET_VAR_REAL(nid,var3didin(i),resul1)
 #endif
-         print *,'Dans read_cas, on a lu ',ierr,var3didin(i),name_var(i)
+         print *,'Dans read_cas2, on a lu ',ierr,var3didin(i),name_var(i)
          if(ierr/=NF_NOERR) then
             print *,'Pb a la lecture de cas.nc: ',name_var(i)
@@ -501 +502 @@
 
          return 
-         end subroutine read_cas
+         end subroutine read_cas2
 !======================================================================
       subroutine read2_cas(nid,nlevel,ntime,                                       &
@@ -545 +546 @@
       data name_var/'coor_par_a','coor_par_b','height_h','pressure_h',&
      &'w','omega','ug','vg','uadv','uadvh','uadvv','vadv','vadvh','vadvv','tadv','tadvh','tadvv',&
-     &'qadv','qadvh','qadvv','thadv','thadvh','thadvv','thladvh','radv','radvh','radvv','radcool','q1','q2','ustress','vstress','rh',&
+     &'qadv','qadvh','qadvv','thadv','thadvh','thadvv','thladvh','radv','radvh','radvv','radcool','q1','q2','ustress','vstress', &
+     'rh',&
      &'height_f','pressure_f','temp','theta','thv','thl','qv','ql','qi','rv','u','v',&
      &'sfc_sens_flx','sfc_lat_flx','ts','ps','ustar','tke',&
@@ -686 +688 @@
          end subroutine read2_cas
 !======================================================================
-        SUBROUTINE interp_case_time(day,day1,annee_ref                &
+        SUBROUTINE interp_case_time2(day,day1,annee_ref                &
 !    &         ,year_cas,day_cas,nt_cas,pdt_forc,nlev_cas      &
      &         ,nt_cas,nlev_cas                                       &
@@ -887 +889 @@
 
         return
-        END SUBROUTINE interp_case_time
+        END SUBROUTINE interp_case_time2
 
 !**********************************************************************************************