From 527d33152f7c15399c78adb16958c9279b3f2b7c Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 10 Sep 2018 13:49:54 +0200 Subject: [PATCH] added: command line parameter to use reduced continuity (TH) elements use -mixed full use the FRTH elements. --- Test/Miehe71-explcrack-mixed_FDporo.reg | 2 +- Test/Miehe71-mixed_FDporo.reg | 2 +- Test/Miehe71-nocrack-mixed_FDporo.reg | 2 +- main_FractureDynamics.C | 8 ++++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Test/Miehe71-explcrack-mixed_FDporo.reg b/Test/Miehe71-explcrack-mixed_FDporo.reg index d10bcab..048d71a 100644 --- a/Test/Miehe71-explcrack-mixed_FDporo.reg +++ b/Test/Miehe71-explcrack-mixed_FDporo.reg @@ -1,4 +1,4 @@ -Miehe71.xinp -qstatic -explcrack -poro -mixed -nGauss 3 +Miehe71.xinp -qstatic -explcrack -poro -mixed full -nGauss 3 Input file: Miehe71.xinp Equation solver: 2 diff --git a/Test/Miehe71-mixed_FDporo.reg b/Test/Miehe71-mixed_FDporo.reg index 7b1d8d2..e9a852d 100644 --- a/Test/Miehe71-mixed_FDporo.reg +++ b/Test/Miehe71-mixed_FDporo.reg @@ -1,4 +1,4 @@ -Miehe71.xinp -qstatic -poro -mixed -nGauss 3 +Miehe71.xinp -qstatic -poro -mixed full -nGauss 3 Input file: Miehe71.xinp Equation solver: 2 diff --git a/Test/Miehe71-nocrack-mixed_FDporo.reg b/Test/Miehe71-nocrack-mixed_FDporo.reg index 1cc880d..e4d072a 100644 --- a/Test/Miehe71-nocrack-mixed_FDporo.reg +++ b/Test/Miehe71-nocrack-mixed_FDporo.reg @@ -1,4 +1,4 @@ -Miehe71.xinp -qstatic -nocrack -poro -mixed -nGauss 3 +Miehe71.xinp -qstatic -nocrack -poro -mixed full -nGauss 3 Input file: Miehe71.xinp Equation solver: 2 diff --git a/main_FractureDynamics.C b/main_FractureDynamics.C index 3af9399..6109b88 100644 --- a/main_FractureDynamics.C +++ b/main_FractureDynamics.C @@ -382,8 +382,12 @@ int main (int argc, char** argv) ; // ignore the input file on the second pass else if (SIMoptions::ignoreOldOptions(argc,argv,i)) ; // ignore the obsolete option - else if (!strcmp(argv[i],"-mixed")) - ASMmxBase::Type = ASMmxBase::FULL_CONT_RAISE_BASIS1; + else if (!strcmp(argv[i],"-mixed")) { + ASMmxBase::Type = ASMmxBase::REDUCED_CONT_RAISE_BASIS1; + if (i < argc-1 && argv[i+1][0] != '-') + if (strcmp(argv[++i],"full") == 0) + ASMmxBase::Type = ASMmxBase::FULL_CONT_RAISE_BASIS1; + } else if (!strcmp(argv[i],"-principal")) Elasticity::wantPrincipalStress = true; else if (!strncmp(argv[i],"-dbgEl",6) && i < argc-1)