Changeset 2002 for LMDZ5/trunk/libf/phylmd

Timestamp:

Apr 4, 2014, 2:39:54 PM (10 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/phylmd

Files:

• iophy.F90 (modified) (10 diffs)
• phys_output_mod.F90 (modified) (1 diff)
• phys_output_write_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/iophy.F90

@@ -883 +883 @@
                                  nid_files
 #ifdef CPP_XIOS
-  USE wxios, only: wxios_write_2D
+  USE xios, only: xios_send_field
 #endif
 
@@ -952 +952 @@
                      write(lunout,*)'Dans iophy histwrite2D,iff,var%name ',&
                                     iff,trim(var%name)                       
-                     write(lunout,*)"histwrite2d_phy:.NOT.clef_stations(iff)and iff==iff_beg, call wxios_write_2D"
+                     write(lunout,*)"histwrite2d_phy:.NOT.clef_stations(iff)and iff==iff_beg, call xios_send_field"
                   endif
-                  CALL wxios_write_2D(var%name, Field2d)
+                  CALL xios_send_field(var%name, Field2d)
                   firstx=.false.
                ENDIF
@@ -968 +968 @@
 !                        IF (iff == iff_beg) THEN
 !                          if (prt_level >= 10) then
-!                            write(lunout,*)"histwrite2d_phy: .NOT.clef_stations(iff) and iff==iff_beg, call wxios_write_2D"
+!                            write(lunout,*)"histwrite2d_phy: .NOT.clef_stations(iff) and iff==iff_beg, call xios_send_field"
 !                          endif
-!                          CALL wxios_write_2D(var%name, Field2d)
+!                          CALL xios_send_field(var%name, Field2d)
 !                        ENDIF
 !#endif
@@ -1019 +1019 @@
                                  nid_files
 #ifdef CPP_XIOS
-  USE wxios, only: wxios_write_3D
+  USE xios, only: xios_send_field
 #endif
 
@@ -1085 +1085 @@
                   write(lunout,*)'Dans iophy, histwrite3D iff nlev klev firstx', &
                                   iff,nlev,klev, firstx                       
-                  write(lunout,*)'histwrite3d_phy: call wxios_write_3D for ', &
+                  write(lunout,*)'histwrite3d_phy: call xios_send_field for ', &
                                   trim(var%name), ' with iim jjm nlevx = ', &
                                   iim,jj_nb,nlevx
                 endif
-                CALL wxios_write_3D(var%name, Field3d(:,:,1:nlevx))
+                CALL xios_send_field(var%name, Field3d(:,:,1:nlevx))
                             firstx=.false.
               ENDIF
@@ -1103 +1103 @@
 !#ifdef CPP_XIOS
 !                        IF (iff == 1) THEN
-!                              CALL wxios_write_3D(var%name, Field3d(:,:,1:klev))
+!                              CALL xios_send_field(var%name, Field3d(:,:,1:klev))
 !                        ENDIF
 !#endif
@@ -1149 +1149 @@
                                 is_sequential, klon_mpi_begin, klon_mpi_end, &
                                 jj_nb, klon_mpi
-  USE wxios, only: wxios_write_2D
+  USE xios, only: xios_send_field
 
 
@@ -1184 +1184 @@
 
 
-        CALL wxios_write_2D(field_name, Field2d)
+        CALL xios_send_field(field_name, Field2d)
 
     ELSE 
@@ -1220 +1220 @@
                                 is_sequential, klon_mpi_begin, klon_mpi_end, &
                                 jj_nb, klon_mpi
-  USE wxios, only: wxios_write_3D
+  USE xios, only: xios_send_field
 
 
@@ -1254 +1254 @@
         ALLOCATE(index3d(iim*jj_nb*nlev))
         ALLOCATE(fieldok(iim*jj_nb,nlev))
-        CALL wxios_write_3D(field_name, Field3d(:,:,1:nlev))
+        CALL xios_send_field(field_name, Field3d(:,:,1:nlev))
                         
     ELSE 

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -316 +316 @@
     endif
    if (iff.le.6) then
-    CALL wxios_add_vaxis("presnivs", phys_out_filenames(iff), &
+    CALL wxios_add_vaxis("presnivs", &
             levmax(iff) - levmin(iff) + 1, presnivs(levmin(iff):levmax(iff)))
-    CALL wxios_add_vaxis("Ahyb", phys_out_filenames(iff), &
+    CALL wxios_add_vaxis("Ahyb", &
             levmax(iff) - levmin(iff) + 1, Ahyb)
-    CALL wxios_add_vaxis("Bhyb", phys_out_filenames(iff), &
+    CALL wxios_add_vaxis("Bhyb", &
             levmax(iff) - levmin(iff) + 1, Bhyb)
-    CALL wxios_add_vaxis("Alt", phys_out_filenames(iff), &
+    CALL wxios_add_vaxis("Alt", &
             levmax(iff) - levmin(iff) + 1, Alt)
    else
     ! NMC files
-    CALL wxios_add_vaxis("plev", phys_out_filenames(iff), &
+    CALL wxios_add_vaxis("plev", &
             levmax(iff) - levmin(iff) + 1, rlevSTD(levmin(iff):levmax(iff)))
    endif

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -230 +230 @@
 #ifdef CPP_XIOS
     ! ug Pour les sorties XIOS
-    USE wxios, only: wxios_update_calendar, wxios_closedef
+    USE xios, ONLY: xios_update_calendar
+    USE wxios, only: wxios_closedef
 #endif
     USE phys_cal_mod, only : mth_len
@@ -292 +293 @@
        IF (vars_defined) THEN
           if (prt_level >= 10) then
-             write(lunout,*)"phys_output_write: call wxios_update_calendar, itau_w=",itau_w
+             write(lunout,*)"phys_output_write: call xios_update_calendar, itau_w=",itau_w
           endif
-          CALL wxios_update_calendar(itau_w)
+          CALL xios_update_calendar(itau_w)
        END IF
        !$OMP END MASTER