Changeset 3592 for LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_cases_read_std.F90

Timestamp:

Oct 27, 2019, 5:48:03 PM (5 years ago)

Author:

fhourdin

Message:

Plein de petites corrections pour le format commun.
Semble fonctionner correctement pour ARMCU/REF et RICO/REF

File:

• LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_cases_read_std.F90 (modified) (10 diffs)

LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_cases_read_std.F90

@@ -221 +221 @@
 
         print*,'Allocations OK'
-        call read_SCM (nid,nlev_cas,nt_cas,                                                                     &
+        CALL read_SCM (nid,nlev_cas,nt_cas,                                                                     &
      &     ap_cas,bp_cas,z_cas,plev_cas,zh_cas,plevh_cas,t_cas,th_cas,thv_cas,thl_cas,qv_cas,                    &
      &     ql_cas,qi_cas,rh_cas,rv_cas,u_cas,v_cas,vitw_cas,omega_cas,ug_cas,vg_cas,du_cas,hu_cas,vu_cas,        &
@@ -228 +228 @@
      &     uw_cas,vw_cas,q1_cas,q2_cas,orog_cas,albedo_cas,emiss_cas,t_skin_cas,q_skin_cas,mom_rough,heat_rough, &
      &     o3_cas,rugos_cas,clay_cas,sand_cas)
-        print*,'Read2 cas OK'
+        print*,'read_SCM cas OK'
         do ii=1,nlev_cas
-        print*,'apres read2_cas, plev_cas=',ii,plev_cas(ii,1)
+        print*,'apres read2_SCM, plev_cas=',ii,plev_cas(ii,1)
+        !print*,'apres read_SCM, plev_cas=',ii,omega_cas(ii,nt_cas/2+1)
         enddo
 
@@ -302 +303 @@
 
 !=====================================================================
-      subroutine read_cas2(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,                     &
@@ -421 +422 @@
 
          return 
-         end subroutine read_cas2
+         END SUBROUTINE read_cas2
 !======================================================================
-      subroutine read2_cas(nid,nlevel,ntime,                                       &
+      SUBROUTINE read2_cas(nid,nlevel,ntime,                                       &
      &     ap,bp,zz,pp,zzh,pph,temp,theta,thv,thl,qv,ql,qi,rh,rv,u,v,vitw,omega,ug,vg,&
      &     du,hu,vu,dv,hv,vv,dt,ht,vt,dq,hq,vq,                                    &
@@ -604 +605 @@
 !-----------------------------------------------------------------------
 
+        print*,'omega STD ', omega
+        stop
          return 
-         end subroutine read2_cas
+         END SUBROUTINE read2_cas
 
 !======================================================================
-      subroutine read_SCM(nid,nlevel,ntime,                                       &
+      SUBROUTINE read_SCM(nid,nlevel,ntime,                                       &
      &     ap,bp,zz,pp,zzh,pph,temp,theta,thv,thl,qv,ql,qi,rh,rv,u,v,vitw,omega,ug,vg,&
      &     du,hu,vu,dv,hv,vv,dt,ht,vt,dq,hq,vq,                                    &
@@ -665 +668 @@
 !-----------------------------------------------------------------------
 
-     print*,'ON EST LA'
        do i=1,nbvar3d
          ierr=NF_INQ_VARID(nid,name_var(i),var3didin(i)) 
@@ -837 +839 @@
 
          return 
-         end subroutine read_SCM
+         END SUBROUTINE read_SCM
 !======================================================================
 
@@ -854 +856 @@
      &         ,uw_cas,vw_cas,q1_cas,q2_cas,tke_cas                               &
 !
-     &         ,ts_prof_cas,plev_prof_cas,t_prof_cas,theta_prof_cas               &
+     &         ,ts_prof_cas,ps_prof_cas,plev_prof_cas,t_prof_cas,theta_prof_cas               &
      &         ,thv_prof_cas,thl_prof_cas,qv_prof_cas,ql_prof_cas,qi_prof_cas     &
      &         ,u_prof_cas,v_prof_cas,ug_prof_cas,vg_prof_cas                     &
@@ -913 +915 @@
         real dtrad_prof_cas(nlev_cas)
         real dq_prof_cas(nlev_cas),hq_prof_cas(nlev_cas),vq_prof_cas(nlev_cas)
-        real lat_prof_cas,sens_prof_cas,tke_prof_cas,ts_prof_cas,ustar_prof_cas
+        real lat_prof_cas,sens_prof_cas,tke_prof_cas,ts_prof_cas,ps_prof_cas,ustar_prof_cas
         real uw_prof_cas(nlev_cas),vw_prof_cas(nlev_cas),q1_prof_cas(nlev_cas),q2_prof_cas(nlev_cas)
 ! local:
@@ -1001 +1003 @@
        ts_prof_cas = ts_cas(it_cas2)                                     &
      &          -frac*(ts_cas(it_cas2)-ts_cas(it_cas1))
+       ps_prof_cas = ps_cas(it_cas2)                                     &
+     &          -frac*(ps_cas(it_cas2)-ps_cas(it_cas1))
        ustar_prof_cas = ustar_cas(it_cas2)                               &
      &          -frac*(ustar_cas(it_cas2)-ustar_cas(it_cas1))