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
Pipeline #198978 passed with stage
in 2 minutes and 8 seconds
...@@ -17155,10 +17155,10 @@ RECURSIVE SUBROUTINE procXMLTree(thisParam,parent,currentPath) ...@@ -17155,10 +17155,10 @@ RECURSIVE SUBROUTINE procXMLTree(thisParam,parent,currentPath)
intVal=CHAR(attrVal) intVal=CHAR(attrVal)
CALL thisParam%add(CHAR(tmpPath),intVal) CALL thisParam%add(CHAR(tmpPath),intVal)
CASE('FLOAT') CASE('FLOAT')
singleVal=CHAR(attrVal) singleVal=attrVal%stof()
CALL thisParam%add(CHAR(tmpPath),singleVal,'XML_IN_VAL='//attrval) CALL thisParam%add(CHAR(tmpPath),singleVal,'XML_IN_VAL='//attrval)
CASE('DOUBLE') CASE('DOUBLE')
doubleVal=CHAR(attrVal) doubleVal=attrVal%stof()
CALL thisParam%add(CHAR(tmpPath),doubleVal,'XML_IN_VAL='//attrval) CALL thisParam%add(CHAR(tmpPath),doubleVal,'XML_IN_VAL='//attrval)
CASE('STRING') CASE('STRING')
CALL thisParam%add(CHAR(tmpPath),attrVal) CALL thisParam%add(CHAR(tmpPath),attrVal)
...@@ -17392,7 +17392,7 @@ RECURSIVE SUBROUTINE paramToXML(param,currPath,currElem) ...@@ -17392,7 +17392,7 @@ RECURSIVE SUBROUTINE paramToXML(param,currPath,currElem)
IF(idx > 0) THEN IF(idx > 0) THEN
idx=idx+11 idx=idx+11
oVal = param%description%substr(idx,LEN_TRIM(param%description)) oVal = param%description%substr(idx,LEN_TRIM(param%description))
oSingleVal=CHAR(oVal) oSingleVal=oVal%stof()
CALL param%get(TRIM(param%name),singleVal) CALL param%get(TRIM(param%name),singleVal)
   
IF(singleVal == oSingleVal) THEN IF(singleVal == oSingleVal) THEN
...@@ -17410,7 +17410,7 @@ RECURSIVE SUBROUTINE paramToXML(param,currPath,currElem) ...@@ -17410,7 +17410,7 @@ RECURSIVE SUBROUTINE paramToXML(param,currPath,currElem)
IF(idx > 0) THEN IF(idx > 0) THEN
idx=idx+11 idx=idx+11
oVal = param%description%substr(idx,LEN_TRIM(param%description)) oVal = param%description%substr(idx,LEN_TRIM(param%description))
oDoubleVal=CHAR(oVal) oDoubleVal=oVal%stof()
CALL param%get(TRIM(param%name),doubleVal) CALL param%get(TRIM(param%name),doubleVal)
   
IF(doubleVal == oDoubleVal) THEN IF(doubleVal == oDoubleVal) THEN
......
...@@ -1252,7 +1252,7 @@ ENDFUNCTION greaterthanequal_StringType_StringType ...@@ -1252,7 +1252,7 @@ ENDFUNCTION greaterthanequal_StringType_StringType
!> @param stp end of conversion !> @param stp end of conversion
!> @returns i the integer that will be output !> @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 CLASS(StringType),INTENT(IN) :: this
INTEGER(SIK),INTENT(IN),OPTIONAL :: stt INTEGER(SIK),INTENT(IN),OPTIONAL :: stt
INTEGER(SIK),INTENT(IN),OPTIONAL :: stp INTEGER(SIK),INTENT(IN),OPTIONAL :: stp
...@@ -1291,7 +1291,7 @@ ENDFUNCTION str_to_sik ...@@ -1291,7 +1291,7 @@ ENDFUNCTION str_to_sik
!> @param stp end of conversion !> @param stp end of conversion
!> @returns r the float that will be output !> @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 CLASS(StringType),INTENT(IN) :: this
INTEGER(SIK),INTENT(IN),OPTIONAL :: stt INTEGER(SIK),INTENT(IN),OPTIONAL :: stt
INTEGER(SIK),INTENT(IN),OPTIONAL :: stp INTEGER(SIK),INTENT(IN),OPTIONAL :: stp
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment