Changeset 1680 for LMDZ5/trunk

Timestamp:

Nov 15, 2012, 2:43:45 PM (12 years ago)

Author:

Ehouarn Millour

Message:

• bug correction in filtreg_p.F on array boundaries (was a problem only in cases where BLAS was not used).
• modified "makelmdz_fcm" script: added '-mem' option to trigger using "dyn3dmem" dynamics instead of (default) "dyn3dpar".

EM

Location:

LMDZ5/trunk

Files:

• libf/dyn3dmem/filtreg_p.F (modified) (6 diffs)
• libf/dyn3dpar/filtreg_p.F (modified) (6 diffs)
• makelmdz_fcm (modified) (5 diffs)

LMDZ5/trunk/libf/dyn3dmem/filtreg_p.F

@@ -214 +214 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matrinvn(:,:,j),champ_loc(:iim,j,:))
 #endif
@@ -227 +227 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matriceun(:,:,j),champ_loc(:iim,j,:))
 #endif
@@ -240 +240 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matricevn(:,:,j),champ_loc(:iim,j,:))
 #endif
@@ -257 +257 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matrinvs(:,:,j-jfiltsu+1),
      &                            champ_loc(:iim,j,:))
@@ -272 +272 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matriceus(:,:,j-jfiltsu+1),
      &                            champ_loc(:iim,j,:))
@@ -287 +287 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matricevs(:,:,j-jfiltsv+1),
      &                            champ_loc(:iim,j,:))

LMDZ5/trunk/libf/dyn3dpar/filtreg_p.F

@@ -214 +214 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matrinvn(:,:,j),champ_loc(:iim,j,:))
 #endif
@@ -227 +227 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matriceun(:,:,j),champ_loc(:iim,j,:))
 #endif
@@ -240 +240 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matricevn(:,:,j),champ_loc(:iim,j,:))
 #endif
@@ -257 +257 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matrinvs(:,:,j-jfiltsu+1),
      &                            champ_loc(:iim,j,:))
@@ -272 +272 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matriceus(:,:,j-jfiltsu+1),
      &                            champ_loc(:iim,j,:))
@@ -287 +287 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:)
      &                    =matmul(matricevs(:,:,j-jfiltsv+1),
      &                            champ_loc(:iim,j,:))

LMDZ5/trunk/makelmdz_fcm

@@ -24 +24 @@
 chimie=false
 parallel=none
+paramem="par"
 compil_mod=prod
 io=ioipsl
@@ -72 +73 @@
 [-cpp CPP_KEY]             : cle cpp supplementaires
 [-adjnt]                   : adjoint, a remettre en route ...
+[-mem]                     : version memoire reduite (si en mode parallele)
 [-filtre NOMFILTRE]        : prend le filtre dans libf/NOMFILTRE (def: filtrez)
 [-link LINKS]              : liens optionels avec d'autres librairies
@@ -125 +127 @@
 
       "-adjnt")
-          echo "otpion a reactiver ";exit
+          echo "option a reactiver ";exit
           opt_dep="$opt_dep adjnt" ; adjnt="-ladjnt -ldyn3d "
           optim="$optim -Dadj" ; shift ;;
@@ -131 +133 @@
       "-cosp")
           cosp="$2" ; shift ; shift ;;
-
+      
+      "-mem")
+          paramem="mem" ; shift ;;
 
       "-filtre")
@@ -349 +353 @@
 then
   SUFF_NAME=${SUFF_NAME}_para
-  DYN=dyn${dimc}dpar
+  DYN=dyn${dimc}d${paramem}
+  if [[ "$paramem" == "mem" ]]
+  then
+   SUFF_NAME=${SUFF_NAME}_${paramem}
+  fi
 else
   SUFF_NAME=${SUFF_NAME}_seq