[pism/pism] b69d3d: SIMPEL: documenting and cleaning calculate_basal_m...

0 views
Skip to first unread message

ronjareese

unread,
Dec 3, 2021, 7:00:47 PM12/3/21
to pism....@gmail.com
Branch: refs/tags/pik-pico-07
Home: https://github.com/pism/pism
Commit: b69d3de52d74b5c6ca1db777aef8b046f1311bea
https://github.com/pism/pism/commit/b69d3de52d74b5c6ca1db777aef8b046f1311bea
Author: Matthias Mengel <men...@pik-potsdam.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc
M src/coupler/ocean/POcavity.hh

Log Message:
-----------
SIMPEL: documenting and cleaning calculate_basal_melt_other_boxes.


Commit: 1f59c3074ce33a34730e75f9735c7240d362ecfe
https://github.com/pism/pism/commit/1f59c3074ce33a34730e75f9735c7240d362ecfe
Author: Matthias Mengel <men...@pik-potsdam.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
SIMPEL: replace k iterator through shelf_id.


Commit: 01294f308856e3c5f4cacaec0128eff52c7984f2
https://github.com/pism/pism/commit/01294f308856e3c5f4cacaec0128eff52c7984f2
Author: Matthias Mengel <men...@pik-potsdam.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc
M src/coupler/ocean/POcavity.hh

Log Message:
-----------
SIMPEL: working on Beckmann Goose exception, cleanup and renaming.


Commit: a891c59c5d737f026de3bd7e1e2e23350ced9a4c
https://github.com/pism/pism/commit/a891c59c5d737f026de3bd7e1e2e23350ced9a4c
Author: Matthias Mengel <men...@pik-potsdam.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
SIMPEL: cleaning up Beckmann Goose parametrization

switching to default gamma_T and adapting meltFactor
so that final meltrates stay the same.
Using same input salinity as for full SIMPEL model instead
of constant.
Note that meltfactor is different to the POConstantPIK meltfactor
and to the pism_config.cdl.


Commit: 06e562309fbb7037b11778e1b9b838061b41e4da
https://github.com/pism/pism/commit/06e562309fbb7037b11778e1b9b838061b41e4da
Author: Matthias Mengel <men...@pik-potsdam.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
SIMPEL: changing default set of coefficients.


Commit: e4ccebdde2d2bb9ccf9782e4f3a8cb81f7961931
https://github.com/pism/pism/commit/e4ccebdde2d2bb9ccf9782e4f3a8cb81f7961931
Author: Matthias Mengel <men...@pik-potsdam.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
SIMPEL: fixing small bugs.


Commit: 9032056b8050a5c2440be6d4ebecaa776e200eb6
https://github.com/pism/pism/commit/9032056b8050a5c2440be6d4ebecaa776e200eb6
Author: Matthias Mengel <men...@pik-potsdam.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc
M src/coupler/ocean/POcavity.hh

Log Message:
-----------
SIMPEL: remove box1 and box2 indicators.


Commit: 31ffd471bcf744f04c2820c9a75f935954d8f58d
https://github.com/pism/pism/commit/31ffd471bcf744f04c2820c9a75f935954d8f58d
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc
M src/coupler/ocean/POcavity.hh

Log Message:
-----------
add boxmodel variables to output, FIXME output to extra files


Commit: 94b55ebef41bad2e3b282a0edace427d8d3459d8
https://github.com/pism/pism/commit/94b55ebef41bad2e3b282a0edace427d8d3459d8
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
POcavity: calculate dmax from DistGL, fix rhow and rho_star confusion


Commit: eacc42c52e00383686cdfd6ce958fbd85a801716
https://github.com/pism/pism/commit/eacc42c52e00383686cdfd6ce958fbd85a801716
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
POcavity: small clean up


