Changeset 294

Timestamp:

10/28/14 17:52:45 (10 years ago)

Author:

dubos

Message:

Fixed mass conservation issue when using an optimized mesh

Location:

codes/icosagcm/trunk

Files:

• doc/dox.sh (modified) (2 diffs)
• src/geometry.f90 (modified) (1 diff)

codes/icosagcm/trunk/doc/dox.sh

@@ -12 +12 @@
 cd $DOC
 DOXYFILE="Doxyfile.$REV"
+EXCL="src\/dimensions.f90 src\/geometry.f90 src\/trace.f90 src\/mpipara.f90"
+
 sed "s/rXXX/$REV/g" Doxyfile > $DOXYFILE
+sed -i "s/EXCLUDED_F90/$EXCL/g" $DOXYFILE
 
 rm -rf src html latex
@@ -21 +24 @@
 
 set -x
-time lftp dubos@ftp.lmd.polytechnique.fr -e "mirror -R -P=10 html perso/DYNAMICO/$REV ; exit"
+time lftp dubos@ftp.lmd.polytechnique.fr -e "mirror -R html perso/DYNAMICO/$REV ; exit"

codes/icosagcm/trunk/src/geometry.f90

@@ -172 +172 @@
     REAL(rstd) :: centr(3)
     INTEGER :: ind,i,j,n,k
-    TYPE(t_message),SAVE :: message
+    TYPE(t_message),SAVE :: message0, message1
     LOGICAL, SAVE :: first=.TRUE.
 !$OMP THREADPRIVATE(first)    
     
     IF (first) THEN
-      CALL init_message(geom%xyz_i, req_i1 ,message)
+      CALL init_message(geom%xyz_i, req_i0 ,message0)
+      CALL init_message(geom%xyz_i, req_i1 ,message1)
       first=.FALSE.
     ENDIF
     
-    CALL transfert_message(geom%xyz_i,message)
-        
-    
-!    CALL transfert_request(geom%xyz_i,req_i1)
-
+    CALL transfert_message(geom%xyz_i,message0)
+    CALL transfert_message(geom%xyz_i,message1)
+    
     DO ind=1,ndomain
       IF (.NOT. assigned_domain(ind)) CYCLE