55 Commits

Author	SHA1	Message	Date
zhangc43	513e3543b0	fix merging conflict	2016-04-26 14:23:05 -04:00
zhangc43	4eb45708a5	revert to old lattice.f90 file to suport ifrot v15.0	2016-04-25 09:55:50 -04:00
zhangc43	e0f8699605	remove plastic_j2	2016-04-25 09:40:44 -04:00
Chen Zhang	672c8d0606	Merge remote branch 'origin/development' into cmake	2016-04-18 09:11:29 -04:00
Chen Zhang	e33594cb44	change code folder to src	2016-03-04 14:43:29 -05:00