Changeset 1864 for LMDZ5/branches/testing/libf/dyn3d

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3d/abort_gcm.F (modified) (2 diffs)
• libf/dyn3d/advtrac.F90 (modified) (1 diff)
• libf/dyn3d/gcm.F (modified) (2 diffs)

LMDZ5/branches/testing/libf/dyn3d/abort_gcm.F

@@ -12 +12 @@
       USE ioipsl_getincom
 #endif
+
+#ifdef CPP_XIOS
+    ! ug Pour les sorties XIOS
+      USE wxios
+#endif
+
 #include "iniprint.h"
  
@@ -27 +33 @@
 
       write(lunout,*) 'in abort_gcm'
+
+#ifdef CPP_XIOS
+    !Fermeture propre de XIOS
+      CALL wxios_close()
+#endif
+
 #ifdef CPP_IOIPSL
       call histclo

LMDZ5/branches/testing/libf/dyn3d/advtrac.F90

@@ -203 +203 @@
      if (countcfl==day_step) then
         do l=1,llm
-           write(lunout,*) 'L, CFLmax ' &
-                ,l,maxval(cflx(:,l)),maxval(cfly(:,l)),maxval(cflz(:,l))
+           write(lunout,*) 'L, CFL[xyz]max:', l, cflxmax(l), cflymax(l), &
+                cflzmax(l)
         enddo
         countcfl=0

LMDZ5/branches/testing/libf/dyn3d/gcm.F

@@ -11 +11 @@
 ! if not using IOIPSL, we still need to use (a local version of) getin
       USE ioipsl_getincom
+#endif
+
+
+#ifdef CPP_XIOS
+    ! ug Pour les sorties XIOS
+        USE wxios
 #endif
 
@@ -179 +185 @@
 !      CALL defrun( 99, .TRUE. , clesphy0 )
 !#endif
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! Initialisation de XIOS
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+#ifdef CPP_XIOS
+        CALL wxios_init("LMDZ")
+#endif
+
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!