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

Timestamp:

Aug 26, 2013, 9:21:41 AM (12 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/filtrez

Files:

• filtreg_mod.F90 (modified) (3 diffs)
• mkl_dft_type.f90 (added)
• mkl_dfti.f90 (added)
• mod_filtre_fft.F90 (modified) (3 diffs)
• mod_filtre_fft_loc.F90 (modified) (3 diffs)

trunk/LMDZ.COMMON/libf/filtrez/filtreg_mod.F90

@@ -10 +10 @@
 
   SUBROUTINE inifilr
+#ifdef CPP_PARA
   USE mod_filtre_fft, ONLY : use_filtre_fft,Init_filtre_fft
   USE mod_filtre_fft_loc, ONLY : Init_filtre_fft_loc=>Init_filtre_fft    !
+#endif
     !    ... H. Upadhyaya, O.Sharma   ...
     !
@@ -538 +540 @@
     ENDDO ! of DO j = jfiltsu, jjm
 
+#ifdef CPP_PARA
     IF (use_filtre_fft) THEN
        CALL Init_filtre_fft(coefilu,modfrstu,jfiltnu,jfiltsu,  &
@@ -544 +547 @@
                            coefilv,modfrstv,jfiltnv,jfiltsv)
     ENDIF
-
+#endif
     !   ...................................................................
 

trunk/LMDZ.COMMON/libf/filtrez/mod_filtre_fft.F90

@@ -118 +118 @@
     USE mod_fft
 #ifdef CPP_PARA
-    USE parallel,ONLY : OMP_CHUNK
+    USE parallel_lmdz,ONLY : OMP_CHUNK
 #endif
     IMPLICIT NONE
@@ -179 +179 @@
     USE mod_fft
 #ifdef CPP_PARA
-    USE parallel,ONLY : OMP_CHUNK
+    USE parallel_lmdz,ONLY : OMP_CHUNK
 #endif
     IMPLICIT NONE
@@ -241 +241 @@
     USE mod_fft
 #ifdef CPP_PARA
-    USE parallel,ONLY : OMP_CHUNK
+    USE parallel_lmdz,ONLY : OMP_CHUNK
 #endif
     IMPLICIT NONE

trunk/LMDZ.COMMON/libf/filtrez/mod_filtre_fft_loc.F90

@@ -107 +107 @@
     USE mod_fft
 #ifdef CPP_PARA
-    USE parallel,ONLY : OMP_CHUNK
+    USE parallel_lmdz,ONLY : OMP_CHUNK
 #endif
     IMPLICIT NONE
@@ -187 +187 @@
     USE mod_fft
 #ifdef CPP_PARA
-    USE parallel,ONLY : OMP_CHUNK
+    USE parallel_lmdz,ONLY : OMP_CHUNK
 #endif
     IMPLICIT NONE
@@ -250 +250 @@
     USE mod_fft
 #ifdef CPP_PARA
-    USE parallel,ONLY : OMP_CHUNK
+    USE parallel_lmdz,ONLY : OMP_CHUNK
 #endif
     IMPLICIT NONE