Commit: 78f382326b23a217c5d5ebcc3063cd6c3b1a7403
https://github.com/pism/pism/commit/78f382326b23a217c5d5ebcc3063cd6c3b1a7403
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-04-20 (Thu, 20 Apr 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc
M src/coupler/ocean/POcavity.hh

Log Message:
-----------
POcavity: exclude subglacial lakes in melt rate computation


Commit: 9cd3fcf00330255ee57e2383c59f4fc2eb0f7adb
https://github.com/pism/pism/commit/9cd3fcf00330255ee57e2383c59f4fc2eb0f7adb
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-04-20 (Thu, 20 Apr 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
POcavity: units of basalmeltrate_shelf now correct (in m per a), and small clean ups


Commit: 9480d078d168c8a80a1c436764b4e22878710b4c
https://github.com/pism/pism/commit/9480d078d168c8a80a1c436764b4e22878710b4c
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-08-16 (Wed, 16 Aug 2017)

Changed paths:
M src/base/iMreport.cc

Log Message:
-----------
Fixed bug in slvol calculation


Commit: abbdba43d531742356526fa0daa40bb020b44fd2
https://github.com/pism/pism/commit/abbdba43d531742356526fa0daa40bb020b44fd2
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-08-16 (Wed, 16 Aug 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
Test bug fix shelfbtemp on ocean model


Commit: 8c33b7e8bc1c3cb4ee04ebc730f9e3283f5fa035
https://github.com/pism/pism/commit/8c33b7e8bc1c3cb4ee04ebc730f9e3283f5fa035
Author: Matthias Mengel <men...@pik-potsdam.de>
Date: 2017-08-16 (Wed, 16 Aug 2017)

Changed paths:
M src/coupler/surface/PSLapseRates.cc
M src/coupler/surface/PSLapseRates.hh
M src/coupler/util/PLapseRates.hh

Log Message:
-----------
Use mass balance scaling as in Deconto & Pollard 2016

within the surface model. We use
precip = fac * precip0
with
fac = exp(precip_scale_factor*(height-reference_heigt))

To gain the same scaling as in DP2016, you need
a precip_scale_factor = 0.554 = (log(2)/10)*8m K-1 yr-1.


Commit: 1f362f31737e505811de15e17d862e4cf6d295e7
https://github.com/pism/pism/commit/1f362f31737e505811de15e17d862e4cf6d295e7
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc
M src/coupler/ocean/POcavity.hh

Log Message:
-----------
added shelf_mask which identifies individual shelves


Commit: b6715b3d7edbef5d74ff1d6c6067108a699cf702
https://github.com/pism/pism/commit/b6715b3d7edbef5d74ff1d6c6067108a699cf702
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
replace shelf_id with basin_id


Commit: b42586fe333624f4783e4ef16de263c2efe029c0
https://github.com/pism/pism/commit/b42586fe333624f4783e4ef16de263c2efe029c0
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc
M src/coupler/ocean/POcavity.hh

Log Message:
-----------
ocean_box_mask defined depending of shelf size instead of basin size


Commit: ca750a4a18a1b7e4b0b59f986f828ef91c714656
https://github.com/pism/pism/commit/ca750a4a18a1b7e4b0b59f986f828ef91c714656
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc
M src/coupler/ocean/POcavity.hh

Log Message:
-----------
counting now also number cells per box for each shelf (instead of basins)


Commit: eeb2d020757b6865b291d2cd76df3f7c9fec6b2b
https://github.com/pism/pism/commit/eeb2d020757b6865b291d2cd76df3f7c9fec6b2b
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
ocean box 0 input fields are averaged over basins adjacent to ice shelf


Commit: e559fd862adb81db6f9c40022bfd44e54acbdc7a
https://github.com/pism/pism/commit/e559fd862adb81db6f9c40022bfd44e54acbdc7a
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
bmr calulation now depending on shelves (instead of basins)


Commit: 76b2f8101c633d68b6ec45c237d554c752dcf8b5
https://github.com/pism/pism/commit/76b2f8101c633d68b6ec45c237d554c752dcf8b5
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc
M src/coupler/ocean/POcavity.hh

Log Message:
-----------
clean up


Commit: d310179af13fe591687ccd45ac9eba2a9c48dcf0
https://github.com/pism/pism/commit/d310179af13fe591687ccd45ac9eba2a9c48dcf0
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)

Changed paths:
M src/coupler/ocean/POcavity.cc

Log Message:
-----------
input for next box as average over entire box (and not the box-box boundary as done before)


Commit: c9a0a63a8c96d3690ff1399e99e6a7996526a763
https://github.com/pism/pism/commit/c9a0a63a8c96d3690ff1399e99e6a7996526a763
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2018-05-16 (Wed, 16 May 2018)

Changed paths:
M src/coupler/ocean/POcavity.cc
M src/coupler/ocean/POcavity.hh

Log Message:
-----------
clean up


Commit: b0b695481cb3a99cc15bed8e1b7c2bb37aa6ec40
https://github.com/pism/pism/commit/b0b695481cb3a99cc15bed8e1b7c2bb37aa6ec40
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2018-05-17 (Thu, 17 May 2018)

Changed paths:
M src/coupler/ocean/POcavity.cc
M src/coupler/ocean/POcavity.hh

Log Message:
-----------
clean up


Commit: e1609ac30bb8179a7d3d97b253c763bdbf4358c6
https://github.com/pism/pism/commit/e1609ac30bb8179a7d3d97b253c763bdbf4358c6
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2018-05-17 (Thu, 17 May 2018)

Changed paths:
M README.md

Log Message:
-----------
ready for release: added license and PICO description to README


Commit: 0d75f30b0672a62174549b5e0c6053e147124ad2
https://github.com/pism/pism/commit/0d75f30b0672a62174549b5e0c6053e147124ad2
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2018-05-17 (Thu, 17 May 2018)

Changed paths:
M README.md

Log Message:
-----------
addition: code is based on a commit after v07, before v1.0


Compare: https://github.com/pism/pism/compare/b69d3de52d74%5E...0d75f30b0672

Torsten Albrecht

unread,
Dec 3, 2021, 7:00:50 PM12/3/21
to pism....@gmail.com
Branch: refs/tags/v1.0-paleo-ensemble
Commit: 98d29f9e1f4fa0e6767c784569572b996f76b099
https://github.com/pism/pism/commit/98d29f9e1f4fa0e6767c784569572b996f76b099
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-15 (Wed, 15 Nov 2017)

Changed paths:
M doc/ice-bib.bib
M src/coupler/CMakeLists.txt
A src/coupler/ocean/Cavity.cc
A src/coupler/ocean/Cavity.hh
M src/coupler/ocean/Factory.cc
M src/coupler/surface/LapseRates.cc
M src/coupler/surface/LapseRates.hh
M src/coupler/util/PLapseRates.hh
M src/icemodel/initialization.cc

Log Message:
-----------
Merged pik/cavity_dev into stable1.0


Commit: d31b1423562fc501e0857de35de06c869dc635c4
https://github.com/pism/pism/commit/d31b1423562fc501e0857de35de06c869dc635c4
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-15 (Wed, 15 Nov 2017)

Changed paths:
M src/coupler/ocean/Cavity.cc
M src/pism_config.cdl

Log Message:
-----------
Added most relevant PICO options to pism_config.cdl


Commit: 26967b3d6ce79e62d927992e8d82c3e45978ece6
https://github.com/pism/pism/commit/26967b3d6ce79e62d927992e8d82c3e45978ece6
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-15 (Wed, 15 Nov 2017)

Changed paths:
M src/calving/OceanKill.cc

Log Message:
-----------
Introducing option -ocean_kill_mask that allows for reading a prescribed ocean_kill_mask field from file instead of calculate a mask from ice thickness and bed topography


Commit: 5b42d18b566558beb5467197dba3a05cbf29a6e1
https://github.com/pism/pism/commit/5b42d18b566558beb5467197dba3a05cbf29a6e1
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-16 (Thu, 16 Nov 2017)

Changed paths:
M src/coupler/CMakeLists.txt
M src/coupler/atmosphere/Factory.cc
A src/coupler/atmosphere/TemperaturePIK.cc
A src/coupler/atmosphere/TemperaturePIK.hh

Log Message:
-----------
Added PIK air temperature parameterization for PDD scheme based on Huybrechts & De Wolde, 1999 with adjusted parameters based on a multiple regression analysis of ERA Interim data by Anders Levermann, Ricarda Winkelmann and Torsten Albrecht


Commit: 851e0b4baee0cdd1b51bab8398afdbe97396c130
https://github.com/pism/pism/commit/851e0b4baee0cdd1b51bab8398afdbe97396c130
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-16 (Thu, 16 Nov 2017)

Changed paths:
M src/coupler/atmosphere/CosineYearlyCycle.cc
M src/coupler/atmosphere/SeariseGreenland.cc
M src/coupler/atmosphere/TemperaturePIK.cc
M src/coupler/atmosphere/YearlyCycle.cc
M src/coupler/atmosphere/YearlyCycle.hh

Log Message:
-----------
Renamed mean_july to mean_summer in PDD scheme to avoid confusion for Antarctic applications


Commit: 2cb26b3d04cb7e140531e4c243b318a3c3047e1b
https://github.com/pism/pism/commit/2cb26b3d04cb7e140531e4c243b318a3c3047e1b
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-16 (Thu, 16 Nov 2017)

Changed paths:
M src/coupler/atmosphere/LapseRates.cc
M src/coupler/atmosphere/LapseRates.hh
M src/coupler/util/PLapseRates.hh

Log Message:
-----------
Precipitation adjustment to changing surface elev.

We use precip = fac * precip0
with fac = exp(precip_scale_factor*(height-reference_heigt))

To be consistent with the paleo_precip and pik_temp temperature lapse rate,
you need a -precip_scale_factor 0.238 = 5%/K * 8.2 K/km

To gain the same scaling as in DP2016, you need
a precip_scale_factor = 0.554 = (log(2)/10) K-1 *8.0 K/km.


Commit: f3f57065e19bf212ce0e3e69c199574bd1580747
https://github.com/pism/pism/commit/f3f57065e19bf212ce0e3e69c199574bd1580747
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-16 (Thu, 16 Nov 2017)

Changed paths:
M src/coupler/surface/LapseRates.cc
M src/coupler/surface/LapseRates.hh

Log Message:
-----------
Surface mass balance scaling analogous to precip

use as options for surface model xxx
-surface xxx,lapse_rate -temp_lapse_rate 8.0 -smb_scale_factor 0.5 -surface_lapse_rate_file $reference_usurf_file"

analogous to options for atmosphere model yyy
-atmosphere yyy,lapse_rate -temp_lapse_rate 8.0 -precip_scale_factor 0.5 -atmosphere_lapse_rate_file $reference_usurf_file


Commit: a484c8ae7c0e2108d9abb728f4193c44f7469744
https://github.com/pism/pism/commit/a484c8ae7c0e2108d9abb728f4193c44f7469744
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)

Changed paths:
M src/icemodel/fracture_density.cc
M src/pism_config.cdl

Log Message:
-----------
Implemented fracture growth as Borstad et al. 2016

Constitutive framework of fracture density growth according to
observations in remnant Larsen B Ice Shelf (Eq. 4)


Commit: 351934325bf8a3ced914280ef15c017b8a076e07
https://github.com/pism/pism/commit/351934325bf8a3ced914280ef15c017b8a076e07
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)

