Index: wflow-py/wflow/wflow_adapt.py
===================================================================
diff -u -re4086ff41e31910016a6d668dcdcd9e6b5a91e69 -r1ddf40a90c640b60effb10fcbc6a832590761b07
--- wflow-py/wflow/wflow_adapt.py	(.../wflow_adapt.py)	(revision e4086ff41e31910016a6d668dcdcd9e6b5a91e69)
+++ wflow-py/wflow/wflow_adapt.py	(.../wflow_adapt.py)	(revision 1ddf40a90c640b60effb10fcbc6a832590761b07)
@@ -436,28 +436,6 @@
         print xmlfile + " does not exists."
 
 
-def log2xml(logfilename,xmlfilename):
-    """
-    Converts an (adapter) log file the a FEW pi XML  diagnistics file
-    """
-    f = open(logfilename,"rb")
-    lines = [line.strip() for line in f]
-    f.close()
-    
-    for line in lines:
-        level = line.split(' - ')[2]
-        if level == "DEBUG":
-            print "DEBUG"
-        elif level == "INFO":
-            print "INFO"
-        elif level == "WARN":
-            print "INFO"
-        elif level == "ERROR":
-            print "ERROR"
-        else:
-            logger.warn("Unexpected level in log file")
-            
-    
 
 def getEndTimefromRuninfo(xmlfile):
     """ 
@@ -531,7 +509,10 @@
     global case
     global runId
     timestepsecs = 86400
-    
+    xmldiagfname = "wflow_diag.xml"
+    adaptxmldiagfname = "wflow_adapt_diag.xml"
+    logfname = "wflow.log"
+
     try:
         opts, args = getopt.getopt(sys.argv[1:], "-T:-M:-t:-s:-o:-r:-w:-C:-I:R:")
     except getopt.GetoptError, err:
@@ -634,8 +615,11 @@
                 stop = 1
 
 
-                
-        logger.info("Ending postadapter")                    
+        # Convert log file of model code
+        log2xml(case + "/" + runId + "/" + logfname,xmldiagfname)
+        logger.info("Ending postadapter")
+        # convert logfile of adapter
+        log2xml(logfile,adaptxmldiagfname)
     else:
         sys.exit(2)