diff --git a/Contents.m b/Contents.m index b6855d7ba..fa5d3eddd 100644 --- a/Contents.m +++ b/Contents.m @@ -1,3 +1,3 @@ % SpinW -% Version 4.0 (unreleased) 29-Nov-2017 +% Version 3.1 (unreleased) 29-Nov-2017 % diff --git a/dev/sw_release.m b/dev/sw_release.m index 33c78e1aa..b04418be8 100644 --- a/dev/sw_release.m +++ b/dev/sw_release.m @@ -144,7 +144,7 @@ function sw_release(verNum, tempDir) && (~any(strfind(fList(ii).name,[filesep 'test' filesep]))) ... && (~any(strfind(fList(ii).name,[filesep 'tutorials' filesep]))) ... && (~any(strfind(fList(ii).folder,'git'))) - fListZip{end+1} = [replace(fList(ii).folder, dirname, '') sp fList(ii).name]; + fListZip{end+1} = fList(ii).name; end end diff --git a/docs/docgenerator/docgen.m b/docs/docgenerator/docgen.m index 589dfab9b..dfc12f195 100644 --- a/docs/docgenerator/docgen.m +++ b/docs/docgenerator/docgen.m @@ -1,12 +1,12 @@ %% setup help generator options swPath = {'swfiles/@spinw' 'swfiles' 'swfiles/+swplot' 'swfiles/@swpref' 'swfiles/+swsym' 'swfiles/+swfunc' 'swfiles/+ndbase'}; -swr = sw_rootdir; +swr = sw_rootdir(); swPath = cellfun(@(C)[swr C],swPath,'UniformOutput',false); swver = sw_version; -outPath = '~/spinwdoc_git'; -docPath = '~/spinw_git/docs'; -upload = true; +outPath = fullfile(userpath,'Release','docgen'); +docPath = [outPath filesep 'docs']; +upload = false; recalc = true; %% generate help diff --git a/swfiles/@spinw/formula.m b/swfiles/@spinw/formula.m index 633b627d9..68bda0b03 100644 --- a/swfiles/@spinw/formula.m +++ b/swfiles/@spinw/formula.m @@ -13,11 +13,11 @@ % ### Examples % % The formula of the crystal stored in the -% [https://goo.gl/do6oTh](https://goo.gl/do6oTh) linked file will be +% [https://raw.githubusercontent.com/SpinW/Models/master/cif/Ca2RuO4.cif](https://raw.githubusercontent.com/SpinW/Models/master/cif/Ca2RuO4.cif) linked file will be % printed onto the Command Window. % % ``` -% >>cryst = spinw('https://goo.gl/do6oTh') +% >>cryst = spinw('https://raw.githubusercontent.com/SpinW/Models/master/cif/Ca2RuO4.cif') % >>cryst.formula>> % ``` % diff --git a/swfiles/Contents.m b/swfiles/Contents.m index 630563379..90cebc9a0 100644 --- a/swfiles/Contents.m +++ b/swfiles/Contents.m @@ -113,4 +113,4 @@ % sw_uniquetol % sw_update % sw_version -% sw_mex +% sw_mex diff --git a/tutorials/publish/tutorial21/tutorial21.html b/tutorials/publish/tutorial21/tutorial21.html index b5f3d8c3d..b4790b30b 100644 --- a/tutorials/publish/tutorial21/tutorial21.html +++ b/tutorials/publish/tutorial21/tutorial21.html @@ -200,7 +200,7 @@ % is able to download the file from a given link and create the crystal % structure. -yig = spinw('https://goo.gl/kQO0FJ'); +yig = spinw('https://raw.githubusercontent.com/SpinW/Models/master/cif/YIG_10K.cif'); % The imported .cif file contains all symmetry operators of its space % group. SpinW will determine the generators of the space group and stores diff --git a/tutorials/publish/tutorial21/tutorial21.txt b/tutorials/publish/tutorial21/tutorial21.txt index 90c0e0ba9..f781bba78 100644 --- a/tutorials/publish/tutorial21/tutorial21.txt +++ b/tutorials/publish/tutorial21/tutorial21.txt @@ -132,7 +132,7 @@ Sandor Toth % is able to download the file from a given link and create the crystal % structure. -yig = spinw('https://goo.gl/kQO0FJ'); +yig = spinw('https://raw.githubusercontent.com/SpinW/Models/master/cif/YIG_10K.cif'); % The imported .cif file contains all symmetry operators of its space % group. SpinW will determine the generators of the space group and stores diff --git a/tutorials/publish/tutorial31/tutorial31.html b/tutorials/publish/tutorial31/tutorial31.html index 9263cacb1..0b14f71b1 100644 --- a/tutorials/publish/tutorial31/tutorial31.html +++ b/tutorials/publish/tutorial31/tutorial31.html @@ -287,7 +287,7 @@ % Where does all the data comes from? edit atom.dat % -licro = spinw('https://goo.gl/do6oTh'); +licro = spinw('https://raw.githubusercontent.com/SpinW/Models/master/cif/licro2.cif'); licro.formula diff --git a/tutorials/publish/tutorial31/tutorial31.txt b/tutorials/publish/tutorial31/tutorial31.txt index e9f2075f7..9b87cd396 100644 --- a/tutorials/publish/tutorial31/tutorial31.txt +++ b/tutorials/publish/tutorial31/tutorial31.txt @@ -219,7 +219,7 @@ Ground state energy: -1.000 meV/spin. % Where does all the data comes from? edit atom.dat % -licro = spinw('https://goo.gl/do6oTh'); +licro = spinw('https://raw.githubusercontent.com/SpinW/Models/master/cif/licro2.cif'); licro.formula diff --git a/tutorials/publish/tutorial38/tutorial38.html b/tutorials/publish/tutorial38/tutorial38.html index fb5361ef0..2ea30528b 100644 --- a/tutorials/publish/tutorial38/tutorial38.html +++ b/tutorials/publish/tutorial38/tutorial38.html @@ -155,7 +155,7 @@ % atom is the second in position, the corresponding spin quantum number can % be changed directly. -ca2ruo4 = spinw('https://goo.gl/SYoJVS'); +ca2ruo4 = spinw('https://raw.githubusercontent.com/SpinW/Models/master/cif/Ca2RuO4.cif'); ca2ruo4.unit_cell.S(2) = 1; plot(ca2ruo4) diff --git a/tutorials/publish/tutorial38/tutorial38.txt b/tutorials/publish/tutorial38/tutorial38.txt index f45fa4471..27ef0e93a 100644 --- a/tutorials/publish/tutorial38/tutorial38.txt +++ b/tutorials/publish/tutorial38/tutorial38.txt @@ -87,7 +87,7 @@ title('') % atom is the second in position, the corresponding spin quantum number can % be changed directly. -ca2ruo4 = spinw('https://goo.gl/SYoJVS'); +ca2ruo4 = spinw('https://raw.githubusercontent.com/SpinW/Models/master/cif/Ca2RuO4.cif'); ca2ruo4.unit_cell.S(2) = 1; plot(ca2ruo4)