Changeset 2114 for LMDZ5/trunk/libf/phylmd/iophy.F90

Timestamp:

Sep 5, 2014, 5:42:24 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Suite (et fin?) des modifications pour permettre un controle 'tout xml'
des fichiers de sorties XIOS.
Un nouveau paramètre logique est introduit, ok_all_xml, false par défaut, et lu
dans le run.def qui permet de faire du 'tout xml'

---

Follow-up modifications to ensure total xlm control over the output files
from XIOS.
A new logical parameter, ok_all_wml, is introduced. False by default, it is
read from the run.def file and, if true, will give over control to the
XIOS xml files

File:

• LMDZ5/trunk/libf/phylmd/iophy.F90 (modified) (12 diffs)

LMDZ5/trunk/libf/phylmd/iophy.F90

@@ -204 +204 @@
   IMPLICIT NONE
   include 'dimensions.h'
+  include 'clesphys.h'
     
     character*(*), INTENT(IN) :: name
@@ -227 +228 @@
     IF((.NOT. is_using_mpi) .OR. is_mpi_root) THEN
         ! ug Création du fichier
+      IF (.not. ok_all_xml) THEN
         CALL wxios_add_file(name, ffreq, lev)
+      ENDIF
     END IF
 #endif
@@ -603 +606 @@
 
 #ifdef CPP_XIOS
-      IF ( var%flag(iff)<=lev_files(iff) ) THEN
-        CALL wxios_add_field_to_file(var%name, 2, iff, phys_out_filenames(iff), &
-        var%description, var%unit, var%flag(iff), typeecrit)
-        IF (prt_level >= 10) THEN
-          WRITE(lunout,*) 'histdef2d: call wxios_add_field_to_file var%name iff: ', &
-                          trim(var%name),iff
+      IF (.not. ok_all_xml) THEN
+        IF ( var%flag(iff)<=lev_files(iff) ) THEN
+          CALL wxios_add_field_to_file(var%name, 2, iff, phys_out_filenames(iff), &
+          var%description, var%unit, var%flag(iff), typeecrit)
+          IF (prt_level >= 10) THEN
+            WRITE(lunout,*) 'histdef2d: call wxios_add_field_to_file var%name iff: ', &
+                            trim(var%name),iff
+          ENDIF
         ENDIF
       ENDIF
@@ -688 +693 @@
 
 #ifdef CPP_XIOS
-      IF ( var%flag(iff)<=lev_files(iff) ) THEN
-        CALL wxios_add_field_to_file(var%name, 3, iff, phys_out_filenames(iff), &
-        var%description, var%unit, var%flag(iff), typeecrit)
-        IF (prt_level >= 10) THEN
-          WRITE(lunout,*) 'histdef3d: call wxios_add_field_to_file var%name iff: ', &
-                          trim(var%name),iff
-        ENDIF
-      ENDIF
+       IF (.not. ok_all_xml) THEN
+         IF ( var%flag(iff)<=lev_files(iff) ) THEN
+         CALL wxios_add_field_to_file(var%name, 3, iff, phys_out_filenames(iff), &
+         var%description, var%unit, var%flag(iff), typeecrit)
+           IF (prt_level >= 10) THEN
+             WRITE(lunout,*) 'histdef3d: call wxios_add_field_to_file var%name iff: ', &
+                             trim(var%name),iff
+           ENDIF
+         ENDIF
+       ENDIF
 #endif
 #ifndef CPP_IOIPSL_NO_OUTPUT 
@@ -890 +897 @@
   INCLUDE 'dimensions.h'
   INCLUDE 'iniprint.h'
+  include 'clesphys.h'
 
     TYPE(ctrl_out), INTENT(IN) :: var
@@ -922 +930 @@
 !$OMP MASTER
       !Si phase de définition.... on définit
+      IF (.not. ok_all_xml) THEN
+      if (prt_level >= 10) then
+      write(lunout,*)"histwrite2d_phy: .not.vars_defined ; time to define ", &
+                     trim(var%name)
+      endif
       DO iff=iff_beg, iff_end
          IF (clef_files(iff)) THEN
@@ -927 +940 @@
          ENDIF
       ENDDO
+      ENDIF
 !$OMP END MASTER
   ELSE
@@ -944 +958 @@
 ! La boucle sur les fichiers:
       firstx=.true.
-      DO iff=iff_beg, iff_end
+
+      IF (ok_all_xml) THEN
+#ifdef CPP_XIOS
+          if (prt_level >= 10) then
+             write(lunout,*)'Dans iophy histwrite2D,var%name ',&
+                             trim(var%name)                       
+          endif
+          CALL xios_send_field(var%name, Field2d)
+          if (prt_level >= 10) then
+             write(lunout,*)'Dans iophy histwrite2D,var%name apres xios_send ',&
+                             trim(var%name)                       
+          endif
+#else
+        CALL abort_gcm ('iophy','cannot have ok_all_xml = .T. without CPP_XIOS defined' ,1)
+#endif
+      ELSE  
+        DO iff=iff_beg, iff_end
             IF (var%flag(iff) <= lev_files(iff) .AND. clef_files(iff)) THEN 
 
@@ -1001 +1031 @@
                 deallocate(fieldok)
             ENDIF !levfiles
-      ENDDO ! of DO iff=iff_beg, iff_end
+        ENDDO ! of DO iff=iff_beg, iff_end
+      ENDIF
 !$OMP END MASTER   
   ENDIF ! vars_defined
@@ -1026 +1057 @@
   INCLUDE 'dimensions.h'
   INCLUDE 'iniprint.h'
+  include 'clesphys.h'
 
     TYPE(ctrl_out), INTENT(IN) :: var
@@ -1078 +1110 @@
 ! BOUCLE SUR LES FICHIERS
      firstx=.true.
+
+      IF (ok_all_xml) THEN
+#ifdef CPP_XIOS
+          if (prt_level >= 10) then
+             write(lunout,*)'Dans iophy histwrite3D,var%name ',&
+                             trim(var%name)                       
+          endif
+          CALL xios_send_field(var%name, Field3d)
+#else
+        CALL abort_gcm ('iophy','cannot have ok_all_xml = .T. without CPP_XIOS defined' ,1)
+#endif
+      ELSE  
+
+
      DO iff=iff_beg, iff_end
             IF (var%flag(iff) <= lev_files(iff) .AND. clef_files(iff)) THEN
@@ -1136 +1182 @@
             ENDIF
       ENDDO
+      ENDIF
 !$OMP END MASTER   
   ENDIF ! vars_defined