fixed error with Noutput counter and few other newstate related changes (nonlocal)

code/constitutive.f90

@@ -33,18 +33,16 @@ module constitutive
    constitutive_sizeDotState, &                                                                      !< size of dotState array
    constitutive_sizeState, &                                                                         !< size of state array per grain
    constitutive_sizePostResults                                                                      !< size of postResults array per grain
- integer(pInt), public, protected :: &
-   constitutive_maxSizeDotState, &
-   constitutive_maxSizePostResults
  integer(pInt), private :: &
    constitutive_maxSizeState
 #else
  integer(pInt), public, dimension(:,:,:), allocatable :: &
    constitutive_sizePostResults                                                                      !< size of postResults array per grain
+#endif 
  integer(pInt), public, protected :: &
    constitutive_maxSizePostResults, &
    constitutive_maxSizeDotState
-#endif 
+
  public :: & 
    constitutive_init, &
    constitutive_homogenizedC, &
@@ -445,7 +443,7 @@ subroutine constitutive_init
 
  if (nonlocalConstitutionPresent) & 
 #ifdef NEWSTATE
-   call constitutive_nonlocal_stateInit(mappingConstitutive)
+   call constitutive_nonlocal_stateInit()
 #else
    call constitutive_nonlocal_stateInit(constitutive_state0(1,1:iMax,1:eMax))
 #endif
@@ -633,7 +631,7 @@ subroutine constitutive_microstructure(temperature, Fe, Fp, ipc, ip, el)
 #endif
    case (PLASTICITY_NONLOCAL_ID)
 #ifdef NEWSTATE
-     call constitutive_nonlocal_microstructure(mappingConstitutive,Fe,Fp,ipc,ip,el)
+     call constitutive_nonlocal_microstructure(Fe,Fp,ipc,ip,el)
 #else
      call constitutive_nonlocal_microstructure(constitutive_state,Fe,Fp,ipc,ip,el)
 #endif 
@@ -730,7 +728,7 @@ subroutine constitutive_LpAndItsTangent(Lp, dLp_dTstar, Tstar_v, temperature, ip
    case (PLASTICITY_NONLOCAL_ID)
 #ifdef NEWSTATE
      call constitutive_nonlocal_LpAndItsTangent(Lp, dLp_dTstar, Tstar_v, &
-                                   temperature, mappingConstitutive, ipc,ip,el)
+                                   temperature, ipc,ip,el)
 #else
      call constitutive_nonlocal_LpAndItsTangent(Lp, dLp_dTstar, Tstar_v, &
                                    temperature, constitutive_state(ipc,ip,el), ipc,ip,el)