Changed paths:
M src/icemodel/diagnostics.cc
M src/icemodel/fracture_density.cc

Log Message:
-----------
Added diagnostic associated with fracture density

fracture_density,
fracture_growth_rate,
fracture_healing_rate,
fracture_flow_enhancement,
fracture_toughness


Commit: 1e63eb6828f33ba980f06804a6e3b8fb95e18ef3
https://github.com/pism/pism/commit/1e63eb6828f33ba980f06804a6e3b8fb95e18ef3
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)

Changed paths:
M src/earth/BedDef.cc
M src/earth/BedDef.hh
M src/earth/LingleClark.cc
M src/earth/LingleClark.hh
M src/earth/PointwiseIsostasy.cc
M src/icemodel/IceModel.cc
M src/icemodel/IceModel.hh
M src/icemodel/diagnostics.cc
M src/icemodel/initialization.cc
M src/pism_config.cdl

Log Message:
-----------
Include ocean column in bed deformation model

Added option -include_ocean_load to account for changes of sea-level and marine bed topography in bed deformation model.
Hence thickness changes of ice shelves are neglected.

Output variable is 'beddef_load_thickness'


Commit: ef508da35ea5bf5f3398fe344af898a9329360b5
https://github.com/pism/pism/commit/ef508da35ea5bf5f3398fe344af898a9329360b5
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)

