tMakefile: do not output till-related variables in runs without -till_flux - pism-exp-gsw - ice stream and sediment transport experiments
git clone git://src.adamsgaard.dk/pism-exp-gsw
Log
Files
Refs
README
LICENSE
---
commit c96ac6a3ce035c69050082cb3bc36551f0301c7c
parent d37040f6b44e6badc352bb1941e1cd6808422e21
Author: Anders Damsgaard 
Date:   Tue,  7 Dec 2021 19:28:27 +0100

Makefile: do not output till-related variables in runs without -till_flux

Diffstat:
  M Makefile                            |      10 ++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/Makefile b/Makefile
t@@ -16,11 +16,13 @@ PISM_COMMON = \
         -bed_def lc\
         -sia_e 4.5 -ssa_e 0.512\
         -stress_balance.sia.max_diffusivity 1e4\
-        -extra_vars \
-                basal_mass_flux_floating,basal_mass_flux_grounded,basal_melt_rate_grounded,bedtoptemp,beta,bfrict,bheatflx,bmelt,bwat,bwatvel,bwp,bwprel,cell_grounded_fraction,climatic_mass_balance,cts,dHdt,dbdt,deviatoric_stresses,diffusivity,diffusivity_staggered,effbwp,effective_viscosity,elastic_bed_displacement,enthalpy,enthalpybase,enthalpysurf,flux,flux_divergence,flux_mag,flux_staggered,grounding_line_flux,h_x,h_y,hardav,hardness,heat_flux_from_bedrock,height_above_flotation,hydraulic_potential,ice_area_specific_volume,ice_base_elevation,ice_margin_pressure_difference,ice_mass,ice_surface_liquid_water_fraction,ice_surface_temp,lat,liqfrac,lon,mask,nuH,pressure,rank,schoofs_theta,sea_level,sftflf,sftgif,sftgrf,shelfbmassflux,shelfbtemp,strain_rates,strainheat,subglacial_water_flux_mag,subglacial_water_input_rate,surface_layer_mass,surface_layer_thickness,taub,taub_mag,tauc,taud,taud_mag,tauxz,tauyz,temp,temp_pa,tempbase,tempicethk,tempicethk_basal,temppabase,tempsurf,tendency_of_ice_amount,tendency_of_ice_amount_due_to_basal_mass_flux,tendency_of_ice_amount_due_to_calving,tendency_of_ice_amount_due_to_conservation_error,tendency_of_ice_amount_due_to_discharge,tendency_of_ice_amount_due_to_flow,tendency_of_ice_amount_due_to_surface_mass_flux,tendency_of_ice_mass,tendency_of_ice_mass_due_to_basal_mass_flux,tendency_of_ice_mass_due_to_calving,tendency_of_ice_mass_due_to_conservation_error,tendency_of_ice_mass_due_to_discharge,tendency_of_ice_mass_due_to_flow,tendency_of_ice_mass_due_to_surface_mass_flux,tendency_of_subglacial_water_mass,tendency_of_subglacial_water_mass_at_domain_boundary,tendency_of_subglacial_water_mass_at_grounded_margins,tendency_of_subglacial_water_mass_at_grounding_line,tendency_of_subglacial_water_mass_due_to_conservation_error,tendency_of_subglacial_water_mass_due_to_flow,tendency_of_subglacial_water_mass_due_to_input,thk,thk_bc_mask,thksmooth,tillphi,tillwat,topg,topg_sl_adjusted,topgsmooth,usurf,uvel,vel_bc_mask,vel_bc_values,velbar,velbar_mag,velbase,velbase_mag,velsurf,velsurf_mag,viscous_bed_displacement,vonmises_stress,vvel,wallmelt,wvel,wvel_rel,wvelbase,wvelsurf,tilldeposit,tillflux_mag,tillflux\
         -backup_size big\
         -o_order zyx\
         -log_view\