@@ -952,9 +950,10 @@ subroutine constitutive_collectDotState(Tstar_v, FeArray, FpArray, Temperature,
 #endif
    case (PLASTICITY_NONLOCAL_ID)
 #ifdef NEWSTATE
+!*
      plasticState(mappingConstitutive(2,ipc,ip,el))%dotState(:,mappingConstitutive(1,ipc,ip,el)) = &
                                          constitutive_nonlocal_dotState(Tstar_v, FeArray, FpArray, &
-                                                          Temperature, mappingConstitutive, subdt, &
+                                                                              Temperature,  subdt, &
                                                                           subfracArray, ipc, ip, el)
 
 #else
@@ -1019,7 +1018,7 @@ logical function constitutive_collectDeltaState(Tstar_v, ipc, ip, el)
    case (PLASTICITY_NONLOCAL_ID)
      constitutive_collectDeltaState = .true.
 #ifdef NEWSTATE
-     call constitutive_nonlocal_deltaState(mappingConstitutive, Tstar_v,ipc,ip,el)
+     call constitutive_nonlocal_deltaState(Tstar_v,ip,el)
 #else
      call constitutive_nonlocal_deltaState(constitutive_deltaState(ipc,ip,el),&
                                       constitutive_state(ipc,ip,el), Tstar_v,ipc,ip,el)

code/constitutive_dislotwin.f90

@@ -338,93 +338,93 @@ subroutine constitutive_dislotwin_init(fileUnit)
        case ('(output)')
          select case(IO_lc(IO_stringValue(line,positions,2_pInt)))
            case ('edge_density')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = edge_density_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = edge_density_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('dipole_density')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = dipole_density_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = dipole_density_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('shear_rate_slip')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = shear_rate_slip_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = shear_rate_slip_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('accumulated_shear_slip')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = accumulated_shear_slip_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = accumulated_shear_slip_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('mfp_slip')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = mfp_slip_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = mfp_slip_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('resolved_stress_slip')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = resolved_stress_slip_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = resolved_stress_slip_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('edge_dipole_distance')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = edge_dipole_distance_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = edge_dipole_distance_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('stress_exponent')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = stress_exponent_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = stress_exponent_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('twin_fraction')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = twin_fraction_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = twin_fraction_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('shear_rate_twin')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = shear_rate_twin_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = shear_rate_twin_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('accumulated_shear_twin')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = accumulated_shear_twin_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = accumulated_shear_twin_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('mfp_twin')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = mfp_twin_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = mfp_twin_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('resolved_stress_twin')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = resolved_stress_twin_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = resolved_stress_twin_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('threshold_stress_twin')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = threshold_stress_twin_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = threshold_stress_twin_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('resolved_stress_shearband')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = resolved_stress_shearband_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = resolved_stress_shearband_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('shear_rate_shearband')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = shear_rate_shearband_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = shear_rate_shearband_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('sb_eigenvalues')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = sb_eigenvalues_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = sb_eigenvalues_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('sb_eigenvectors')
-             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = sb_eigenvectors_ID
              constitutive_dislotwin_Noutput(instance) = constitutive_dislotwin_Noutput(instance) + 1_pInt
+             constitutive_dislotwin_outputID(constitutive_dislotwin_Noutput(instance),instance) = sb_eigenvectors_ID
              constitutive_dislotwin_output(constitutive_dislotwin_Noutput(instance),instance) = &
                                                        IO_lc(IO_stringValue(line,positions,2_pInt))
           end select

code/constitutive_j2.f90

@@ -225,8 +225,8 @@ subroutine constitutive_j2_init(fileUnit)
        case ('(output)')
          select case(IO_lc(IO_stringValue(line,positions,2_pInt)))
            case ('flowstress')
-             constitutive_j2_outputID(constitutive_j2_Noutput(instance),instance) = flowstress_ID
              constitutive_j2_Noutput(instance) = constitutive_j2_Noutput(instance) + 1_pInt
+             constitutive_j2_outputID(constitutive_j2_Noutput(instance),instance) = flowstress_ID
              constitutive_j2_output(constitutive_j2_Noutput(instance),instance) = &
                                                 IO_lc(IO_stringValue(line,positions,2_pInt))
 #ifdef HDF 
@@ -235,8 +235,8 @@ subroutine constitutive_j2_init(fileUnit)
              constitutive_j2_Output2(instance)%flowstressActive = .true.
 #endif
            case ('strainrate')
-             constitutive_j2_outputID(constitutive_j2_Noutput(instance),instance) = strainrate_ID
              constitutive_j2_Noutput(instance) = constitutive_j2_Noutput(instance) + 1_pInt
+             constitutive_j2_outputID(constitutive_j2_Noutput(instance),instance) = strainrate_ID
              constitutive_j2_output(constitutive_j2_Noutput(instance),instance) = &
                                                 IO_lc(IO_stringValue(line,positions,2_pInt))
 #ifdef HDF 

code/constitutive_phenopowerlaw.f90

@@ -264,53 +264,53 @@ allocate(constitutive_phenopowerlaw_sizePostResults(maxNinstance),
        case ('(output)')
          select case(IO_lc(IO_stringValue(line,positions,2_pInt)))
            case ('resistance_slip')
-             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = resistance_slip_ID
              constitutive_phenopowerlaw_Noutput(instance) = constitutive_phenopowerlaw_Noutput(instance) + 1_pInt
+             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = resistance_slip_ID
              constitutive_phenopowerlaw_output(constitutive_phenopowerlaw_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('accumulatedshear_slip')
-             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = accumulatedshear_slip_ID
              constitutive_phenopowerlaw_Noutput(instance) = constitutive_phenopowerlaw_Noutput(instance) + 1_pInt
+             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = accumulatedshear_slip_ID
              constitutive_phenopowerlaw_output(constitutive_phenopowerlaw_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('shearrate_slip')
-             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = shearrate_slip_ID
              constitutive_phenopowerlaw_Noutput(instance) = constitutive_phenopowerlaw_Noutput(instance) + 1_pInt
+             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = shearrate_slip_ID
              constitutive_phenopowerlaw_output(constitutive_phenopowerlaw_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('resolvedstress_slip')
-             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = resolvedstress_slip_ID
              constitutive_phenopowerlaw_Noutput(instance) = constitutive_phenopowerlaw_Noutput(instance) + 1_pInt
+             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = resolvedstress_slip_ID
              constitutive_phenopowerlaw_output(constitutive_phenopowerlaw_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('totalshear')
-             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = totalshear_ID
              constitutive_phenopowerlaw_Noutput(instance) = constitutive_phenopowerlaw_Noutput(instance) + 1_pInt
+             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = totalshear_ID
              constitutive_phenopowerlaw_output(constitutive_phenopowerlaw_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('resistance_twin')
-             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = resistance_twin_ID
              constitutive_phenopowerlaw_Noutput(instance) = constitutive_phenopowerlaw_Noutput(instance) + 1_pInt
+             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = resistance_twin_ID
              constitutive_phenopowerlaw_output(constitutive_phenopowerlaw_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('accumulatedshear_twin')
-             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = accumulatedshear_twin_ID
              constitutive_phenopowerlaw_Noutput(instance) = constitutive_phenopowerlaw_Noutput(instance) + 1_pInt
+             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = accumulatedshear_twin_ID
              constitutive_phenopowerlaw_output(constitutive_phenopowerlaw_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('shearrate_twin')
-             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = shearrate_twin_ID
              constitutive_phenopowerlaw_Noutput(instance) = constitutive_phenopowerlaw_Noutput(instance) + 1_pInt
+             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = shearrate_twin_ID
              constitutive_phenopowerlaw_output(constitutive_phenopowerlaw_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('resolvedstress_twin')
-             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = resolvedstress_twin_ID
              constitutive_phenopowerlaw_Noutput(instance) = constitutive_phenopowerlaw_Noutput(instance) + 1_pInt
+             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = resolvedstress_twin_ID
              constitutive_phenopowerlaw_output(constitutive_phenopowerlaw_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('totalvolfrac')
-             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = totalvolfrac_ID
              constitutive_phenopowerlaw_Noutput(instance) = constitutive_phenopowerlaw_Noutput(instance) + 1_pInt
+             constitutive_phenopowerlaw_outputID(constitutive_phenopowerlaw_Noutput(instance),instance) = totalvolfrac_ID
              constitutive_phenopowerlaw_output(constitutive_phenopowerlaw_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case default

code/constitutive_titanmod.f90

@@ -363,148 +363,148 @@ subroutine constitutive_titanmod_init(fileUnit)
        case ('(output)')
          select case(IO_lc(IO_stringValue(line,positions,2_pInt)))
            case ('rhoedge')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoedge_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoedge_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('rhoscrew')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoscrew_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoscrew_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('segment_edge')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = segment_edge_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = segment_edge_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('segment_screw')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = segment_screw_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = segment_screw_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('resistance_edge')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = resistance_edge_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = resistance_edge_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('resistance_screw')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = resistance_screw_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = resistance_screw_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('velocity_edge')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = velocity_edge_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = velocity_edge_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('velocity_screw')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = velocity_screw_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = velocity_screw_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('tau_slip')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = tau_slip_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = tau_slip_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('gdot_slip_edge')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = gdot_slip_edge_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = gdot_slip_edge_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('gdot_slip_screw')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = gdot_slip_screw_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = gdot_slip_screw_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('gdot_slip')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = gdot_slip_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = gdot_slip_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('stressratio_edge_p')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = stressratio_edge_p_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = stressratio_edge_p_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('stressratio_screw_p')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = stressratio_screw_p_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = stressratio_screw_p_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('shear_system')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_system_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_system_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('twin_fraction')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = twin_fraction_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = twin_fraction_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('shear_basal')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_basal_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_basal_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('shear_prism')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_prism_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_prism_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('shear_pyra')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_pyra_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_pyra_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('shear_pyrca')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_pyrca_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_pyrca_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('rhoedge_basal')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoedge_basal_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoedge_basal_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('rhoedge_prism')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoedge_prism_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoedge_prism_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('rhoedge_pyra')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoedge_pyra_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoedge_pyra_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('rhoedge_pyrca')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoedge_pyrca_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoedge_pyrca_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('rhoscrew_basal')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoscrew_basal_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoscrew_basal_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('rhoscrew_prism')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoscrew_prism_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoscrew_prism_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('rhoscrew_pyra')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoscrew_pyra_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoscrew_pyra_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('rhoscrew_pyrca')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoscrew_pyrca_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = rhoscrew_pyrca_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
            case ('shear_total')
-             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_total_ID
              constitutive_titanmod_Noutput(instance) = constitutive_titanmod_Noutput(instance) + 1_pInt
+             constitutive_titanmod_outputID(constitutive_titanmod_Noutput(instance),instance) = shear_total_ID
              constitutive_titanmod_output(constitutive_titanmod_Noutput(instance),instance) = &
                                                            IO_lc(IO_stringValue(line,positions,2_pInt))
          end select