Changeset 1705
- Timestamp:
- Jan 8, 2013, 4:38:44 PM (12 years ago)
- Location:
- LMDZ5/trunk
- Files:
-
- 2 added
- 5 edited
-
arch/arch-X64_ADA.fcm (added)
-
arch/arch-X64_ADA.path (added)
-
libf/dyn3dmem/integrd_loc.F (modified) (1 diff)
-
libf/dyn3dmem/leapfrog_loc.F (modified) (3 diffs)
-
libf/dyn3dmem/mod_filtreg_p.F (modified) (6 diffs)
-
libf/filtrez/filtreg.F (modified) (6 diffs)
-
libf/phylmd/printflag.F (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/dyn3dmem/integrd_loc.F
r1673 r1705 38 38 #include "serre.h" 39 39 #include "iniprint.h" 40 include 'mpif.h'40 ! include 'mpif.h' 41 41 42 42 c Arguments: -
LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F
r1682 r1705 78 78 #include "iniprint.h" 79 79 #include "academic.h" 80 include "mpif.h"80 ! include "mpif.h" 81 81 82 82 INTEGER longcles … … 237 237 238 238 c Allocate variables depending on dynamic variable nqtot 239 !c$OMP MASTER 239 !$OMP MASTER 240 if (firstcall) then 240 241 ! 241 242 ! ALLOCATE(p(ijb_u:ije_u,llmp1)) … … 266 267 ! ALLOCATE(vcont(ijb_v:ije_v,llm),ucont(ijb_u:ije_u,llm)) 267 268 ! ALLOCATE(vnat(ijb_v:ije_v,llm),unat(ijb_u:ije_u,llm)) 268 !c$OMP END MASTER 269 !c$OMP BARRIER 269 endif 270 !$OMP END MASTER 271 !$OMP BARRIER 270 272 271 273 ! CALL dynredem1_loc("restart.nc",0.0, -
LMDZ5/trunk/libf/dyn3dmem/mod_filtreg_p.F
r1632 r1705 210 210 IF( ifiltre.EQ.-2 ) THEN 211 211 DO j = jdfil,jffil 212 CALL DGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 212 #ifdef BLAS 213 CALL SGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 213 214 & matrinvn(1,1,j), iim, 214 215 & champ_loc(1,j,1), iip1*(jje-jjb+1), 0.0, 215 216 & champ_fft(1,j,1), iip1*(jje-jjb+1)) 217 #else 218 champ_fft(:,j,:)= 219 & matmul(matrinvn(:,:,j),champ_loc(:iim,j,:)) 220 #endif 216 221 ENDDO 217 222 218 223 ELSE IF ( griscal ) THEN 219 224 DO j = jdfil,jffil 220 CALL DGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 225 #ifdef BLAS 226 CALL SGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 221 227 & matriceun(1,1,j), iim, 222 228 & champ_loc(1,j,1), iip1*(jje-jjb+1), 0.0, 223 229 & champ_fft(1,j,1), iip1*(jje-jjb+1)) 230 #else 231 champ_fft(:,j,:)= 232 & matmul(matriceun(:,:,j),champ_loc(:iim,j,:)) 233 #endif 224 234 ENDDO 225 235 226 236 ELSE 227 237 DO j = jdfil,jffil 228 CALL DGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 238 #ifdef BLAS 239 CALL SGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 229 240 & matricevn(1,1,j), iim, 230 241 & champ_loc(1,j,1), iip1*(jje-jjb+1), 0.0, 231 242 & champ_fft(1,j,1), iip1*(jje-jjb+1)) 243 #else 244 champ_fft(:,j,:)= 245 & matmul(matricevn(:,:,j),champ_loc(:iim,j,:)) 246 #endif 232 247 ENDDO 233 248 … … 238 253 IF( ifiltre.EQ.-2 ) THEN 239 254 DO j = jdfil,jffil 240 CALL DGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 255 #ifdef BLAS 256 CALL SGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 241 257 & matrinvs(1,1,j-jfiltsu+1), iim, 242 258 & champ_loc(1,j,1), iip1*(jje-jjb+1), 0.0, 243 259 & champ_fft(1,j,1), iip1*(jje-jjb+1)) 260 #else 261 champ_fft(:,j,:)= 262 & matmul(matrinvs(:,:,j-jfiltsu+1), 263 & champ_loc(:iim,j,:)) 264 #endif 244 265 ENDDO 245 266 … … 247 268 248 269 DO j = jdfil,jffil 249 CALL DGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 270 #ifdef BLAS 271 CALL SGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 250 272 & matriceus(1,1,j-jfiltsu+1), iim, 251 273 & champ_loc(1,j,1), iip1*(jje-jjb+1), 0.0, 252 274 & champ_fft(1,j,1), iip1*(jje-jjb+1)) 275 #else 276 champ_fft(:,j,:)= 277 & matmul(matriceus(:,:,j-jfiltsu+1), 278 & champ_loc(:iim,j,:)) 279 #endif 253 280 ENDDO 254 281 … … 256 283 257 284 DO j = jdfil,jffil 258 CALL DGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 285 #ifdef BLAS 286 CALL SGEMM("N", "N", iim, nbniv_loc, iim, 1.0, 259 287 & matricevs(1,1,j-jfiltsv+1), iim, 260 288 & champ_loc(1,j,1), iip1*(jje-jjb+1), 0.0, 261 289 & champ_fft(1,j,1), iip1*(jje-jjb+1)) 290 #else 291 champ_fft(:,j,:)= 292 & matmul(matricevs(:,:,j-jfiltsv+1), 293 & champ_loc(:iim,j,:)) 294 #endif 262 295 ENDDO 263 296 … … 269 302 270 303 c !-------------------------------------! 271 c ! D és-agregation des niveau verticaux !304 c ! Dés-agregation des niveau verticaux ! 272 305 c ! uniquement necessaire pour une ! 273 306 c ! execution OpenMP ! … … 402 435 END SUBROUTINE filtreg_p 403 436 END MODULE mod_filtreg_p 437 -
LMDZ5/trunk/libf/filtrez/filtreg.F
r1279 r1705 185 185 DO j = jdfil,jffil 186 186 #ifdef BLAS 187 CALL DGEMM("N", "N", iim, nbniv, iim, 1.0,187 CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 188 188 & matrinvn(1,1,j), 189 189 & iim, champ(1,j,1), iip1*nlat, 0.0, … … 199 199 DO j = jdfil,jffil 200 200 #ifdef BLAS 201 CALL DGEMM("N", "N", iim, nbniv, iim, 1.0,201 CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 202 202 & matriceun(1,1,j), 203 203 & iim, champ(1,j,1), iip1*nlat, 0.0, … … 213 213 DO j = jdfil,jffil 214 214 #ifdef BLAS 215 CALL DGEMM("N", "N", iim, nbniv, iim, 1.0,215 CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 216 216 & matricevn(1,1,j), 217 217 & iim, champ(1,j,1), iip1*nlat, 0.0, … … 231 231 DO j = jdfil,jffil 232 232 #ifdef BLAS 233 CALL DGEMM("N", "N", iim, nbniv, iim, 1.0,233 CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 234 234 & matrinvs(1,1,j-jfiltsu+1), 235 235 & iim, champ(1,j,1), iip1*nlat, 0.0, … … 247 247 DO j = jdfil,jffil 248 248 #ifdef BLAS 249 CALL DGEMM("N", "N", iim, nbniv, iim, 1.0,249 CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 250 250 & matriceus(1,1,j-jfiltsu+1), 251 251 & iim, champ(1,j,1), iip1*nlat, 0.0, … … 262 262 DO j = jdfil,jffil 263 263 #ifdef BLAS 264 CALL DGEMM("N", "N", iim, nbniv, iim, 1.0,264 CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 265 265 & matricevs(1,1,j-jfiltsv+1), 266 266 & iim, champ(1,j,1), iip1*nlat, 0.0, -
LMDZ5/trunk/libf/phylmd/printflag.F
r1403 r1705 87 87 ! radpas0 = NINT( 86400./tabcntr0(1)/INT( tabcntr0(6) ) ) 88 88 PRINT 100 89 PRINT 22, radpas0, radpas89 ! PRINT 22, radpas0, radpas 90 90 PRINT 100 91 91 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.
