Merge branch '19-updated-creation-of-dust-and-ndep-forcing-files-for-pisces' into 'master'

Resolve "Updated creation of dust and ndep forcing files for PISCES"

See merge request !6

Preprocessing_tools/Bio/make_dust.m

@@ -42,7 +42,7 @@ crocotools_param
 %dust_file=[woapisces_dir,'dust.iron.cdf'];
 %dust_name='irondep';
 %dust_file=[woapisces_dir,'dust_seas.cdf'];
-dust_file=[woapisces_dir,'dust_INCA_monthly_r360x180.nc'];
+dust_file=[woapisces_dir,'DUST_INCA_new_r360x180.nc'];
 dust_name='dust';
 %time=woa_time;
 time=[0.5:1:11.5];
@@ -80,7 +80,11 @@ nc('eta_rho') = Mp;
 %
 nc('dust_time') = length(time);
 nc{'dust_time'} = ncdouble('dust_time') ;
-nc{'dust'} = ncdouble('dust_time','eta_rho','xi_rho') ;
+nc{'dust'}      = ncdouble('dust_time','eta_rho','xi_rho') ;
+nc{'dustfer'}   = ncdouble('dust_time','eta_rho','xi_rho') ;
+nc{'dustpo4'}   = ncdouble('dust_time','eta_rho','xi_rho') ;
+nc{'dustsi'}    = ncdouble('dust_time','eta_rho','xi_rho') ;
+nc{'solubility2'}    = ncdouble('dust_time','eta_rho','xi_rho') ;
 %
 nc{'dust_time'}.long_name = ncchar('time for dust');
 nc{'dust_time'}.long_name = 'time for dust';
@@ -97,6 +101,34 @@ nc{'dust'}.units = 'Kg m-2 s-1';
 nc{'dust'}.fields = ncchar('dust, scalar, series');
 nc{'dust'}.fields = 'dust, scalar, series';
 %
+nc{'dustfer'}.long_name = ncchar('Fe Dust Deposition');
+nc{'dustfer'}.long_name = 'Fe Dust Deposition';
+nc{'dustfer'}.units = ncchar('Kg m-2 s-1');
+nc{'dustfer'}.units = 'Kg m-2 s-1';
+nc{'dustfer'}.fields = ncchar('dustfer, scalar, series');
+nc{'dustfer'}.fields = 'dustfer, scalar, series';
+%
+nc{'dustpo4'}.long_name = ncchar('PO4 Dust Deposition');
+nc{'dustpo4'}.long_name = 'PO4 Dust Deposition';
+nc{'dustpo4'}.units = ncchar('Kg m-2 s-1');
+nc{'dustpo4'}.units = 'Kg m-2 s-1';
+nc{'dustpo4'}.fields = ncchar('dustpo4, scalar, series');
+nc{'dustpo4'}.fields = 'dustpo4, scalar, series';
+%
+nc{'dustsi'}.long_name = ncchar('Si Dust Deposition');
+nc{'dustsi'}.long_name = 'Si Dust Deposition';
+nc{'dustsi'}.units = ncchar('Kg m-2 s-1');
+nc{'dustsi'}.units = 'Kg m-2 s-1';
+nc{'dustsi'}.fields = ncchar('dustsi, scalar, series');
+nc{'dustsi'}.fields = 'dustsi, scalar, series';
+%
+nc{'solubility2'}.long_name = ncchar('Fe solubility from Mahowald');
+nc{'solubility2'}.long_name = 'Fe solubility from Mahowald';
+nc{'solubility2'}.units = ncchar('%');
+nc{'solubility2'}.units = '%';
+nc{'solubility2'}.fields = ncchar('solubility2, scalar, series');
+nc{'solubility2'}.fields = 'solubility2, scalar, series';
+%
 %%endef(nc);
 
 % Create global attributes
@@ -120,7 +152,15 @@ nc=netcdf(bioname,'write');
 %
 for tindex=1:length(time)
   time=nc{'dust_time'}(tindex);
