From 196224c63bfdf71b7a14c64b22ea6d9624fa296a Mon Sep 17 00:00:00 2001
From: q-posev <posenitskiy@irsamc.ups-tlse.fr>
Date: Tue, 1 Jun 2021 18:12:15 +0200
Subject: [PATCH] use newline character as a delimeter for array of strings

---
 src/templates_front/templator_front.org | 6 +++---
 tests/test.c                            | 9 +++++++--
 tests/test.f90                          | 7 ++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/templates_front/templator_front.org b/src/templates_front/templator_front.org
index 1c96cbe..4aeedf5 100644
--- a/src/templates_front/templator_front.org
+++ b/src/templates_front/templator_front.org
@@ -1479,7 +1479,7 @@ trexio_read_$group_dset$ (trexio_t* const file, char* const dset)
   strcpy(dset, "");
   for(size_t i=0; i<dims[0]; i++){
     strcat(dset, dset_str[i]);
-    strcat(dset, " ");
+    strcat(dset, "\n");
   }
 
   for (int i=0; i<dims[0]; i++){
@@ -1520,10 +1520,10 @@ trexio_write_$group_dset$ (trexio_t* const file, const char* dset)
   }
 
   char* pch;
-  pch = strtok( (char*) dset, " ");
+  pch = strtok( (char*) dset, "\n");
   strcpy(dset_str[0], pch);
   for(size_t i=1; i<dims[0]; i++){
-    pch = strtok (NULL, " ");
+    pch = strtok (NULL, "\n");
     strcpy(dset_str[i], pch);
   }
   
diff --git a/tests/test.c b/tests/test.c
index 352c364..f62e1ca 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -63,7 +63,12 @@ int test_h5write() {
                 	 "H" ,
 	                 "H" };
   
-  char labelxxx[] = "C C C Na C C H H H Ru H H";
+  //char labelxxx[] = "C C C Na C C H H H Ru H H";
+  char labelxxx[128] = "";
+  for (int i=0; i<num; i++){
+    strcat(labelxxx,label[i]);
+    strcat(labelxxx,"\n");
+  }
 
 /*================= START OF TEST ==================*/
 
@@ -175,7 +180,7 @@ int test_h5read() {
   printf("%s\n", labelxxx);
   //assert( strcmp(label[1], "Na") == 0 );
   char * pch;
-  pch = strtok(labelxxx, " ");
+  pch = strtok(labelxxx, "\n");
   assert( strcmp(pch, "C") == 0 );
 
   // close current session
diff --git a/tests/test.f90 b/tests/test.f90
index 4975303..4adabe1 100644
--- a/tests/test.f90
+++ b/tests/test.f90
@@ -10,7 +10,7 @@ subroutine test_write()
 ! ============ Test write functionality =============== !
 
   use trexio
-  use, intrinsic :: iso_c_binding
+  use, intrinsic :: iso_c_binding, only: c_new_line
 
   implicit none
 
@@ -46,7 +46,8 @@ subroutine test_write()
 
   label_str=''
   do i = 1,num
-    label_str=label_str//trim(label(i))//' '
+!    label_str=label_str//trim(label(i))//' '
+    label_str=label_str//trim(label(i))//c_new_line
   enddo
 
 
@@ -154,7 +155,7 @@ subroutine test_read()
     tmp_str=''
     do j=ind,128
 
-      if ( (label_str(j)==" ") ) then
+      if ( (label_str(j)==c_new_line) ) then
 	ind=j+1
 	exit
       endif