Commit 898a071e authored by Graham, Aaron's avatar Graham, Aaron
Browse files

Hotfix strings

Use stof/stoi in XMLProc and make them elemental
parent 703d1fce
......@@ -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
......
......@@ -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
......
Markdown is supported
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