Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jurabr/ufem
base: 4ed9059f67
...
head fork: jurabr/ufem
compare: 3d9544d76f
  • 3 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
6 fem/fem_chen.c
@@ -333,13 +333,13 @@ int chen_Dep(tVector *deriv, double H, tMatrix *De, tMatrix *Dep)
fDf = femVecVecMult(deriv, &Df) ;
ff = sqrt(fabs(femVecVecMult(deriv, deriv))) ;
-#if 0
- mult = fDf - fabs(H*ff) ; /* is fabs() OK here? */
+#if 1
+ mult = fDf + fabs(H*ff) ; /* is fabs() OK here? */
#else
mult = fDf + H ;
#endif
-#if 1
+#if 0
#ifdef DEVEL_VERBOSE
femMatPrn(De,"De");
femVecPrn(deriv,"deriv");
View
8 fem/fem_hard.c
@@ -46,15 +46,9 @@ double fem_plast_H_linear(long ePos,
double fy,
double sigma)
{
-#if 0
- return ( sigma/ ( ((E0-E1)*(sigma-fy)) / (E0*E1)));
-#else
- return ( (sigma*E1)/(sigma-fy));
-#endif
+ return ( E1 / (1.0 - (E1/E0)) );
}
-
-
#endif
/* end of fem_hard.c */
View
4 fem/fem_nlmc.c
@@ -29,12 +29,10 @@
#ifndef _SMALL_FEM_CODE_
#ifdef USE_NLMC
+#if 0
#ifdef _USE_THREADS_
#define NLMC_THREADS 1
#endif
-
-#if 0
-#define NLMC_THREADS 1
#endif
#ifdef NLMC_THREADS
View
47 fem/fem_nrm.c
@@ -27,13 +27,6 @@
#define LASTNORMLEN 4
-#ifdef USE_NLMC
-extern int nlmInit2D_m902(void);
-extern int nlmExit2D_m902(void);
-extern int nlmSetStatus2D_m902(long Mode);
-extern int nlmcUpdateStatus_e2m9(void);
-#endif
-
/* from fem_sol.c: */
extern void fem_sol_null(void);
extern void fem_sol_free(void);
@@ -89,10 +82,6 @@ void fem_nrm_signal_stop(int sig_num)
if (femTangentMatrix == AF_YES) { femVecSwitch(&u_tot, &u); }
femWriteRes( fem_output_file() );
-#ifdef USE_NLMC
- nlmExit2D_m902();
- femBackResFree();
-#endif
fem_sol_free();
femDataFree();
femResFree();
@@ -242,11 +231,6 @@ int femSolveNRM(long incr_type)
if ((rv = fem_sol_alloc()) != AF_OK) { goto memFree; }
if ((rv = fem_sol_res_alloc()) != AF_OK) { goto memFree; } /* __must__ be done _before_ adding of loads! */
-#ifdef USE_NLMC
- nlmInit2D_m902();
- femBackResNull();
-#endif
-
if (femTangentMatrix == AF_YES) { femVecSetZeroBig(&u_tot) ; }
femGetSumReactInit(femSumReactName); /* sum of reactions */
@@ -342,20 +326,6 @@ printf("%i u=%e normF=%e norm_u=%e\n",i,femVecGet(&u,3),femVecNormBig(&F),femVe
fprintf(msgout,"[ ] NRM %s: %3i / %3i, %s: %3i / %3i\n",_("step"),i,steps,_("iteration"),j,substeps);
#endif
-#ifdef USE_NLMC
- femMatSetZeroBig(&K); /* NLMC */
- femVecSetZeroBig(&F); /* NLMC */
- femVecSetZeroBig(&Fr); /* NLMC */
- femBackResGet(); /* NLMC*/
- if ((rv = fem_fill_K(AF_YES)) != AF_OK) { goto memFree; } /*NLMC*/
- nlmSetStatus2D_m902(AF_YES); /* NLMC */
- femBackResPut();
- nlmcUpdateStatus_e2m9(); /* NLMC */
-
- femVecSetZeroBig(&F); /* NLMC */
- femVecSetZeroBig(&Fr); /* NLMC */
-#endif
-
femVecSetZeroBig(&Fr);
femVecSetZeroBig(&F);
@@ -381,19 +351,6 @@ printf("%i u=%e normF=%e norm_u=%e\n",i,femVecGet(&u,3),femVecNormBig(&F),femVe
goto memFree;
}
-#if 0 /* THIS IS ONLY FOR TESTING !!!!!!!! */
- {
- if (femTangentMatrix == AF_YES) { femVecSwitch(&u_tot, &u); } /* really necessary? */
- solSimNum = multSum ;
- if ((rv = femWriteRes(femSubStepFname(j))) != AF_OK)
- {
- goto memFree;
- }
- if (femTangentMatrix == AF_YES) { femVecSwitch(&u_tot, &u); } /* really necessary? */
- solID++;
- }
-#endif
-
/* convergence testing: */
if ((normFr/normF) <= crit)
{
@@ -585,10 +542,6 @@ printf("%i %i u=%e normF=%e norm_u=%e i\n",i,j,femVecGet(&u,3),femVecNormBig(&F)
#endif
memFree:
-#ifdef USE_NLMC
- nlmExit2D_m902();
- femBackResFree();
-#endif
fem_sol_free();
femDataFree();
femResFree();
View
7 fem/fem_vmis.c
@@ -322,8 +322,9 @@ int fem_vmis_D_2D(long ePos,
{
D_HookIso_planeRaw(Ex, nu, Problem, &De);
- for (j=0; j<2; j++)
+ for (j=0; j<1; j++)
{
+ femVecSetZero(&sigma);
femMatVecMult(Dep, epsilon, &sigma) ;
for (i=1; i<=3; i++) { femVecAdd(&sigma,i, femVecGet(&old_sigma, i)) ; }
@@ -334,11 +335,7 @@ int fem_vmis_D_2D(long ePos,
}
else
{
-#if 1
- H = E1 / (1.0 - (E1/Ex) ) ; /* hardening parameter for bilinear behaviour */
-#else
H = fem_plast_H_linear(ePos, Ex, E1, fy, sigma_vmis2D(&sigma) );
-#endif
}
J2 = stress2D_J2(&sigma) ;

No commit comments for this range

Something went wrong with that request. Please try again.