Commit 38d46c10 authored by Graham, Aaron's avatar Graham, Aaron
Browse files

Merge branch 'hotfix_strings' into 'master'

Hotfix strings

See merge request futility/Futility!369
parents 703d1fce 898a071e
Loading
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -17155,10 +17155,10 @@ RECURSIVE SUBROUTINE procXMLTree(thisParam,parent,currentPath)
        intVal=CHAR(attrVal)
        CALL thisParam%add(CHAR(tmpPath),intVal)
      CASE('FLOAT')
        singleVal=CHAR(attrVal)
        singleVal=attrVal%stof()
        CALL thisParam%add(CHAR(tmpPath),singleVal,'XML_IN_VAL='//attrval)
      CASE('DOUBLE')
        doubleVal=CHAR(attrVal)
        doubleVal=attrVal%stof()
        CALL thisParam%add(CHAR(tmpPath),doubleVal,'XML_IN_VAL='//attrval)
      CASE('STRING')
        CALL thisParam%add(CHAR(tmpPath),attrVal)
@@ -17392,7 +17392,7 @@ RECURSIVE SUBROUTINE paramToXML(param,currPath,currElem)
      IF(idx > 0) THEN
        idx=idx+11
        oVal = param%description%substr(idx,LEN_TRIM(param%description))
        oSingleVal=CHAR(oVal)
        oSingleVal=oVal%stof()
        CALL param%get(TRIM(param%name),singleVal)
        IF(singleVal == oSingleVal) THEN
@@ -17410,7 +17410,7 @@ RECURSIVE SUBROUTINE paramToXML(param,currPath,currElem)
      IF(idx > 0) THEN
        idx=idx+11
        oVal = param%description%substr(idx,LEN_TRIM(param%description))
        oDoubleVal=CHAR(oVal)
        oDoubleVal=oVal%stof()
        CALL param%get(TRIM(param%name),doubleVal)
        IF(doubleVal == oDoubleVal) THEN
+2 −2
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ ENDFUNCTION greaterthanequal_StringType_StringType
!> @param stp end of conversion
!> @returns i the integer that will be output
!>
FUNCTION str_to_sik(this,stt,stp) RESULT(i)
ELEMENTAL FUNCTION str_to_sik(this,stt,stp) RESULT(i)
  CLASS(StringType),INTENT(IN) :: this
  INTEGER(SIK),INTENT(IN),OPTIONAL :: stt
  INTEGER(SIK),INTENT(IN),OPTIONAL :: stp
@@ -1291,7 +1291,7 @@ ENDFUNCTION str_to_sik
!> @param stp end of conversion
!> @returns r the float that will be output
!>
FUNCTION str_to_srk(this,stt,stp) RESULT(r)
ELEMENTAL FUNCTION str_to_srk(this,stt,stp) RESULT(r)
  CLASS(StringType),INTENT(IN) :: this
  INTEGER(SIK),INTENT(IN),OPTIONAL :: stt
  INTEGER(SIK),INTENT(IN),OPTIONAL :: stp