Commit 4f4c359e authored by Salko Jr, Robert's avatar Salko Jr, Robert
Browse files

Build fix 

Description:

CASL Ticket # - N/A
parent f51de344

SubKit/build/genDeck.py

+3 −2
Original line number Diff line number Diff line
@@ -939,12 +939,13 @@ def writeDeck(model, filename): 


    if len(model.vuq_mult) > 0:

        with open('vuq_mult.txt', 'w') as vuq:

            for key in model.vuq_mult.keys():

            # Need to keep ordering consistent so we do not fail regression tests

            for key in sorted(model.vuq_mult.keys()):

                vuq.write('{:s} = {:e}\n'.format(key, model.vuq_mult[key]))



    if len(model.vuq_param) > 0:

        with open('vuq_param.txt', 'w') as vuq:

            for key in model.vuq_param.keys():

            for key in sorted(model.vuq_param.keys()):

                vuq.write('{:s} = {:e}\n'.format(key, model.vuq_param[key]))

SubKit/build/workbench/input.sch

+2 −2
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ vuq{ 
      MaxOccurs=1

      InputTmpl="flag"

      k_xkwlxA{

         Description="A coefficient in CTF two-phase multiplier model Phi**2=A*alpha_liq**B."

         Description="A coefficient in CTF two-phase multiplier model: :math:`\Phi^2=A*\alpha_l^B`."

         MinOccurs=0

         MaxOccurs=1

         InputTmpl="value.flag"
@@ -1405,7 +1405,7 @@ vuq{ 
         }

      }

      k_xkwlxB{

         Description="B coefficient in CTF two-phase multiplier model Phi**2=A*alpha_liq**B."

         Description="B coefficient in CTF two-phase multiplier model: :math:`\Phi^2=A*\alpha_l^B`."

         MinOccurs=0

         MaxOccurs=1

         InputTmpl="value.flag"

doc/docprint.py

+5 −1
Original line number Diff line number Diff line
@@ -55,7 +55,11 @@ for line in f.readlines(): 
        indent = indent - 1

    elif "Description" in line:

        splitline = line.split("=")

        descriptions[parent + name] = splitline[1].strip()[1:-1]

        # In case an equation was typed containing equal signs, combine the rest of the list into one string

        string = splitline[1]

        for i in range(2, len(splitline)):

            string = string + '=' + splitline[i]

        descriptions[parent + name] = string.strip()[1:-1]

    elif "ValType" in line:

        splitline = line.split("=")

        types[parent + name] = splitline[1].strip()

doc/input_file.rst

+2 −2
Original line number Diff line number Diff line
@@ -1156,7 +1156,7 @@ param 


k_xkwlxA

^^^^^^^^

:Description: A coefficient in CTF two-phase multiplier model Phi**

:Description: A coefficient in CTF two-phase multiplier model: :math:`\Phi^2=A*\alpha_l^B`.

:Min Occurance: 0

:Max Occurance: 1

:Units: n/a
@@ -1165,7 +1165,7 @@ k_xkwlxA 


k_xkwlxB

^^^^^^^^

:Description: B coefficient in CTF two-phase multiplier model Phi**

:Description: B coefficient in CTF two-phase multiplier model: :math:`\Phi^2=A*\alpha_l^B`.

:Min Occurance: 0

:Max Occurance: 1

:Units: n/a

tests/inputRegression/pincell_steadystate.vuq_mult.txt.gold

+8 −6
Original line number Diff line number Diff line 
k_xk_anrflm = 1.200000e+00

ka_xk_slg = 1.000000e-01

ka_xk_sb = 1.000000e-01

k_xk_slg = 1.100000e+00

k_xk_sb = 9.000000e-01

ka_xk_anrflm = 1.000000e-01
 
k_hspl = 1.000000e+00

k_xk_anrflm = 1.000000e+00

k_xk_sb = 1.000000e+00

k_xk_slg = 1.000000e+00

ka_hspl = 0.000000e+00

ka_xk_anrflm = 0.000000e+00

ka_xk_sb = 0.000000e+00

ka_xk_slg = 0.000000e+00