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

Timestamp:

Jun 5, 2013, 2:41:09 PM (12 years ago)

Author:

emillour

Message:

Common dynamics:
Updates in the dynamics (seq and ) to keep up with updates
in LMDZ5 (up to LMDZ5 trunk, rev 1760):

• General stuff (essentially to keep up with Earth model):
• Updated makelmdz_fcm and makelmdz (more control on dimension.h, added option -mem, although it is not usefull for now)
• Updated build_gcm with more control over fcm
• Updated create_make_gcm (enable looking for code in subdirectories)

• bibio:
• updates (just renaming the files actually...) new_unit.F90 => new_unit_m.F90, pchsp_95.F90 => pchsp_95_m.F90 and pchfe_95.F90 => pchfe_95_m.F90

• filtrez:
• mod_fft.F90: use more baseline CPP directives for preprocessor compatibility
• mod_filtre_fft_loc.F90: added this new file
• filtreg_mod.f90: added calls to init_..._loc
• filtreg.F: fixed calls to DGEMM into SGEMM (preprocessing does the switch)

• dyn3d:
• removed obsolete files: etat0_netcdf.F90 limit_netcdf.F90

pres2lev.F90

• added new file : pres2lev_mod.F90 (module containing "old" pres2lev)
• gcm.F: changed args to call to inidissip (added arg "vert_prof_dissip")
• inidissip.F90: added arg "vert_prof_dissip" and the "earth model" discterizations (flagged with "planet_type=="earth")
• comdissnew.h: added 'vert_prof_dissip' to the common block
• guide_mod.F90: added the "use pres2lev_mod"
• conf_gcm.F: cosmetics, and evaluation of vert_prof_dissip, (and also of dissip_* factors, for Earth model)
• comconst.h : added dissip_factz,dissip_zref variables (for Earth mode dissip)

• dyn3dpar:
• removed obsolete files: etat0_netcdf.F90 limit_netcdf.F90

pres2lev.F90 mod_const_para.F90

• added new files: pres2lev_mod.F90 (module containing "old" pres2lev)

mod_const_mpi

• abort_gcm : better control of abort in parallel mode
• gcm.F: changed args to call to inidissip (added arg "vert_prof_dissip")
• inidissip.F90: added arg "vert_prof_dissip" and the "earth model" discterizations (flagged with "planet_type=="earth")
• comdissnew.h: added 'vert_prof_dissip' to the common block
• filtreg_p.F : bug correction (array bounds)
• guide_p_mod.F90 : added the "use pres2lev_mod"
• conf_gcm.F : cosmetics (and evaluation of vert_prof_dissip , and

also of dissip_* factors, for Earth model)
plus check if "adjust" is indeed not used in OpenMP

• comconst.h : add dissip_factz,dissip_zref variables (for Earth mode dissip)

EM

Location:

trunk/LMDZ.COMMON/libf/filtrez

Files:

• filtreg.F (modified) (6 diffs)
• filtreg_mod.F90 (modified) (2 diffs)
• mod_fft.F90 (modified) (1 diff)
• mod_filtre_fft_loc.F90 (added)

trunk/LMDZ.COMMON/libf/filtrez/filtreg.F

@@ -185 +185 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matrinvn(1,1,j),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,
@@ -199 +199 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matriceun(1,1,j),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,
@@ -213 +213 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matricevn(1,1,j),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,
@@ -231 +231 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matrinvs(1,1,j-jfiltsu+1),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,
@@ -247 +247 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matriceus(1,1,j-jfiltsu+1),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,
@@ -262 +262 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matricevs(1,1,j-jfiltsv+1),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,

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

@@ -10 +10 @@
 
   SUBROUTINE inifilr
-  USE mod_filtre_fft
-    !
+  USE mod_filtre_fft, ONLY : use_filtre_fft,Init_filtre_fft
+  USE mod_filtre_fft_loc, ONLY : Init_filtre_fft_loc=>Init_filtre_fft    !
     !    ... H. Upadhyaya, O.Sharma   ...
     !
@@ -541 +541 @@
        CALL Init_filtre_fft(coefilu,modfrstu,jfiltnu,jfiltsu,  &
                            coefilv,modfrstv,jfiltnv,jfiltsv)
+       CALL Init_filtre_fft_loc(coefilu,modfrstu,jfiltnu,jfiltsu,  &
+                           coefilv,modfrstv,jfiltnv,jfiltsv)
     ENDIF
 

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

@@ -3 +3 @@
 #ifdef FFT_MATHKEISAN
   USE mod_fft_mathkeisan
-#elif FFT_FFTW
+#else
+#ifdef FFT_FFTW
   USE mod_fft_fftw
-#elif FFT_MKL
+#else
+#ifdef FFT_MKL
   USE mod_fft_mkl
 #else
   USE mod_fft_wrapper
 #endif
+#endif
+#endif
 
 END MODULE mod_fft