Changed paths:
M src/basalstrength/MohrCoulombYieldStress.cc
M src/basalstrength/MohrCoulombYieldStress.hh

Log Message:
-----------
Iterative optimization for till friction angle

to minimize local misfit to present-day surface elevation. This method is based on Pollard et al., 2012, who optimized for tauc instead.

Options to choose are -iterative_phi $usurf_target_file -tphi_inverse 500.0 -hphi_inverse 250.0 -phimax_inverse 70.0 -phimin_inverse 2.0 -phimod_inverse 2e-3

Output variables are -extra_vars tillphi,diff_usurf,diff_mask


Commit: 631d5188d5dcea38d18e5d697a2a1d6987132229
https://github.com/pism/pism/commit/631d5188d5dcea38d18e5d697a2a1d6987132229
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
M src/geometry/GeometryEvolution.cc
M src/geometry/GeometryEvolution.hh
M src/pism_config.cdl

Log Message:
-----------
Prescribe the grounding line location

Use option -prescribe_gl for present day runs without bed deformation:
ice shelf thickness remains constant and initially grounded ice can not become afloat


Commit: 5ecd5714bd4e5c58e48f3ecff961336e40924976
https://github.com/pism/pism/commit/5ecd5714bd4e5c58e48f3ecff961336e40924976
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
M src/coupler/surface/LapseRates.cc
M src/coupler/surface/LapseRates.hh
M src/coupler/util/PLapseRates.hh

