changed common block files to release version

This commit is contained in:
Franz Roters 2010-04-28 07:28:12 +00:00
parent e8ab495a6c
commit a36951a6ac
3 changed files with 10 additions and 5 deletions

View File

@ -22,9 +22,9 @@ integer(pInt) &
ishrink, ioffsflg, isetoff, ioffsetm,iharmt, inc_incdat, iautspc, ibrake, icbush, istream_input,& ishrink, ioffsflg, isetoff, ioffsetm,iharmt, inc_incdat, iautspc, ibrake, icbush, istream_input,&
iprsinp, ivlsinp, ifirst_time,ipin_m, jgnstr_glb, imarc_return,iqvcinp, nqvceid, istpnx, imicro1,& iprsinp, ivlsinp, ifirst_time,ipin_m, jgnstr_glb, imarc_return,iqvcinp, nqvceid, istpnx, imicro1,&
iaxisymm, jbreakglue,iglstif, jfastasm,iwear, iwearcf, imixmeth, ielcmadyn, idinout, igena_meth,& iaxisymm, jbreakglue,iglstif, jfastasm,iwear, iwearcf, imixmeth, ielcmadyn, idinout, igena_meth,&
magf_meth, nofsopt, non_assumed magf_meth, non_assumed
integer(pInt) num_concom integer(pInt) num_concom
parameter(num_concom=232) parameter(num_concom=231)
common/marc_concom/& common/marc_concom/&
iacous, iasmbl, iautth, ibear, icompl, iconj, icreep, ideva(60), idyn, idynt,& iacous, iasmbl, iautth, ibear, icompl, iconj, icreep, ideva(60), idyn, idynt,&
ielas, ielcma, ielect, iform, ifour, iharm, ihcps, iheat, iheatt, ihresp,& ielas, ielcma, ielect, iform, ifour, iharm, ihcps, iheat, iheatt, ihresp,&
@ -43,7 +43,7 @@ common/marc_concom/&
ishrink, ioffsflg, isetoff, ioffsetm,iharmt, inc_incdat, iautspc, ibrake, icbush , istream_input,& ishrink, ioffsflg, isetoff, ioffsetm,iharmt, inc_incdat, iautspc, ibrake, icbush , istream_input,&
iprsinp, ivlsinp, ifirst_time,ipin_m, jgnstr_glb, imarc_return,iqvcinp, nqvceid, istpnx, imicro1,& iprsinp, ivlsinp, ifirst_time,ipin_m, jgnstr_glb, imarc_return,iqvcinp, nqvceid, istpnx, imicro1,&
iaxisymm, jbreakglue,iglstif, jfastasm,iwear, iwearcf, imixmeth, ielcmadyn, idinout,igena_meth,& iaxisymm, jbreakglue,iglstif, jfastasm,iwear, iwearcf, imixmeth, ielcmadyn, idinout,igena_meth,&
magf_meth, nofsopt, non_assumed magf_meth, non_assumed
! !
! comments of variables: ! comments of variables:
! !
@ -114,6 +114,11 @@ common/marc_concom/&
! 50 generate a file containing the resistance or capacity matrix; ! 50 generate a file containing the resistance or capacity matrix;
! this file can be used to compare results with a reference file ! this file can be used to compare results with a reference file
! 51 print out detailed information for segment-to-segment contact ! 51 print out detailed information for segment-to-segment contact
! 52 print out detailed relative displacement information
! for uniaxial sliding contact
! 53 print out detailed sliding direction information for
! uniaxial sliding contact
! 54 print out detailed information for edges attached to a curve
! !
! !
! jactch = 1 or 2 if elements are activated or deactivated ! jactch = 1 or 2 if elements are activated or deactivated
@ -189,6 +194,6 @@ common/marc_concom/&
! magf_meth = - Method to compute force in magnetostatic - structural ! magf_meth = - Method to compute force in magnetostatic - structural
! = 1 - Virtual work method ! = 1 - Virtual work method
! = 2 - Maxwell stress tensor ! = 2 - Maxwell stress tensor
! non_assumed = 1 no assumed strain formulation (forced), for Sol400 only ! non_assumed = 1 no assumed strain formulation (forced)
! !
!*********************************************************************** !***********************************************************************

View File

@ -6,7 +6,7 @@ import os,sys
architectures = { architectures = {
'marc': { 'marc': {
'parent': 'mpie_cpfem_marc.f90', 'parent': 'mpie_cpfem_marc.f90',
'versions' : ['%%MARCVERSION%%','2007r1','2008r1','2010r1'], 'versions' : ['%%MARCVERSION%%','2007r1','2008r1','2010'],
}, },
} }