last remaining outputID enums removed

src/damage_local.f90

@@ -16,15 +16,9 @@ module damage_local
   implicit none
   private
 
-  enum, bind(c) 
-    enumerator :: &
-      undefined_ID, &
-      damage_ID
-  end enum
-
   type :: tParameters
-    integer(kind(undefined_ID)), dimension(:),   allocatable :: &
-      outputID
+    character(len=pStringLen), allocatable, dimension(:) :: &
+      output
   end type tParameters
 
   type(tparameters),             dimension(:),   allocatable :: &
@@ -33,7 +27,7 @@ module damage_local
   public :: &
     damage_local_init, &
     damage_local_updateState, &
-    damage_local_Results
+    damage_local_results
 
 contains
 
@@ -43,8 +37,7 @@ contains
 !--------------------------------------------------------------------------------------------------
 subroutine damage_local_init
 
-  integer :: maxNinstance,o,NofMyHomog,h
-  character(len=pStringLen), dimension(:), allocatable :: outputs
+  integer :: maxNinstance,NofMyHomog,h
 
   write(6,'(/,a)') ' <<<+-  damage_'//DAMAGE_local_label//' init  -+>>>'; flush(6)
 
@@ -57,15 +50,7 @@ subroutine damage_local_init
     if (damage_type(h) /= DAMAGE_LOCAL_ID) cycle
     associate(prm => param(damage_typeInstance(h)),config => config_homogenization(h))
 
-    outputs = config%getStrings('(output)',defaultVal=emptyStringArray)
-    allocate(prm%outputID(0))
-    
-    do o=1, size(outputs)
-      select case(outputs(o))
-        case ('damage')
-          prm%outputID = [prm%outputID , damage_ID]
-      end select     
-    enddo
+    prm%output = config%getStrings('(output)',defaultVal=emptyStringArray)
 
     NofMyHomog = count(material_homogenizationAt == h)
     damageState(h)%sizeState = 1
@@ -179,14 +164,13 @@ subroutine damage_local_results(homog,group)
 
   integer,          intent(in) :: homog
   character(len=*), intent(in) :: group
+
   integer :: o
 
   associate(prm => param(damage_typeInstance(homog)))
-
-  outputsLoop: do o = 1,size(prm%outputID)
-    select case(prm%outputID(o))
-    
-      case (damage_ID)
+  outputsLoop: do o = 1,size(prm%output)
+    select case(prm%output(o))
+      case ('damage')
         call results_writeDataset(group,damage(homog)%p,'phi',&
                                   'damage indicator','-')
     end select

src/damage_nonlocal.f90

@@ -18,15 +18,9 @@ module damage_nonlocal
   implicit none
   private
 
-  enum, bind(c) 
-    enumerator :: &
-      undefined_ID, &
-      damage_ID
-  end enum
-
   type :: tParameters
-    integer(kind(undefined_ID)), dimension(:), allocatable :: &
-      outputID
+    character(len=pStringLen), allocatable, dimension(:) :: &
+      output
   end type tParameters
 
   type(tparameters),             dimension(:), allocatable :: &
@@ -38,7 +32,7 @@ module damage_nonlocal
     damage_nonlocal_getDiffusion33, &
     damage_nonlocal_getMobility, &
     damage_nonlocal_putNonLocalDamage, &
-    damage_nonlocal_Results
+    damage_nonlocal_results
 
 contains
 
@@ -48,8 +42,7 @@ contains
 !--------------------------------------------------------------------------------------------------
 subroutine damage_nonlocal_init
 
-  integer :: maxNinstance,o,NofMyHomog,h
-  character(len=pStringLen), dimension(:), allocatable :: outputs
+  integer :: maxNinstance,NofMyHomog,h
 
   write(6,'(/,a)') ' <<<+-  damage_'//DAMAGE_nonlocal_label//' init  -+>>>'; flush(6)
 
@@ -62,15 +55,7 @@ subroutine damage_nonlocal_init
     if (damage_type(h) /= DAMAGE_NONLOCAL_ID) cycle
     associate(prm => param(damage_typeInstance(h)),config => config_homogenization(h))
 
-    outputs = config%getStrings('(output)',defaultVal=emptyStringArray)
-    allocate(prm%outputID(0))
-    
-    do o=1, size(outputs)
-      select case(outputs(o))
-         case ('damage')
-           prm%outputID = [prm%outputID, damage_ID]
-      end select
-    enddo
+    prm%output = config%getStrings('(output)',defaultVal=emptyStringArray)
 
     NofMyHomog = count(material_homogenizationAt == h)
     damageState(h)%sizeState = 1
@@ -220,14 +205,13 @@ subroutine damage_nonlocal_results(homog,group)
 
   integer,          intent(in) :: homog
   character(len=*), intent(in) :: group
+
   integer :: o
 
   associate(prm => param(damage_typeInstance(homog)))
-
-  outputsLoop: do o = 1,size(prm%outputID)
-    select case(prm%outputID(o))
-    
-      case (damage_ID)
+  outputsLoop: do o = 1,size(prm%output)
+    select case(prm%output(o))
+      case ('damage')
         call results_writeDataset(group,damage(homog)%p,'phi',&
                                   'damage indicator','-')
     end select