Log Message:
-----------
Removed SMB lapse rate scaling...


Commit: 85c39b58ccaaaae2bf1f2650f1a003b0d378c498
https://github.com/pism/pism/commit/85c39b58ccaaaae2bf1f2650f1a003b0d378c498
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
M doc/ice-bib.bib
M src/coupler/CMakeLists.txt
A src/coupler/ocean/Cavity.cc
A src/coupler/ocean/Cavity.hh
M src/coupler/ocean/Factory.cc
M src/coupler/surface/LapseRates.cc
M src/coupler/surface/LapseRates.hh
M src/coupler/util/PLapseRates.hh
M src/icemodel/initialization.cc
M src/pism_config.cdl

Log Message:
-----------
Merge branch 'pico_1.0' into pism_pik_1.0

soved conflicts:
src/coupler/surface/LapseRates.cc
src/coupler/surface/LapseRates.hh
src/coupler/util/PLapseRates.hh


Commit: e2f1fae0783864202410a1b7804e1a439c8c4f0a
https://github.com/pism/pism/commit/e2f1fae0783864202410a1b7804e1a439c8c4f0a
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
M src/coupler/CMakeLists.txt
M src/coupler/atmosphere/CosineYearlyCycle.cc
M src/coupler/atmosphere/Factory.cc
M src/coupler/atmosphere/SeariseGreenland.cc
A src/coupler/atmosphere/TemperaturePIK.cc
A src/coupler/atmosphere/TemperaturePIK.hh
M src/coupler/atmosphere/YearlyCycle.cc
M src/coupler/atmosphere/YearlyCycle.hh

Log Message:
-----------
Merge branch 'pik_pdd_scheme_1.0' into pism_pik_1.0