-  nc{'dust'}(tindex,:,:)=ext_data(dust_file,dust_name,tindex,...
+  nc{'dust'}(tindex,:,:)=ext_data(dust_file,'dust',tindex,...
+             lon,lat,time,Roa,1);
+  nc{'dustfer'}(tindex,:,:)=ext_data(dust_file,'dustfer',tindex,...
+             lon,lat,time,Roa,1);
+  nc{'dustpo4'}(tindex,:,:)=ext_data(dust_file,'dustpo4',tindex,...
+             lon,lat,time,Roa,1);
+  nc{'dustsi'}(tindex,:,:)=ext_data(dust_file,'dustsi',tindex,...
+             lon,lat,time,Roa,1);
+  nc{'solubility2'}(tindex,:,:)=ext_data(dust_file,'solubility2',tindex,...
              lon,lat,time,Roa,1);
 end
 close(nc)
@@ -130,6 +170,9 @@ if (makeplot)
 %
 disp(' Make a few plots...')
 test_bioforcing(bioname,grdname,'dust',[1 4 7 10],3,coastfileplot)
+test_bioforcing(bioname,grdname,'dustfer',[1 4 7 10],3,coastfileplot)
+test_bioforcing(bioname,grdname,'dustpo4',[1 4 7 10],3,coastfileplot)
+test_bioforcing(bioname,grdname,'dustsi',[1 4 7 10],3,coastfileplot)
 end % if makeplot
 %
 % End

Preprocessing_tools/Bio/make_ndepo.m

@@ -79,6 +79,8 @@ nc('eta_rho') = Mp;
 nc('ndep_time') = length(time);
 nc{'ndep_time'} = ncdouble('ndep_time') ;
 nc{'ndep'} = ncdouble('ndep_time','eta_rho','xi_rho') ;
+nc{'noyndepo'} = ncdouble('ndep_time','eta_rho','xi_rho') ;
+nc{'nhxndepo'} = ncdouble('ndep_time','eta_rho','xi_rho') ;
 %
 nc{'ndep_time'}.long_name = ncchar('time for nitrogen deposition');
 nc{'ndep_time'}.long_name = 'time for nitrogen deposition';
@@ -92,9 +94,23 @@ nc{'ndep'}.long_name = ncchar('Nitrogen Deposition');
 nc{'ndep'}.long_name = 'Nitrogen Deposition';
 nc{'ndep'}.units = ncchar('KgN m-2 s-1');
 nc{'ndep'}.units = 'KgN m-2 s-1';
-nc{'ndep'}.fields = ncchar('dust, scalar, series');
+nc{'ndep'}.fields = ncchar('ndep, scalar, series');
 nc{'ndep'}.fields = 'ndep, scalar, series';
 %
+nc{'noyndepo'}.long_name = ncchar('NOy Deposition');
+nc{'noyndepo'}.long_name = 'NOy Deposition';
+nc{'noyndepo'}.units = ncchar('KgN m-2 s-1');
+nc{'noyndepo'}.units = 'KgN m-2 s-1';
+nc{'noyndepo'}.fields = ncchar('noyndepo, scalar, series');
+nc{'noyndepo'}.fields = 'noyndepo, scalar, series';
+%
+nc{'nhxndepo'}.long_name = ncchar('NHx Deposition');
+nc{'nhxndepo'}.long_name = 'NHx Deposition';
+nc{'nhxndepo'}.units = ncchar('KgN m-2 s-1');
+nc{'nhxndepo'}.units = 'KgN m-2 s-1';
+nc{'nhxndepo'}.fields = ncchar('nhxndepo, scalar, series');
+nc{'nhxndepo'}.fields = 'nhxndepo, scalar, series';
+%
 %%endef(nc);
 
 % Create global attributes
@@ -117,7 +133,11 @@ nc=netcdf(bioname,'write');
 % Loop on time
 for tindex=1:length(time)
   time=nc{'ndep_time'}(tindex);
-  nc{'ndep'}(tindex,:,:)=ext_data(ndep_file,ndep_name,tindex,...
+  nc{'ndep'}(tindex,:,:)=ext_data(ndep_file,'ndep',tindex,...
+             lon,lat,time,Roa,1);
+  nc{'noyndepo'}(tindex,:,:)=ext_data(ndep_file,'noyndepo',tindex,...
+             lon,lat,time,Roa,1);
+  nc{'nhxndepo'}(tindex,:,:)=ext_data(ndep_file,'nhxndepo',tindex,...
              lon,lat,time,Roa,1);
 end
 %
@@ -128,6 +148,8 @@ if (makeplot)
 %
 disp(' Make a few plots...')
 test_bioforcing(bioname,grdname,'ndep',[1 4 7 10],3,coastfileplot)
+test_bioforcing(bioname,grdname,'noyndepo',[1 4 7 10],3,coastfileplot)
+test_bioforcing(bioname,grdname,'nhxndepo',[1 4 7 10],3,coastfileplot)
 end % if makeplot
 %
 % End