+OUT_VARS =\
+        -extra_vars \
+                basal_mass_flux_floating,basal_mass_flux_grounded,basal_melt_rate_grounded,bedtoptemp,beta,bfrict,bheatflx,bmelt,bwat,bwatvel,bwp,bwprel,cell_grounded_fraction,climatic_mass_balance,cts,dHdt,dbdt,deviatoric_stresses,diffusivity,diffusivity_staggered,effbwp,effective_viscosity,elastic_bed_displacement,enthalpy,enthalpybase,enthalpysurf,flux,flux_divergence,flux_mag,flux_staggered,grounding_line_flux,h_x,h_y,hardav,hardness,heat_flux_from_bedrock,height_above_flotation,hydraulic_potential,ice_area_specific_volume,ice_base_elevation,ice_margin_pressure_difference,ice_mass,ice_surface_liquid_water_fraction,ice_surface_temp,lat,liqfrac,lon,mask,nuH,pressure,rank,schoofs_theta,sea_level,sftflf,sftgif,sftgrf,shelfbmassflux,shelfbtemp,strain_rates,strainheat,subglacial_water_flux_mag,subglacial_water_input_rate,surface_layer_mass,surface_layer_thickness,taub,taub_mag,tauc,taud,taud_mag,tauxz,tauyz,temp,temp_pa,tempbase,tempicethk,tempicethk_basal,temppabase,tempsurf,tendency_of_ice_amount,tendency_of_ice_amount_due_to_basal_mass_flux,tendency_of_ice_amount_due_to_calving,tendency_of_ice_amount_due_to_conservation_error,tendency_of_ice_amount_due_to_discharge,tendency_of_ice_amount_due_to_flow,tendency_of_ice_amount_due_to_surface_mass_flux,tendency_of_ice_mass,tendency_of_ice_mass_due_to_basal_mass_flux,tendency_of_ice_mass_due_to_calving,tendency_of_ice_mass_due_to_conservation_error,tendency_of_ice_mass_due_to_discharge,tendency_of_ice_mass_due_to_flow,tendency_of_ice_mass_due_to_surface_mass_flux,tendency_of_subglacial_water_mass,tendency_of_subglacial_water_mass_at_domain_boundary,tendency_of_subglacial_water_mass_at_grounded_margins,tendency_of_subglacial_water_mass_at_grounding_line,tendency_of_subglacial_water_mass_due_to_conservation_error,tendency_of_subglacial_water_mass_due_to_flow,tendency_of_subglacial_water_mass_due_to_input,thk,thk_bc_mask,thksmooth,tillphi,tillwat,topg,topg_sl_adjusted,topgsmooth,usurf,uvel,vel_bc_mask,vel_bc_values,velbar,velbar_mag,velbase,velbase_mag,velsurf,velsurf_mag,viscous_bed_displacement,vonmises_stress,vvel,wallmelt,wvel,wvel_rel,wvelbase,wvelsurf
+
 
 OUT_COMMON =\
         -extra_times 0:50:${T_END}\
t@@ -62,6 +64,7 @@ deltaSL-linear.nc: init-linear.nc ${SLSERIES}
                 pismr -i init-linear.nc\
                         ${PISM_COMMON}\
                         ${OUT_COMMON}\
+                        ${OUT_VARS},tilldeposit,tillflux_mag,tillflux\
                         -sea_level constant,delta_sl -ocean_delta_sl_file ${SLSERIES}\
                         -till_flux\
                         -extra_file ex_$@\
t@@ -73,6 +76,7 @@ constant-linear.nc: init-linear.nc
                 pismr -i init-linear.nc\
                         ${PISM_COMMON}\
                         ${OUT_COMMON}\
+                        ${OUT_VARS},tilldeposit,tillflux_mag,tillflux\
                         -till_flux\
                         -extra_file ex_$@\
                         -ts_file ts_$@\
t@@ -83,6 +87,7 @@ nt-deltaSL-linear.nc: init-linear.nc ${SLSERIES}
                 pismr -i init-linear.nc\
                         ${PISM_COMMON}\
                         ${OUT_COMMON}\
+                        ${OUT_VARS}\
                         -sea_level constant,delta_sl -ocean_delta_sl_file ${SLSERIES}\
                         -extra_file ex_$@\
                         -ts_file ts_$@\
t@@ -93,6 +98,7 @@ nt-constant-linear.nc: init-linear.nc
                 pismr -i init-linear.nc\
                         ${PISM_COMMON}\
                         ${OUT_COMMON}\
+                        ${OUT_VARS}\
                         -extra_file ex_$@\
                         -ts_file ts_$@\
                         -o $@