Commit: 6617e90698504034dc9975e5f2aa667d5c6c29a3
https://github.com/pism/pism/commit/6617e90698504034dc9975e5f2aa667d5c6c29a3
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
M src/earth/BedDef.cc
M src/earth/BedDef.hh
M src/earth/LingleClark.cc
M src/earth/LingleClark.hh
M src/earth/PointwiseIsostasy.cc
M src/icemodel/IceModel.cc
M src/icemodel/IceModel.hh
M src/icemodel/diagnostics.cc
M src/icemodel/initialization.cc
M src/pism_config.cdl

Log Message:
-----------
Merge branch 'beddef_ocean_load_1.0' into pism_pik_1.0


Commit: 370e4cd3d5ea2de8d3242302d2a1e11eb279a214
https://github.com/pism/pism/commit/370e4cd3d5ea2de8d3242302d2a1e11eb279a214
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
M src/calving/OceanKill.cc

Log Message:
-----------
Merge branch 'read_kill_ocean_mask_1.0' into pism_pik_1.0


Commit: 734a8d1cb9519fc7c300559a5e12032064c88316
https://github.com/pism/pism/commit/734a8d1cb9519fc7c300559a5e12032064c88316
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
M src/basalstrength/MohrCoulombYieldStress.cc
M src/basalstrength/MohrCoulombYieldStress.hh
M src/geometry/GeometryEvolution.cc
M src/geometry/GeometryEvolution.hh
M src/pism_config.cdl

Log Message:
-----------
Merge branch 'paleo_init_1.0' into pism_pik_1.0


Commit: 2520d7d53341c91b62092170e6d9e59bfba77a2d
https://github.com/pism/pism/commit/2520d7d53341c91b62092170e6d9e59bfba77a2d
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
M src/icemodel/diagnostics.cc

Log Message:
-----------
Fixed fracture diagnostics


Commit: 7bc7080d6f0e6051540941141e44927b4987ab97
https://github.com/pism/pism/commit/7bc7080d6f0e6051540941141e44927b4987ab97
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
M src/icemodel/diagnostics.cc
M src/icemodel/fracture_density.cc
M src/pism_config.cdl

Log Message:
-----------
Merge branch 'fracture_density_1.0' into pism_pik_1.0

solved conflicts:
src/icemodel/diagnostics.cc


Commit: ec58d154533b0df4c00ffd12e76d37db291d15d4
https://github.com/pism/pism/commit/ec58d154533b0df4c00ffd12e76d37db291d15d4
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
M src/basalstrength/MohrCoulombYieldStress.cc

Log Message:
-----------
Fixed diagnostics for till_phi iteration


Commit: 2238802b48fad4f926bf724ff77993cbaa9a69eb
https://github.com/pism/pism/commit/2238802b48fad4f926bf724ff77993cbaa9a69eb
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Changed paths:
M src/basalstrength/MohrCoulombYieldStress.cc

Log Message:
-----------
Fixed diagnostics for till_phi iteration


Commit: c2c8bbf8fbd78f904d3b71ce240564310ba825a6
https://github.com/pism/pism/commit/c2c8bbf8fbd78f904d3b71ce240564310ba825a6
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/coupler/ocean/Cavity.cc
M src/coupler/ocean/Cavity.hh

Log Message:
-----------
Added PICO diagnostics:

output state variables are:

"basins" -> cbasins
"pico_overturning" -> overturning
"pico_salinity_box0" -> Soc_box0
"pico_temperature_box0" -> Toc_box0
"pico_ocean_box_mask" -> ocean_box_mask

diagnostic varibales are:

"pico_bmelt_shelf" -> basalmeltrate_shelf
"pico_icerise_mask" -> icerise_mask
"pico_ocean_contshelf_mask" -> ocean_contshelf_mask)
"pico_ocean_mask" -> ocean_mask
"pico_lake_mask" -> lake_mask
"pico_dist_grounding_line" -> DistGL
"pico_dist_iceshelf_front" -> DistIF
"pico_salinity" -> Soc
"pico_temperature" -> Toc
"pico_T_star" -> T_star
"pico_T_pressure_melting" -> T_pressure_melting


