Two changes:
- call of concom and creep, now marc_concom and marc_creep. Franz will check if the parameters within the two modules in the new release, Mentat2007, are the same compared to the old release. - hard coded include of "constitutive.pheno". That should be changed by the mean of dynamic links
This commit is contained in:
parent
ee8266795e
commit
79c4f20f1c
|
@ -131,7 +131,7 @@
|
||||||
! Beware of changes in newer Marc versions -- these are from 2005r3
|
! Beware of changes in newer Marc versions -- these are from 2005r3
|
||||||
! concom is needed for inc, subinc, ncycle, lovl
|
! concom is needed for inc, subinc, ncycle, lovl
|
||||||
! include 'concom'
|
! include 'concom'
|
||||||
common/concom/ &
|
common/marc_concom/ &
|
||||||
iacous, iasmbl, iautth, ibear, icompl, iconj, icreep, ideva(50), idyn, idynt,&
|
iacous, iasmbl, iautth, ibear, icompl, iconj, icreep, ideva(50), idyn, idynt,&
|
||||||
ielas, ielcma, ielect, iform, ifour, iharm, ihcps, iheat, iheatt, ihresp,&
|
ielas, ielcma, ielect, iform, ifour, iharm, ihcps, iheat, iheatt, ihresp,&
|
||||||
ijoule, ilem, ilnmom, iloren, inc, incext, incsub, ipass, iplres, ipois,&
|
ijoule, ilem, ilnmom, iloren, inc, incext, incsub, ipass, iplres, ipois,&
|
||||||
|
@ -149,7 +149,7 @@
|
||||||
ishrink,ioffsflg,isetoff, iharmt, inc_incdat, iautspc,ibrake
|
ishrink,ioffsflg,isetoff, iharmt, inc_incdat, iautspc,ibrake
|
||||||
! creeps is needed for timinc (time increment)
|
! creeps is needed for timinc (time increment)
|
||||||
! include 'creeps'
|
! include 'creeps'
|
||||||
common/creeps/ &
|
common/marc_creeps/ &
|
||||||
cptim,timinc,timinc_p,timinc_s,timincm,timinc_a,timinc_b,creept(33),icptim,icfte,icfst,&
|
cptim,timinc,timinc_p,timinc_s,timincm,timinc_a,timinc_b,creept(33),icptim,icfte,icfst,&
|
||||||
icfeq,icftm,icetem,mcreep,jcreep,icpa,icftmp,icfstr,icfqcp,icfcpm,icrppr,icrcha,icpb,iicpmt,iicpa
|
icfeq,icftm,icetem,mcreep,jcreep,icpa,icftmp,icfstr,icfqcp,icfcpm,icrppr,icrcha,icpb,iicpmt,iicpa
|
||||||
!
|
!
|
||||||
|
|
Loading…
Reference in New Issue