Changeset 1019 for trunk/LMDZ.COMMON/libf/dyn3d

Timestamp:

Aug 26, 2013, 9:21:41 AM (11 years ago)

Author:

emillour

Message:

Common dynamics; keep up with updates (seq and ) in LMDZ5 (up tio rev 1845):

• General stuff:
• makelmdz_fcm: add options -j # (compile using # threads) and -full, and to keep up

with Earth model, possibility to compile with various versions of orchidee

• bld.cfg: adaptations to enable compiling using multiple threads
• build_gcm: adaptations to enable compiling using multiple threads
• makelmdz: keep up with Earth model: possibility to compile with various versions of orchidee + cosmetic changes + library directory name change

• bibio:
• wxios.F90 : Added for possible future use of XIOS library

• filtrez:
• mkl_dft_type.f90 & mkl_dfti.f90 : MKL (for MKL FFT) interface definitions
• filtreg_mod : limit use of FFT to parallel mode
• mod_filtre_fft.F90 & mod_filtre_fft_lov.F90 : swich to use parallel_lmdz

• dyn3d:
• abort_gcm.F : add things for xios
• advtrac.F90 : minor change in CFL outputs
• ce0l.F90 : indicesol.h is now module indice_sol_mod
• comvert.h : cosmetic change on comments
• gcm.F : add xios and use module indice_sol_mod (for INCA)
• inigeom.F : move two computations outside loop

• dyn3dpar:
• parallel.F90 => parallel_lmdz.F90 : and change all the "use parallel" into "use parallel_lmdz" in all files in dyn3dpar
• comvert.h : cosmetic change on comments
• gcm.F : add xios and use module indice_sol_mod (for INCA)
• leapfrog_p.F : add xios + correction for times in Newtonian case
• ce0l.F90 : indicesol.h is now module indice_sol_mod
• inigeom.F : move two computations outside loop

EM

Location:

trunk/LMDZ.COMMON/libf/dyn3d

Files:

• advtrac.F90 (modified) (1 diff)
• ce0l.F90 (modified) (2 diffs)
• comvert.h (modified) (1 diff)
• gcm.F (modified) (3 diffs)
• inigeom.F (modified) (1 diff)

trunk/LMDZ.COMMON/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

trunk/LMDZ.COMMON/libf/dyn3d/ce0l.F90

@@ -20 +20 @@
   USE comgeomphy
   USE infotrac
+  USE indice_sol_mod
 
 #ifdef CPP_IOIPSL
@@ -36 +37 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "indicesol.h"
+!#include "indicesol.h"
 #include "iniprint.h"
 #include "temps.h"

trunk/LMDZ.COMMON/libf/dyn3d/comvert.h

@@ -23 +23 @@
       real bps    ! hybrid sigma contribution at mid-layers
       real scaleheight ! atmospheric (reference) scale height (km)
-      real pseudoalt ! for planets
+      real pseudoalt ! pseudo-altitude of model levels (km), based on presnivs(),
+                     ! preff and scaleheight
 
       integer disvert_type ! type of vertical discretization:

trunk/LMDZ.COMMON/libf/dyn3d/gcm.F

@@ -13 +13 @@
 #endif
 
+
+#ifdef CPP_XIOS
+    ! ug Pour les sorties XIOS
+        USE wxios
+#endif
+
       USE filtreg_mod
       USE infotrac
       USE control_mod
       use cpdet_mod, only: ini_cpdet
+
+#ifdef INCA
+! Only INCA needs these informations (from the Earth's physics)
+      USE indice_sol_mod
+#endif
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -81 +92 @@
 #ifdef INCA
 ! Only INCA needs these informations (from the Earth's physics)
-#include "indicesol.h"
+!#include "indicesol.h"
 #endif
 
@@ -173 +184 @@
 !      CALL defrun( 99, .TRUE. , clesphy0 )
 !#endif
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! Initialisation de XIOS
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+#ifdef CPP_XIOS
+        CALL wxios_init("LMDZ")
+#endif
+
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

trunk/LMDZ.COMMON/libf/dyn3d/inigeom.F

@@ -426 +426 @@
          radclatm = 0.5* rad * coslatm
 c
+         ai14            = un4rad2 * coslatp * yprp
+         ai23            = un4rad2 * coslatm * yprm
          DO 32 i = 1,iim
          xprp            = xprimp025( i )
          xprm            = xprimm025( i )
       
-         ai14            = un4rad2 * coslatp * yprp
-         ai23            = un4rad2 * coslatm * yprm
          aireij1 ( i,j ) = ai14 * xprp
          aireij2 ( i,j ) = ai23 * xprp