Commit: 40e3743482bc565bd12f367c7991923a9f1bc374
https://github.com/pism/pism/commit/40e3743482bc565bd12f367c7991923a9f1bc374
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/calving/OceanKill.cc
M src/pism_config.cdl

Log Message:
-----------
Set configuration flag calving.ocean_kill.mask_set


Commit: 162a38bc28019a6b9d30d02a9930664fd24ef292
https://github.com/pism/pism/commit/162a38bc28019a6b9d30d02a9930664fd24ef292
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/coupler/atmosphere/LapseRates.cc
M src/coupler/surface/LapseRates.cc
M src/pism_config.cdl

Log Message:
-----------
Set configuration flags for precip/smb lapse rates

Use for lapse_rate modifier -precip_lapse_scaling -precip_scale_factor 0.5 for the atmosphere coupler
and -smb_lapse_scaling -smb_scale_factor 0.5 for the surface coupler.


Commit: 6b9657079b93e048d441b882150d4b9f72c7f226
https://github.com/pism/pism/commit/6b9657079b93e048d441b882150d4b9f72c7f226
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/coupler/util/PLapseRates.hh

Log Message:
-----------
Apply precip scaling to computatational domain

to avoid discontinuities.


Commit: 6ae6be687129779699175b251367f268fe086ce9
https://github.com/pism/pism/commit/6ae6be687129779699175b251367f268fe086ce9
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/basalstrength/MohrCoulombYieldStress.cc
M src/basalstrength/MohrCoulombYieldStress.hh
M src/geometry/GeometryEvolution.cc

Log Message:
-----------
Rewrite iterative_phi_step as separate function


Commit: 42cb17f0f4f65c55d3106542a1111d49cff9dc68
https://github.com/pism/pism/commit/42cb17f0f4f65c55d3106542a1111d49cff9dc68
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/coupler/CMakeLists.txt
R src/coupler/ocean/Cavity.cc
R src/coupler/ocean/Cavity.hh
M src/coupler/ocean/Factory.cc
A src/coupler/ocean/Pico.cc
A src/coupler/ocean/Pico.hh

Log Message:
-----------
rename Cavity to Pico


Commit: 76e8b9fc7334dca1967504f4d69bda290aab940a
https://github.com/pism/pism/commit/76e8b9fc7334dca1967504f4d69bda290aab940a
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/coupler/ocean/Pico.cc
M src/coupler/ocean/Pico.hh

Log Message:
-----------
Replacing SIMPEL with PICO in Pico.cc and .hh


Commit: c685df6ae23eea1e7d50b9d4d0eb83282bf5af01
https://github.com/pism/pism/commit/c685df6ae23eea1e7d50b9d4d0eb83282bf5af01
Author: Ronja Reese <re...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/coupler/ocean/Pico.cc

Log Message:
-----------
Update citation for PICO


Commit: 024bf0d967dfec76a75daacd7ddd84d2f75c09ad
https://github.com/pism/pism/commit/024bf0d967dfec76a75daacd7ddd84d2f75c09ad
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/geometry/GeometryEvolution.cc

Log Message:
-----------
Avoid negative thickness in -prescribe_gl

as a result of floating point precision mismatch


Commit: 03ccb84293719bd2b5616d612ddf0c5bca12f74a
https://github.com/pism/pism/commit/03ccb84293719bd2b5616d612ddf0c5bca12f74a
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/coupler/CMakeLists.txt
R src/coupler/ocean/Cavity.cc
R src/coupler/ocean/Cavity.hh
M src/coupler/ocean/Factory.cc
A src/coupler/ocean/Pico.cc
A src/coupler/ocean/Pico.hh

Log Message:
-----------
Merge branch 'pico_1.0' into pism_pik_1.0


Commit: ab62650b9405d820227f049058cf56c05e62301a
https://github.com/pism/pism/commit/ab62650b9405d820227f049058cf56c05e62301a
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/basalstrength/MohrCoulombYieldStress.cc
M src/basalstrength/MohrCoulombYieldStress.hh
M src/geometry/GeometryEvolution.cc

