update directions to only use release2 for demo

gaelforget · Apr 11, 2017 · 4173fea · 4173fea
1 parent 7d5d4bd
commit 4173fea
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/gcmfaces_demo.m b/gcmfaces_demo.m
@@ -6,29 +6,29 @@
 %  gcmfaces     (codes)
 %  MITprof      (codes)
 %  nctiles_grid (ECCO v4 grid)
-%  release1     (ECCO v4 output)
+%  release2_climatology (ECCO v4 output)
 %  sample_input (additional demo material)
 %
 %the ECCO v4 grid can be obtained as follows:
 %
-%  wget --recursive ftp://mit.ecco-group.org/ecco_for_las/version_4/release1/nctiles_grid 
-%  mv mit.ecco-group.org/ecco_for_las/version_4/release1/nctiles_grid . 
+%  wget --recursive ftp://mit.ecco-group.org/ecco_for_las/version_4/release2/nctiles_grid 
+%  mv mit.ecco-group.org/ecco_for_las/version_4/release2/nctiles_grid . 
 %  rm -rf mit.ecco-group.org
 %
 %to activate example_transports:
 %
-%  mkdir release1
-%  wget --recursive ftp://mit.ecco-group.org/ecco_for_las/version_4/release1/nctiles_climatology
-%  mv mit.ecco-group.org/ecco_for_las/version_4/release1/nctiles_climatology release1/.
+%  mkdir release2_climatology
+%  wget --recursive ftp://mit.ecco-group.org/ecco_for_las/version_4/release2/nctiles_climatology
+%  mv mit.ecco-group.org/ecco_for_las/version_4/release2/nctiles_climatology release2_climatology/.
 %  rm -rf mit.ecco-group.org
 %
 %to activate example_MITprof:
 %
 %  mkdir release2_climatology
 %  wget --recursive ftp://mit.ecco-group.org/ecco_for_las/version_4/release2/nctiles_climatology
-%  mv mit.ecco-group.org/ecco_for_las/version_4/release1/nctiles_climatology release2_climatology/.
+%  mv mit.ecco-group.org/ecco_for_las/version_4/release2/nctiles_climatology release2_climatology/.
 %  wget --recursive ftp://mit.ecco-group.org/ecco_for_las/version_4/release2/profiles
-%  mv mit.ecco-group.org/ecco_for_las/version_4/release1/profiles release2_climatology/.
+%  mv mit.ecco-group.org/ecco_for_las/version_4/release2/profiles release2_climatology/.
 %  rm -rf mit.ecco-group.org
 %
 %to activate example_budget:

diff --git a/sample_analysis/example_IO.m b/sample_analysis/example_IO.m
@@ -5,26 +5,26 @@
 % stand-alone call: addpath gcmfaces/sample_analysis/; example_IO;
 %
 % needed input files:
-%   mkdir release1
-%   wget --recursive ftp://mit.ecco-group.org/ecco_for_las/version_4/release1/nctiles_climatology/ETAN
-%   mv mit.ecco-group.org/ecco_for_las/version_4/release1/nctiles_climatology release1/.
+%   mkdir release2
+%   wget --recursive ftp://mit.ecco-group.org/ecco_for_las/version_4/release2/nctiles_climatology/ETAN
+%   mv mit.ecco-group.org/ecco_for_las/version_4/release2/nctiles_climatology release2_climatology/.
 
 gcmfaces_global;
 
 input_list_check('example_IO',nargin);
 
 %expected location:
-myenv.nctilesdir=fullfile(pwd,'/release1/nctiles_climatology/ETAN/');
-%if ETAN is not found then try old location:
+myenv.nctilesdir=fullfile(pwd,'/release2_climatology/nctiles_climatology/ETAN/');
+%if ETAN is not found then try old locations:
 if ~isdir(myenv.nctilesdir);
     %if not found then try old location:
-    tmpdir=fullfile(pwd,'/gcmfaces/sample_input/nctiles_climatology/ETAN/');
+    tmpdir=fullfile(pwd,'/release2_climatology/nctiles_climatology/ETAN/');
     if isdir(tmpdir); myenv.nctilesdir=tmpdir; end;
 end;
 %if ETAN is still not found then issue warning and skip example_IO
 if ~isdir(myenv.nctilesdir);
     help example_IO;
-    warning('example_IO requires release1/nctiles_climatology/ETAN that was not found ---> abort!');
+    warning('example_IO requires release2_climatology/nctiles_climatology/ETAN that was not found ---> abort!');
     return;
 end;