From f928f78683a98238d987cfdc79b62a704f90d95c Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Tue, 26 Feb 2008 17:20:47 +0000
Subject: [PATCH] mld2p4-dev/mlprec  Makefile  mld_dprecset.f90 
 mld_zprecset.f90

Fixed dependency in Makefile was rebuilding the module files with
MPIF90 when not needed.
Fixed overlapping labels in precsetc.
---
 mlprec/Makefile         |  2 +-
 mlprec/mld_dprecset.f90 | 16 ++++++++++++----
 mlprec/mld_zprecset.f90 | 16 ++++++++++++----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/mlprec/Makefile b/mlprec/Makefile
index 1375b047..459897b4 100644
--- a/mlprec/Makefile
+++ b/mlprec/Makefile
@@ -48,7 +48,7 @@ mld_prec_mod.o mld_innner_mod.o: mld_prec_type.o
 
 $(MODOBJS): $(PSBLIBDIR)/psb_base_mod$(.mod)
  
-mpobjs: 
+mpobjs: $(MODOBJS)
 	(make $(MPFOBJS) F90="$(MPF90)" F90COPT="$(F90COPT)")
 	(make $(MPCOBJS) CC="$(MPCC)" CCOPT="$(CCOPT)")
 
diff --git a/mlprec/mld_dprecset.f90 b/mlprec/mld_dprecset.f90
index 615b195b..72cd6345 100644
--- a/mlprec/mld_dprecset.f90
+++ b/mlprec/mld_dprecset.f90
@@ -463,14 +463,14 @@ contains
       val = mld_mult_ml_
     case('DEC')
       val = mld_dec_aggr_
-    case('REPL')
-      val = mld_repl_mat_
-    case('DIST')
-      val = mld_distr_mat_
     case('SYMDEC')
       val = mld_sym_dec_aggr_
     case('GLB')
       val = mld_glb_aggr_
+    case('REPL')
+      val = mld_repl_mat_
+    case('DIST')
+      val = mld_distr_mat_
     case('SMOOTH')
       val = mld_smooth_prol_
     case('PRE')
@@ -479,6 +479,14 @@ contains
       val = mld_post_smooth_
     case('TWOSIDE','BOTH')
       val = mld_twoside_smooth_
+    case('NOPREC')
+      val = mld_noprec_
+    case('DIAG')
+      val = mld_diag_
+    case('BJAC')
+      val = mld_bjac_
+    case('AS')
+      val = mld_as_
     case default
       val  = -1
       info = -1
diff --git a/mlprec/mld_zprecset.f90 b/mlprec/mld_zprecset.f90
index c8293572..28a385f4 100644
--- a/mlprec/mld_zprecset.f90
+++ b/mlprec/mld_zprecset.f90
@@ -463,14 +463,14 @@ contains
       val = mld_mult_ml_
     case('DEC')
       val = mld_dec_aggr_
-    case('REPL')
-      val = mld_repl_mat_
-    case('DIST')
-      val = mld_distr_mat_
     case('SYMDEC')
       val = mld_sym_dec_aggr_
     case('GLB')
       val = mld_glb_aggr_
+    case('REPL')
+      val = mld_repl_mat_
+    case('DIST')
+      val = mld_distr_mat_
     case('SMOOTH')
       val = mld_smooth_prol_
     case('PRE')
@@ -479,6 +479,14 @@ contains
       val = mld_post_smooth_
     case('TWOSIDE','BOTH')
       val = mld_twoside_smooth_
+    case('NOPREC')
+      val = mld_noprec_
+    case('DIAG')
+      val = mld_diag_
+    case('BJAC')
+      val = mld_bjac_
+    case('AS')
+      val = mld_as_
     case default
       val  = -1
       info = -1