Changeset 5514

Timestamp:

2015-06-30T12:06:05+02:00 (9 years ago)

Author:

smasson

Message:

improve tools for memory check

Location:

trunk/NEMOGCM

Files:

• NEMO/OPA_SRC/wrk_nemo.F90 (modified) (3 diffs)
• TOOLS/MISCELLANEOUS/chk_wrk_alloc.sh (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90

@@ -121 +121 @@
 
    LOGICAL ::   linit = .FALSE.
+   LOGICAL ::   ldebug = .FALSE.
    !!----------------------------------------------------------------------
    !! NEMO/OPA 4.0 , NEMO Consortium (2011)
@@ -486 +487 @@
       
       IF( SUM( tree(ii)%ishape ) == 0 ) THEN                    ! create a new branch 
+         IF(ldebug) PRINT *, 'create new branch ', ii,ishape, isrt, itype
          tree(ii)%itype = itype                                        ! define the type of this branch 
          tree(ii)%ishape(:) = ishape(:)                                ! define the shape of this branch 
@@ -515 +517 @@
          tree(ii)%current%next%in_use = .FALSE.                        ! this leaf is not yet used
          tree(ii)%current%next%indic = tree(ii)%current%indic + 1      ! number of this leaf
+         IF(ldebug) PRINT *, 'add a leaf ', ii, tree(ii)%current%indic
          tree(ii)%current%next%prev => tree(ii)%current                ! previous leaf of the new leaf is the current leaf
          tree(ii)%current%next%next => NULL()                          ! next leaf is not yet defined

trunk/NEMOGCM/TOOLS/MISCELLANEOUS/chk_wrk_alloc.sh

@@ -18 +18 @@
 for ff in $( grep -il "^ *use  *wrk_nemo" $( find . -name "*90" )  $( find . -name "*h90" ) )
 do
+    ierr=0
+    
     # number of lines with wrk_alloc
     n1=$( grep -ic "call *wrk_alloc *(" $ff )
@@ -28 +30 @@
    n2=$( sed -e "s/wrk_alloc/wrk_dealloc/" $ff | grep -ic "call *wrk_dealloc *(" )
    # we should get n2 = 2 * n1...
-   [ $(( 2 * $n1 )) -ne $n2 ] && echo "problem with wrk_alloc in $ff" 
-   
+   if [ $(( 2 * $n1 )) -ne $n2 ]
+   then
+       ierr=1
+       echo "problem with wrk_alloc in $ff" 
+   fi
    # same story but for wrk_dealloc
    nn2=$( sed -e "s/wrk_dealloc/wrk_alloc/" $ff | grep -ic "call *wrk_alloc *(" )
    if [ $(( 2 * $nn1 )) -ne $nn2 ]
    then
-       echo "problem with wrk_dealloc in $ff"
+       ierr=1
+       echo "problem with wrk_dealloc in $ff" 
+   fi
+
+   if [ $ierr -eq 0 ] # check that wrk_alloc block is the same as wrk_dealloc block
+   then
+       grep -i "call *wrk_alloc *("   $ff | sed -e "s/ //g" | sed -e "s/!.*//g" > txt1$$
+       grep -i "call *wrk_dealloc *(" $ff | sed -e "s/wrk_dealloc/wrk_alloc/"  | sed -e "s/ //g" | sed -e "s/!.*//g" > txt2$$
+       cmp txt1$$ txt2$$
+       if [ $? -ne 0 ]
+       then
+      echo "different syntax in wrk_alloc and wrk_dealloc in $ff"
+      echo
+      for ll in $( seq 1 $n1 )  # compare each line
+      do
+          sed -n ${ll}p txt1$$ > ll1$$
+          sed -n ${ll}p txt2$$ > ll2$$
+          cmp ll1$$ ll2$$ > /dev/null
+          if [ $? -ne 0 ]
+          then
+         grep -i "call *wrk_alloc *("   $ff | sed -n ${ll}p
+         grep -i "call *wrk_dealloc *(" $ff | sed -n ${ll}p
+         echo
+          fi
+          rm -f ll1$$ ll2$$
+      done
+       fi
+       rm -f txt1$$ txt2$$
+   else
        grep -i "call *wrk_alloc *(" $ff
-       grep -i "call *wrk_dealloc *(" $ff
+       echo
+       grep -i "call *wrk_dealloc *(" $ff 
        echo
    fi
+   
     fi