Merge pull request #26 from yangbai90/devel

Devel

Author: yangbai90

examples/tutorial/step3.i

@@ -0,0 +1,58 @@
+[mesh]
+  type=asfem
+  dim=2
+  xmax=5.0
+  ymax=5.0
+  nx=50
+  ny=50
+  meshtype=quad4
+[end]
+
+[dofs]
+name=ux uy
+[end]
+
+[elmts]
+  [mysolid]
+    type=mechanics
+    dofs=ux uy
+    mate=mymate
+  [end]
+[end]
+
+[mates]
+  [mymate]
+    type=linearelastic
+    params=210.0 0.3
+  [end]
+[end]
+
+[bcs]
+  [fixbottomX]
+    type=dirichlet
+    dof=ux
+    value=0.0
+    boundary=bottom
+  [end]
+  [fixbottomY]
+    type=dirichlet
+    dof=uy
+    value=0.0
+    boundary=bottom
+  [end]
+  [loadY]
+    type=dirichlet
+    dof=uy
+    value=0.1
+    boundary=top
+  [end]
+[end]
+
+[projection]
+name=vonMises stress_xx stress_yy stress_xy
+[end]
+
+[job]
+  type=static
+  debug=dep
+[end]

examples/tutorial/step4.i

@@ -0,0 +1,50 @@
+[mesh]
+  type=asfem
+  dim=3
+  xmax=1.0
+  ymax=1.0
+  zmax=10.0
+  nx=5
+  ny=5
+  nz=50
+  meshtype=hex8
+[end]
+
+[dofs]
+name=c
+[end]
+
+[elmts]
+  [mydiffusion]
+    type=diffusion
+    dofs=c
+    mate=mymate
+  [end]
+[end]
+
+[mates]
+  [mymate]
+    type=constdiffusion
+    params=1.0e1
+  [end]
+[end]
+
+[bcs]
+  [flux]
+    type=neumann
+    dof=c
+    value=-0.5
+    boundary=front
+  [end]
+[end]
+
+[timestepping]
+  type=be
+  dt=1.0e-3
+  time=1.0e0
+[end]
+
+[job]
+  type=transient
+  debug=dep
+[end]

examples/tutorial/step5.i

@@ -0,0 +1,57 @@
+[mesh]
+  type=asfem
+  dim=2
+  xmax=4.0
+  ymax=4.0
+  nx=100
+  ny=100
+  meshtype=quad4
+[end]
+
+[dofs]
+name=c mu
+[end]
+
+[elmts]
+  [mych]
+    type=cahnhilliard
+    dofs=c mu
+    mate=myf
+  [end]
+[end]
+
+[mates]
+  [myf]
+    type=cahnhilliard
+    params=1.0 2.5 0.005
+    //     D   Chi Kappa
+  [end]
+[end]
+
+[timestepping]
+  type=be
+  dt=1.0e-5
+  time=3.0e3
+  adaptive=true
+  optiters=3
+  growthfactor=1.1
+  cutfactor=0.85
+[end]
+
+[nonlinearsolver]
+  type=nr
+  solver=superlu
+[end]
+
+[ics]
+  [ic1]
+    type=random
+    dof=c
+    params=0.6 0.66
+  [end]
+[end]
+
+[job]
+  type=transient
+  debug=dep
+[end]

scripts/Clean.py

@@ -12,7 +12,7 @@
 currentdir=os.getcwd()
 print('We are in folder:%s\n'%(currentdir))
 
-ASFEM=0;cmakefolder=0;ideafolder=0;o=0;vtu=0
+ASFEM=0;cmakefolder=0;ideafolder=0;o=0;vtu=0;metafile=0
 cmake=0
 for subdir,dirs,files in os.walk(currentdir):
     if ('external/eigen' in subdir) or ('.git' in subdir):
@@ -49,6 +49,13 @@
                 os.remove(removepath)
             except:
                 print('%s is not here'%(file))
+        elif ('.avi' in file) or ('.gif' in file):
+            try:
+                metafile+=1
+                removepath=subdir+'/'+file
+                os.remove(removepath)
+            except:
+                print('%s is not here'%(file))
     #>> clean folder
     for dir in dirs:
         if '.idea' in dir:
@@ -75,6 +82,7 @@
 print('Remove %4d ASFEM files!'%(ASFEM))
 print('Remove %4d vtu files!'%(vtu))
 print('Remove %4d .o files!'%(o))
+print('Remove %4d meta files!'%(metafile))
 print('Remove %4d .idea folder!'%(ideafolder))
 print('Remove %4d cmake file!'%(cmake))
 print('Remove %4d cmake folder!'%(cmakefolder))

src/InputSystem/ReadTimeSteppingBlock.cpp

@@ -61,7 +61,7 @@ bool InputSystem::ReadTimeSteppingBlock(ifstream &in,string str,int &linenum,Tim
                substr.length()==2){
                 HasType=true;
                 timesteppingBlock._TimeSteppingType=TimeSteppingType::CRANCKNICLSON;
-                timesteppingBlock._TimeSteppingTypeName="crank–nicolson";
+                timesteppingBlock._TimeSteppingTypeName="crank-nicolson";
             }
             else if((substr.find("gl")!=string::npos||substr.find("GL")!=string::npos)&&
                substr.length()==2){
@@ -277,12 +277,12 @@ bool InputSystem::ReadTimeSteppingBlock(ifstream &in,string str,int &linenum,Tim
         }
         else if(str.find("[]")!=string::npos){
             MessagePrinter::PrintErrorInLineNumber(linenum);
-            MessagePrinter::PrintErrorTxt("the bracket pair is not complete in the [nonlinearsolver] block",false);
+            MessagePrinter::PrintErrorTxt("the bracket pair is not complete in the [timestepping] block",false);
             MessagePrinter::AsFem_Exit();
         }
         else{
             MessagePrinter::PrintErrorInLineNumber(linenum);
-            MessagePrinter::PrintErrorTxt("unknown option in [nonlinearsolver] block",false);
+            MessagePrinter::PrintErrorTxt("unknown option in [timestepping] block",false);
             MessagePrinter::AsFem_Exit();
         }
         getline(in,str);linenum+=1;

src/NonlinearSolver/NonlinearSolver.cpp

@@ -55,6 +55,7 @@ void NonlinearSolver::Init(){
     SNESGetKSP(_snes,&_ksp);
     KSPGMRESSetRestart(_ksp,1400);
     KSPGetPC(_ksp,&_pc);
+    PCFactorSetMatSolverType(_pc,MATSOLVERPETSC);
 
     if(_LinearSolverName=="mumps"){
         PCSetType(_pc,PCLU);

src/TimeStepping/TimeSteppingInit.cpp

@@ -58,7 +58,7 @@ void TimeStepping::Init(){
     SNESGetKSP(_snes,&_ksp);
     KSPGMRESSetRestart(_ksp,1400);
     KSPGetPC(_ksp,&_pc);
-    PCSetType(_pc,PCLU);
+    PCFactorSetMatSolverType(_pc,MATSOLVERPETSC);
 
     if(_LinearSolverName=="mumps"){
         PCSetType(_pc,PCLU);

tests/transient/cahnhilliard2d.i

@@ -51,7 +51,7 @@ name=c mu
   maxiters=50
   r_rel_tol=1.0e-8
   r_abs_tol=1.0e-7
-  solver=superlu
+  solver=ksp
 [end]
 
 [projection]