Changeset 1882

Timestamp:

Oct 3, 2013, 11:58:39 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Updating/adapting iophy in phydev (part 1).
EM

Location:

LMDZ5/trunk/libf/phydev

Files:

• iophy.F90 (deleted)
• physiq.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phydev/physiq.F90

@@ -104 +104 @@
   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 +131 @@
   ! 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
 
@@ -169 +171 @@
 
 ! 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 +179 @@
   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)
+
+    !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))
 !$OMP END MASTER
 #endif