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

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phydev/physiq.F90 (modified) (4 diffs)

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

@@ -19 +19 @@
       USE mod_phys_lmdz_para, only : jj_nb
       USE phys_state_var_mod, only : phys_state_var_init
+
+#ifdef CPP_XIOS
+      USE wxios
+#endif
 
       IMPLICIT none
@@ -101 +105 @@
   dtime=pdtphys
   call histbeg_phy("histins.nc",itau0,zjulian,dtime,nhori,nid_hist)
+
+
+
 !$OMP MASTER
+
+
+
   ! define vertical coordinate
   call histvert(nid_hist,"presnivs","Vertical levels","Pa",klev, &
@@ -120 +130 @@
   ! end definition sequence
   call histend(nid_hist)
+
+!XIOS
+#ifdef CPP_XIOS
+    ! Déclaration de l'axe vertical du fichier:    
+    !CALL wxios_add_vaxis("presnivs", "histins", klev, presnivs)
+
+    !Déclaration du pas de temps:
+    !CALL wxios_set_timestep(dtime)
+
+    !Finalisation du contexte:
+    !CALL wxios_closedef()
+#endif
 !$OMP END MASTER
 endif ! of if (debut)
@@ -154 +176 @@
 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))
+!$OMP END MASTER
+#endif
+
 ! if lastcall, then it is time to write "restartphy.nc" file
 if (lafin) then