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

Timestamp:

Jun 11, 2014, 3:46:46 PM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1997:2055 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phydev/iophy.F90 (modified) (4 diffs)
• libf/phydev/physiq.F90 (modified) (5 diffs)
• libf/phydev/tetalevel.F90 (deleted)

LMDZ5/branches/testing/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/branches/testing/libf/phydev/physiq.F90

@@ -8 +8 @@
      &            flxmass_w, &
      &            d_u, d_v, d_t, d_qx, d_ps &
-     &            , dudyn &
-     &            , PVteta)
+     &            , dudyn)
 
       USE dimphy, only : klon,klev
@@ -21 +20 @@
 
 #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
 
@@ -58 +58 @@
       real,intent(out) :: d_ps(klon) ! physics tendency on surface pressure
       real,intent(in) :: dudyn(iim+1,jjmp1,klev) ! Not used
-!FH! REAL PVteta(klon,nbteta)
-!      REAL PVteta(klon,1)
-      real,intent(in) :: PVteta(klon,3) ! Not used ; should match definition
-                                        ! in calfis.F
 
 integer,save :: itau=0 ! counter to count number of calls to physics
@@ -137 +133 @@
 #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 +184 @@
 !$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)