Changeset 2002 for LMDZ5/trunk/libf/phydev

Timestamp:

Apr 4, 2014, 2:39:54 PM (11 years ago)

Author:

Ehouarn Millour

Message:

Further cleanup concerning XIOS (mainly about axes being defined as axes and not as groups of axes).
EM

Location:

LMDZ5/trunk/libf/phydev

Files:

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

LMDZ5/trunk/libf/phydev/iophy.F90

@@ -340 +340 @@
   USE mod_phys_lmdz_para, only: gather_omp, grid1Dto2D_mpi, &
                                 jj_nb, klon_mpi
-  USE wxios, only: wxios_write_2D
+  USE xios, only: xios_send_field
 
 
@@ -361 +361 @@
     CALL grid1Dto2D_mpi(buffer_omp,Field2d)
     
-    CALL wxios_write_2D(field_name, Field2d)
+    CALL xios_send_field(field_name, Field2d)
 !$OMP END MASTER   
 
@@ -376 +376 @@
   USE mod_phys_lmdz_para, only: gather_omp, grid1Dto2D_mpi, &
                                 jj_nb, klon_mpi
-  USE wxios, only: wxios_write_3D
+  USE xios, only: xios_send_field
 
 
@@ -401 +401 @@
     CALL grid1Dto2D_mpi(buffer_omp,field3d)
 
-    CALL wxios_write_3D(field_name, Field3d(:,:,1:klev))
+    CALL xios_send_field(field_name, Field3d(:,:,1:nlev))
 !$OMP END MASTER   
 

LMDZ5/trunk/libf/phydev/physiq.F90

@@ -21 +21 @@
 
 #ifdef CPP_XIOS
+      USE xios, ONLY: xios_update_calendar
       USE wxios, only: wxios_add_vaxis, wxios_set_timestep, wxios_closedef, &
-                       wxios_update_calendar, histwrite_phy
+                       histwrite_phy
 #endif
 
@@ -137 +138 @@
 #ifdef CPP_XIOS
 !XIOS
-    ! Déclaration de l'axe vertical du fichier:    
-    CALL wxios_add_vaxis("presnivs", "histins", klev, presnivs)
-
-    !Déclaration du pas de temps:
+    ! Declare available vertical axes to be used in output files:    
+    !CALL wxios_add_vaxis("presnivs", "dummy-not-used", klev, presnivs)
+    CALL wxios_add_vaxis("presnivs", klev, presnivs)
+
+    ! Declare time step length (in s):
     CALL wxios_set_timestep(dtime)
 
-    !Finalisation du contexte:
+    !Finalize the context:
     CALL wxios_closedef()
 #endif
@@ -187 +189 @@
 !$OMP MASTER
     !Increment XIOS time
-    CALL wxios_update_calendar(itau)
+    CALL xios_update_calendar(itau)
 !$OMP END MASTER
 !$OMP BARRIER
 
-    !Send fields to XIOS:
+    !Send fields to XIOS: (NB these fields must also be defined as
+    ! <field id="..." /> in iodef.xml to be correctly used
     CALL histwrite_phy("temperature",t)
+    CALL histwrite_phy("temp_newton",temp_newton)
     CALL histwrite_phy("u",u)
     CALL histwrite_phy("v",v)