Merge branch 'fix_tools_for_release_2.0.1' into 'master'

Resolve #55 : Fix for make_ERA5 with add_tides and add_waves | tipos forecast | download...

Closes #55

See merge request !22

Aforc_ERA5/interp_ERA5.m

@@ -180,10 +180,11 @@ end
 if ~isempty(nc_frc)
   %nc_frc{'sustr'}(tout,:,:)=sustr; => ERA5 not downloaded
   %nc_frc{'svstr'}(tout,:,:)=svstr; => ERA5 not downloaded
-  nc_frc{'Awave'}(tout,:,:)=awave;
-  nc_frc{'Dwave'}(tout,:,:)=dwave;
-  nc_frc{'Pwave'}(tout,:,:)=pwave;
-
+  if add_waves == 1
+    nc_frc{'Awave'}(tout,:,:)=awave;
+    nc_frc{'Dwave'}(tout,:,:)=dwave;
+    nc_frc{'Pwave'}(tout,:,:)=pwave;
+  end
 end
 if ~isempty(nc_blk)
   nc_blk{'tair'}(tout,:,:)=tair;

Aforc_ERA5/make_ERA5.m

@@ -211,8 +211,9 @@ for Y=Ymin:Ymax
         % % Add the tides
         % %
         if makefrc==1 && add_tides==1
+	     pot_tides=1;
              add_tidal_data(tidename,grdname,frcname,Ntides,tidalrank,...
-                            Yorig,Y,M,coastfileplot)
+                            Yorig,Y,M,coastfileplot,makeplot,pot_tides)
         end
         %
         %

Forecast_tools/download_GFS.m

@@ -75,6 +75,7 @@ end
 gfs_run_time=0;
 gfs_date=today-0.5;
 foundfile=0;
+gfs_date0=0;
 while foundfile==0
   fname=get_GFS_fname(gfs_date,gfs_run_time,gfsftype);
   warning off

Forecast_tools/make_OGCM_mercator_frcst.m

@@ -68,7 +68,6 @@ rundate_str=date;
 date_run=datenum(rundate_str);
 rundate=date_run-datenum(Yorig,1,1);
 date_frcst=rundate;
-%OGCM=mercator
 for i=1:hdays+1
   time1(i)=date_run-(hdays+1-i);
 end

Oforc_OGCM/download_glorys_data.sh

@@ -67,9 +67,9 @@ fi
 
 ## cmt info
 if [[ ${kdata} == "DAILY" ]]; then
-    product_id_reana='cmems_mod_glo_phy_my_0.083_P1Ddeg-m'
+    product_id_reana='cmems_mod_glo_phy_my_0.083deg_P1D-m'
 elif [[ ${kdata} == "MONTHLY" ]]; then
-    product_id_reana='cmems_mod_glo_phy_my_0.083_P1Mdeg-m'
+    product_id_reana='cmems_mod_glo_phy_my_0.083deg_P1M-m'
 else
     echo "Please specify what kind of data you want (DAILY or MONTHLY), exit...."; exit 1
 fi

Oforc_OGCM/make_OGCM_mercator.m

@@ -8,9 +8,9 @@
 %                                                           (187101 -> 201012)
 %    mercator -> 2 options for mercator_type parameter:
 %
-%                1 -->  1/12 deg Mercator global reanalysis (1993   -> 202101)
+%                1 -->  1/12 deg Mercator global reanalysis (1993   -> )
 %                                           (Monthly or Daily product)
-%                2 -->  1/12 deg Mercator global analysis   (202011 -> )
+%                2 -->  1/12 deg Mercator global analysis   (202206 -> )
 %       
 %            Note for 2:
 %                    (7days from now -> now-1day : Near Real Time analysis)