Commit 2b89fc1c authored by Salko Jr, Robert's avatar Salko Jr, Robert
Browse files

Change how CHF model gets set 

It is better to disable CHF by default and enable post-check by
default.  If the user explicitly sets post-check and runs a transient,
warn them and set the post-check model to the chf model.  If not,
just silently disable the post-check and keep chf off.
parent 45379586

SubKit/build/Model.py

+3 −1
Original line number Diff line number Diff line
@@ -1211,8 +1211,10 @@ class Model: 
   def _chfChecks(me):

       if not me.runSteadyState and me.conductorOptions['postChfCheck']!='none':

           if me.conductorOptionsSet['postChfCheck']:

              # If the post CHF model was explicitly set, warn the user and set the chf model to this

              warnings.warn("Cannot use post CHF checks when running a transient.  The CHF model will be turned on with the same option instead.")

              me.conductorOptions['chfModel'] = me.conductorOptions['postChfCheck']

           # The post-CHF check is not valid for transients, so disable it

           me.conductorOptions['postChfCheck']='none'



class Gap(object):

tests/ctfTraining/pincell/deck.inp.gold

+108 −108
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ ctf model 
    8

*Card 8.1

** NRRD   NSRD    NC  NRTB  NRAD  NLTY  NSTA   NXF  NCAN  RADF    W3 IHTC  DNBCHK NDM14

      1       0     1     1     0     0     1     1     0     0    -1     1     0     0          

      1       0     1     1     0     0     1     1     0     0    -1     1     1     0

*Card 8.2

**    N   IFTY   IAXP   NRND DAXMIN  RMULT        HGAP  ISECR  HTAMB   TAMB  SYMROD  HTCMAP TKEMAP NSUBAX NSUBAZ

*Card 8.3

tests/inputRegression/2x2_transient.inp.gold

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ ctf model 
    8

*Card 8.1

** NRRD   NSRD    NC  NRTB  NRAD  NLTY  NSTA   NXF  NCAN  RADF    W3 IHTC  DNBCHK NDM14

      4       0     1     1     0     0     1     1     0     0     1     1    -1     0

      4       0     1     1     0     0     1     1     0     0    -1     1    -1     0

*Card 8.2

**    N   IFTY   IAXP   NRND DAXMIN  RMULT        HGAP  ISECR  HTAMB   TAMB  SYMROD  HTCMAP TKEMAP NSUBAX NSUBAZ

*Card 8.3

tests/inputRegression/pincell_transient_multiple_groups.inp.gold

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ ctf model 
    8

*Card 8.1

** NRRD   NSRD    NC  NRTB  NRAD  NLTY  NSTA   NXF  NCAN  RADF    W3 IHTC  DNBCHK NDM14

      1       0     1     1     0     0     1     1     0     0     1     1    -1     0

      1       0     1     1     0     0     1     1     0     0    -1     1    -1     0

*Card 8.2

**    N   IFTY   IAXP   NRND DAXMIN  RMULT        HGAP  ISECR  HTAMB   TAMB  SYMROD  HTCMAP TKEMAP NSUBAX NSUBAZ

*Card 8.3

tests/inputRegression/pincell_transient_one_group.inp.gold

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ ctf model 
    8

*Card 8.1

** NRRD   NSRD    NC  NRTB  NRAD  NLTY  NSTA   NXF  NCAN  RADF    W3 IHTC  DNBCHK NDM14

      1       0     1     1     0     0     1     1     0     0     1     1    -1     0

      1       0     1     1     0     0     1     1     0     0    -1     1    -1     0

*Card 8.2

**    N   IFTY   IAXP   NRND DAXMIN  RMULT        HGAP  ISECR  HTAMB   TAMB  SYMROD  HTCMAP TKEMAP NSUBAX NSUBAZ

*Card 8.3