Changeset 1910 for LMDZ5/branches/testing/libf/phydev

Timestamp:

Nov 29, 2013, 9:40:25 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1860:1909 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (2 props)
• libf (modified) (1 prop)
• libf/phydev (modified) (1 prop)
• libf/phydev/comcstphy.F90 (modified) (1 prop)
• libf/phydev/comgeomphy.F90 (modified) (1 prop)
• libf/phydev/dimphy.F90 (modified) (1 prop)
• libf/phydev/gr_fi_ecrit.F (modified) (1 prop)
• libf/phydev/iniphysiq.F (modified) (1 prop)
• libf/phydev/init_phys_lmdz.F90 (modified) (1 prop)
• libf/phydev/iophy.F90 (copied) (copied from LMDZ5/trunk/libf/phydev/iophy.F90)
• libf/phydev/iostart.F90 (modified) (1 prop)
• libf/phydev/mod_grid_phy_lmdz.F90 (modified) (1 prop)
• libf/phydev/mod_phys_lmdz_mpi_data.F90 (modified) (1 prop)
• libf/phydev/mod_phys_lmdz_mpi_transfert.F90 (modified) (1 prop)
• libf/phydev/mod_phys_lmdz_omp_data.F90 (modified) (1 prop)
• libf/phydev/mod_phys_lmdz_omp_transfert.F90 (modified) (1 prop)
• libf/phydev/mod_phys_lmdz_para.F90 (modified) (1 prop)
• libf/phydev/mod_phys_lmdz_transfert_para.F90 (modified) (1 prop)
• libf/phydev/phyaqua.F (modified) (1 prop)
• libf/phydev/phyetat0.F90 (modified) (1 prop)
• libf/phydev/phyredem.F (modified) (1 prop)
• libf/phydev/phys_state_var_mod.F90 (modified) (1 prop)
• libf/phydev/physiq.F90 (modified) (7 diffs, 1 prop)
• libf/phydev/tetalevel.F (modified) (1 prop)

LMDZ5/branches/testing/libf/phydev/physiq.F90

@@ -21 +21 @@
 
 #ifdef CPP_XIOS
-      USE wxios
+      USE wxios, only: wxios_add_vaxis, wxios_set_timestep, wxios_closedef, &
+                       wxios_update_calendar, histwrite_phy
 #endif
 
@@ -79 +80 @@
 integer,save :: iwrite_phys ! output every iwrite_phys physics step
 !$OMP THREADPRIVATE(iwrite_phys)
-integer :: iwrite_phys_omp ! intermediate variable to read iwrite_phys
+integer,save :: iwrite_phys_omp ! intermediate variable to read iwrite_phys
+                                ! (must be shared by all threads)
 real :: t_ops ! frequency of the IOIPSL operations (eg average over...)
 real :: t_wrt ! frequency of the IOIPSL outputs
@@ -104 +106 @@
   call ymds2ju(1979, 1, 1, 0.0, zjulian)
   dtime=pdtphys
+#ifndef CPP_NO_IOIPSL
+  ! Initialize IOIPSL output file
   call histbeg_phy("histins.nc",itau0,zjulian,dtime,nhori,nid_hist)
-
-
+#endif
 
 !$OMP MASTER
 
-
-
+#ifndef CPP_NO_IOIPSL 
+! IOIPSL
   ! define vertical coordinate
   call histvert(nid_hist,"presnivs","Vertical levels","Pa",klev, &
@@ -130 +133 @@
   ! end definition sequence
   call histend(nid_hist)
-
+#endif
+
+#ifdef CPP_XIOS
 !XIOS
-#ifdef CPP_XIOS
     ! Déclaration de l'axe vertical du fichier:    
-    !CALL wxios_add_vaxis("presnivs", "histins", klev, presnivs)
+    CALL wxios_add_vaxis("presnivs", "histins", klev, presnivs)
 
     !Déclaration du pas de temps:
-    !CALL wxios_set_timestep(dtime)
+    CALL wxios_set_timestep(dtime)
 
     !Finalisation du contexte:
-    !CALL wxios_closedef()
+    CALL wxios_closedef()
 #endif
 !$OMP END MASTER
 endif ! of if (debut)
 
-! increment counter itau
+! increment local time counter itau
 itau=itau+1
 
@@ -166 +170 @@
 
 
-!print*,'PHYDEV: itau=',itau
+print*,'PHYDEV: itau=',itau
 
 ! write some outputs:
+! IOIPSL
+#ifndef CPP_NO_IOIPSL 
 if (modulo(itau,iwrite_phys)==0) then
   call histwrite_phy(nid_hist,.false.,"temperature",itau,t)
@@ -175 +181 @@
   call histwrite_phy(nid_hist,.false.,"ps",itau,paprs(:,1))
 endif
+#endif
 
 !XIOS
 #ifdef CPP_XIOS
 !$OMP MASTER
-    !On incrémente le pas de temps XIOS
-    !CALL wxios_update_calendar(itau)
-
-    !Et on écrit, avec la routine histwrite dédiée:
-    !CALL histwrite_phy("temperature",t)
-    !CALL histwrite_phy("u",u)
-    !CALL histwrite_phy("v",v)
-    !CALL histwrite_phy("ps",paprs(:,1))
+    !Increment XIOS time
+    CALL wxios_update_calendar(itau)
 !$OMP END MASTER
+!$OMP BARRIER
+
+    !Send fields to XIOS:
+    CALL histwrite_phy("temperature",t)
+    CALL histwrite_phy("u",u)
+    CALL histwrite_phy("v",v)
+    CALL histwrite_phy("ps",paprs(:,1))
 #endif
 
@@ -195 +203 @@
 endif
 
-end
+end subroutine physiq