diff --git a/config/config_TEMPLATE.json b/config/config_TEMPLATE.json index ad4ad27..61b3b3a 100644 --- a/config/config_TEMPLATE.json +++ b/config/config_TEMPLATE.json @@ -3,8 +3,8 @@ "date_ini":"2021-12-11", "date_end":"2021-12-12", -"outdir":"/home/fontana/MODEL/OUTPUTS", -"diagdir":"/home/fontana/MODEL/DIAGS", +"outdir":"/path/to/OUTPUT_SMP", +"diagdir":"/path/to/diags/dir", "river_ini":"2015-01-03", "river_end":"2015-05-01", diff --git a/datasets/CMEMS/motu_downloader.json b/datasets/CMEMS/motu_downloader.json new file mode 100644 index 0000000..90775b8 --- /dev/null +++ b/datasets/CMEMS/motu_downloader.json @@ -0,0 +1,50 @@ +{ + "motu_user": "XXXXXX", + "motu_password": "XXXXX", + "domain_lat_min": 41.88515625, + "domain_lat_max": 44.50234375, + "domain_lon_min": 6.06640625, + "domain_lon_max": 12.18359375, + "domain_depth_min": 0.0, + "domain_depth_max": 2900.0, + "days_before": 0, + "days_after": 2, + "motu_server": "http://nrt.cmems-du.eu/motu-web/Motu", + "services": [ + { + "name": "MEDSEA_ANALYSISFORECAST_PHY_006_013", + "products": [ + { + "name": "cmems_mod_med_phy-cur_anfc_4.2km_P1D-m", + "variables": ["uo", "vo"] + }, + { + "name": "cmems_mod_med_phy-sal_anfc_4.2km_P1D-m", + "variables": ["so"] + }, + { + "name": "cmems_mod_med_phy-tem_anfc_4.2km_P1D-m", + "variables": ["thetao"] + } + ] + }, + { + "name": "MEDSEA_ANALYSISFORECAST_BGC_006_014", + "products": [ + { + "name": "cmems_mod_med_bgc-nut_anfc_4.2km_P1D-m", + "variables": ["no3", "po4","nh4", "si"] + }, + { + "name": "cmems_mod_med_bgc-bio_anfc_4.2km_P1D-m", + "variables": ["o2"] + }, + { + "name": "cmems_mod_med_bgc-car_anfc_4.2km_P1D-m", + "variables": ["dissic","talk"] + } + ] + } + ] +} + diff --git a/datasets/MY_NEW_DATA/.my_new_routine.py.swp b/datasets/MY_NEW_DATA/.my_new_routine.py.swp deleted file mode 100644 index 3787e91..0000000 Binary files a/datasets/MY_NEW_DATA/.my_new_routine.py.swp and /dev/null differ diff --git a/manual.pdf b/manual.pdf index d500104..3c33976 100644 Binary files a/manual.pdf and b/manual.pdf differ diff --git a/modules/__pycache__/fun_gen.cpython-310.pyc b/modules/__pycache__/fun_gen.cpython-310.pyc index edf68d1..1a8393d 100644 Binary files a/modules/__pycache__/fun_gen.cpython-310.pyc and b/modules/__pycache__/fun_gen.cpython-310.pyc differ diff --git a/modules/fun_gen.py b/modules/fun_gen.py index 17a85af..c66729c 100644 --- a/modules/fun_gen.py +++ b/modules/fun_gen.py @@ -35,8 +35,9 @@ def load_config(config): os.system('mkdir -p '+diagdir+'/'+config) - print('=> Config file loaded') - print('---------------------\n') + print('----------------------------------') + print('=> Config file '+config+' loaded') + print('----------------------------------') # ---------------------------------- # @@ -58,6 +59,16 @@ def load_variable(config,var): for par in pars: if par[0] == var: break + + print('----------------') + print('Variable :',var) + print('cmap :',par[2]) + print('log :',par[3]) + print('min/max mode :',par[4]) + print('vmin :',par[5]) + print('vmax :',par[6]) + print('----------------\n') + return par[0],\ par[1],\ diff --git a/plot/.make_plot_2D.ksh.swp b/plot/.make_plot_2D.ksh.swp deleted file mode 100644 index 57185d8..0000000 Binary files a/plot/.make_plot_2D.ksh.swp and /dev/null differ diff --git a/plot/make_plot_2D.ksh b/plot/make_plot_2D.ksh index 4d7b6e6..c1e5f5c 100755 --- a/plot/make_plot_2D.ksh +++ b/plot/make_plot_2D.ksh @@ -7,7 +7,7 @@ config=$1 #varlist={'so','thetao'} #levlist={'0','1'} -varlist='thetao' +varlist='chl' levlist='0' diff --git a/plot/make_plot_2D.py b/plot/make_plot_2D.py index 7c1eaf4..fff724e 100644 --- a/plot/make_plot_2D.py +++ b/plot/make_plot_2D.py @@ -16,6 +16,9 @@ from cartopy.mpl.gridliner import LONGITUDE_FORMATTER, LATITUDE_FORMATTER import matplotlib.colors as colors import matplotlib.pyplot as plt +import cmocean +import cmcrameri + # Get args @@ -86,7 +89,6 @@ else: p = plt.pcolor(lon,lat,var2d,cmap=cmap,norm=colors.LogNorm(vmin=vmin,vmax=vmax),zorder=1) - if jd == jdini: # plot cb only once cb = plt.colorbar(extend='both',fraction=float(cb_fraction_2D),pad=float(cb_pad_2D),\ label=label+' ('+units+')') diff --git a/plot/make_plot_section.py b/plot/make_plot_section.py index 05e348f..303fc45 100644 --- a/plot/make_plot_section.py +++ b/plot/make_plot_section.py @@ -171,7 +171,7 @@ plt.xlabel("Latitude (°)") savefig( odir+'/'+dtag+'_'+var+'.'+fig_fmt) - plt.show() + #plt.show() plt.close()