Log Message:
-----------
Merge branch 'paleo_init_1.0' into pism_pik_1.0

Solved minor conflict:
src/basalstrength/MohrCoulombYieldStress.cc


Commit: 06abcafb9dce42ff1a8c473167bf12faa3afaf9b
https://github.com/pism/pism/commit/06abcafb9dce42ff1a8c473167bf12faa3afaf9b
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/calving/OceanKill.cc
M src/pism_config.cdl

Log Message:
-----------
Merge branch 'read_kill_ocean_mask_1.0' into pism_pik_1.0


Commit: b9e1378468e2e785dee17f3f00f48476949ab943
https://github.com/pism/pism/commit/b9e1378468e2e785dee17f3f00f48476949ab943
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)

Changed paths:
M src/coupler/atmosphere/LapseRates.cc
M src/coupler/surface/LapseRates.cc
M src/coupler/util/PLapseRates.hh
M src/pism_config.cdl

Log Message:
-----------
Merge branch 'precip_lapse_scale_1.0' into pism_pik_1.0


Commit: 9d148b87d71619874fab43687c896145bbe2f7e3
https://github.com/pism/pism/commit/9d148b87d71619874fab43687c896145bbe2f7e3
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Changed paths:
M src/coupler/atmosphere/LapseRates.cc
M src/coupler/surface/LapseRates.cc
M src/coupler/surface/TemperatureIndex.cc
M src/pism_config.cdl

Log Message:
-----------
Enable -precip_lapse_scaling also for -surface pdd

and fixed typo in -smb_lapse_scaling config


Commit: 4bba34fabec7673286a8513be938ce0cdf6c4e2f
https://github.com/pism/pism/commit/4bba34fabec7673286a8513be938ce0cdf6c4e2f
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-12-01 (Fri, 01 Dec 2017)

Changed paths:
M src/coupler/atmosphere/LapseRates.cc

Log Message:
-----------
Fixed typo in precip scaling as used in PDD model


Commit: 4a2ff01af1e897fddf6aff1bb8850e61b7aea90c
https://github.com/pism/pism/commit/4a2ff01af1e897fddf6aff1bb8850e61b7aea90c
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-12-05 (Tue, 05 Dec 2017)

Changed paths:
M src/coupler/ocean/GivenTH.cc
M src/coupler/ocean/Pico.cc

Log Message:
-----------
Added option -no_shelfb_melt to PICO and GivenTH

for test purposes, to set shelfbmassflux to 0, but leave shelfbtmep unaffected...


Commit: 84c1e8b2286533a9bcd0c70335479b9cf06a20f0
https://github.com/pism/pism/commit/84c1e8b2286533a9bcd0c70335479b9cf06a20f0
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-12-11 (Mon, 11 Dec 2017)

Changed paths:
M src/coupler/atmosphere/LapseRates.cc

Log Message:
-----------
Fixed sign typo in precip scaling as used in PDD


Commit: 0f8866c47869ef7806746710248ada483b9a1cf1
https://github.com/pism/pism/commit/0f8866c47869ef7806746710248ada483b9a1cf1
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Changed paths:
M src/geometry/Geometry.cc
M src/geometry/grounded_cell_fraction.cc
M src/geometry/grounded_cell_fraction.hh
M src/icemodel/diagnostics.cc

Log Message:
-----------
Fixes bug when using -subgl (-pik) and delta_SL

hopefully. compute_grounded_cell_fraction() uses now 2 sea_level from Geometry


Commit: f2e24e88f0cbf6943267bd7faddebdcf487a2f7f
https://github.com/pism/pism/commit/f2e24e88f0cbf6943267bd7faddebdcf487a2f7f
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2018-01-23 (Tue, 23 Jan 2018)

Changed paths:
M src/coupler/atmosphere/TemperaturePIK.cc

Log Message:
-----------
Modified pik_temp_interim_lon to 1000m min surface elevation


Compare: https://github.com/pism/pism/compare/b69d3de52d74%5E...f2e24e88f0cb
Reply all
Reply to author
Forward
0 new messages