[pism/pism] eab783: Port Torsten's code to the current dev branch
0 views
Skip to first unread message
Constantine Khrulev
Oct 6, 2021, 1:39:51 PM10/6/21
to pism....@gmail.com
Branch: refs/heads/dev
Home: https://github.com/pism/pism
Commit: eab7835e5345423851f9d198424fbb714999de1e
https://github.com/pism/pism/commit/eab7835e5345423851f9d198424fbb714999de1e
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-13 (Mon, 13 Sep 2021)
Changed paths:
M CHANGES.rst
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Port Torsten's code to the current dev branch
Commit: bb1227db8d803fc2e8aff3b9a6eadbb8bcad0890
https://github.com/pism/pism/commit/bb1227db8d803fc2e8aff3b9a6eadbb8bcad0890
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-13 (Mon, 13 Sep 2021)
Changed paths:
M src/fracturedensity/FractureDensity.cc
Log Message:
-----------
Remove an unused variable
Commit: ee816f1ec6377cb90c41b3eeac21255ef7df01a6
https://github.com/pism/pism/commit/ee816f1ec6377cb90c41b3eeac21255ef7df01a6
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-14 (Tue, 14 Sep 2021)
Changed paths:
M src/pism_config.cdl
M src/util/Time.cc
Log Message:
-----------
Fix -time_file handling
Commit: 37a9923de2721f8044f42f0e88003e9459484ede
https://github.com/pism/pism/commit/37a9923de2721f8044f42f0e88003e9459484ede
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-15 (Wed, 15 Sep 2021)
Changed paths:
M examples/ross/fracture/README.md
M examples/ross/fracture/run_frac.sh
A examples/ross/fracture/run_frac_borstad.sh
Log Message:
-----------
Added bash Ross fracture example with Borstad limit as option
Commit: e79da79c2cce40ce32636a89ab006ce6232fb6b0
https://github.com/pism/pism/commit/e79da79c2cce40ce32636a89ab006ce6232fb6b0
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M examples/ross/fracture/README.md
M examples/ross/fracture/run_frac.sh
M examples/ross/fracture/run_frac_borstad.sh
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Added infos to fracture density options in config. Added min criterion for healing. Some clean up in example/ross/fracture
Commit: 9be4c15f18e35b5ad15badf119258697e9a0c5fd
https://github.com/pism/pism/commit/9be4c15f18e35b5ad15badf119258697e9a0c5fd
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/ice-bib.bib
A doc/sphinx/manual/modeling-choices/marine/damage.rst
M doc/sphinx/manual/modeling-choices/marine/index.rst
Log Message:
-----------
Added some documentation (draft) on fracture density code
Commit: 285a9e93fc56a9ab96b03cfe9e51b6b8cbb41675
https://github.com/pism/pism/commit/285a9e93fc56a9ab96b03cfe9e51b6b8cbb41675
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M examples/ross/fracture/README.md
M examples/ross/fracture/run_frac.sh
A examples/ross/fracture/run_frac_borstad.sh
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Merge branch 'ckhrulev/fracture-density-borstad-limit' of ssh://github.com/pism/pism into fracture-density-borstad-limit
Commit: 9171c336b7ee4ba6b2509980c85b5559b2e204ed
https://github.com/pism/pism/commit/9171c336b7ee4ba6b2509980c85b5559b2e204ed
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/ice-bib.bib
M doc/sphinx/manual/modeling-choices/marine/damage.rst
Log Message:
-----------
Some clean up on fracture density documentation in manual
Commit: 17f283dd50e372ae47412fac0ff3050b7f24106f
https://github.com/pism/pism/commit/17f283dd50e372ae47412fac0ff3050b7f24106f
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/sphinx/manual/modeling-choices/marine/damage.rst
Log Message:
-----------
Fix rst formatting issues
Commit: e0982de54d24bdd6677bbed9454dfdf96d5e3ae4
https://github.com/pism/pism/commit/e0982de54d24bdd6677bbed9454dfdf96d5e3ae4
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/sphinx/conf.py
Log Message:
-----------
Support both Sphinx 3.x and Sphinx 4.x
Commit: aa68c39a01e71343ec2380189834cbdaf352ab9e
https://github.com/pism/pism/commit/aa68c39a01e71343ec2380189834cbdaf352ab9e
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M src/geometry/Geometry.cc
M src/geometry/Geometry.hh
M src/icemodel/IceModel.cc
M src/icemodel/IceModel.hh
M src/icemodel/initialization.cc
Log Message:
-----------
A bit of cleanup
Commit: 7ad89f2e3a0f4f613426eb217855ec6383470ccf
https://github.com/pism/pism/commit/7ad89f2e3a0f4f613426eb217855ec6383470ccf
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/sphinx/contributing/development-workflow.rst
Log Message:
-----------
Improve the manual section about editing the manual
Commit: cacba1a5fb22be7dc7c3b5dd0667267d43036b60
https://github.com/pism/pism/commit/cacba1a5fb22be7dc7c3b5dd0667267d43036b60
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/sphinx/manual/modeling-choices/marine/damage.rst
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Work on cleaning up the documentation of the fracture density model
Commit: 50464945546af28690956ae6d88307170cfec62e
https://github.com/pism/pism/commit/50464945546af28690956ae6d88307170cfec62e
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-17 (Fri, 17 Sep 2021)
Changed paths:
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Use configuration parameters instead of command-line options
Commit: 38f895b6e2851e1d62443db63e615fce0032edac
https://github.com/pism/pism/commit/38f895b6e2851e1d62443db63e615fce0032edac
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-17 (Fri, 17 Sep 2021)
Changed paths:
M doc/sphinx/manual/modeling-choices/marine/damage.rst
Log Message:
-----------
A few minor edits
Commit: 5d24e5270379d9e0801e4c6587d34e01fd2f09b7
https://github.com/pism/pism/commit/5d24e5270379d9e0801e4c6587d34e01fd2f09b7
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-17 (Fri, 17 Sep 2021)
Changed paths:
M examples/ross/fracture/run_frac.sh
M examples/ross/fracture/run_frac_borstad.sh
Log Message:
-----------
Update example scripts
Commit: ea45b370b0261d08f68794820d18c568eb34623e
https://github.com/pism/pism/commit/ea45b370b0261d08f68794820d18c568eb34623e
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-17 (Fri, 17 Sep 2021)
Changed paths:
M src/pism_config.cdl
Log Message:
-----------
A couple more edits
Commit: 9d5248f8a5253d6f9336400ac53855609075343d
https://github.com/pism/pism/commit/9d5248f8a5253d6f9336400ac53855609075343d
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-18 (Sat, 18 Sep 2021)
Changed paths:
M doc/sphinx/manual/modeling-choices/marine/damage.rst
Log Message:
-----------
Minor edits in fracture doc
Commit: 84374371a430ed982fbbac6b9f6e973a72dec04c
https://github.com/pism/pism/commit/84374371a430ed982fbbac6b9f6e973a72dec04c
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-20 (Mon, 20 Sep 2021)
Changed paths:
M src/util/Time.cc
Log Message:
-----------
Fix the initialization of time units when -time_file is used
Commit: 6c5a5b26f1ee4340bdb021b0ff24a56b129a616f
https://github.com/pism/pism/commit/6c5a5b26f1ee4340bdb021b0ff24a56b129a616f
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-10-05 (Tue, 05 Oct 2021)
Changed paths:
M examples/ross/fracture/run_frac.sh
M examples/ross/fracture/run_frac_borstad.sh
M examples/ross/prognostic/run_prog.sh
Log Message:
-----------
Add "-regional" to commands running PISM in examples/ross
Commit: c6d15fc7f9349586ca355b5bccef3ac792bede8a
https://github.com/pism/pism/commit/c6d15fc7f9349586ca355b5bccef3ac792bede8a
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-10-05 (Tue, 05 Oct 2021)
Changed paths:
M CHANGES.rst
M doc/ice-bib.bib
A doc/sphinx/manual/modeling-choices/marine/damage.rst
M doc/sphinx/manual/modeling-choices/marine/index.rst
M examples/ross/fracture/README.md
M examples/ross/fracture/run_frac.sh
A examples/ross/fracture/run_frac_borstad.sh
M examples/ross/prognostic/run_prog.sh
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Merge branch 'ckhrulev/fracture-density-borstad-limit' into dev
Compare: https://github.com/pism/pism/compare/1e8e8d71ffe6...c6d15fc7f934
Home: https://github.com/pism/pism
Commit: eab7835e5345423851f9d198424fbb714999de1e
https://github.com/pism/pism/commit/eab7835e5345423851f9d198424fbb714999de1e
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-13 (Mon, 13 Sep 2021)
Changed paths:
M CHANGES.rst
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Port Torsten's code to the current dev branch
Commit: bb1227db8d803fc2e8aff3b9a6eadbb8bcad0890
https://github.com/pism/pism/commit/bb1227db8d803fc2e8aff3b9a6eadbb8bcad0890
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-13 (Mon, 13 Sep 2021)
Changed paths:
M src/fracturedensity/FractureDensity.cc
Log Message:
-----------
Remove an unused variable
Commit: ee816f1ec6377cb90c41b3eeac21255ef7df01a6
https://github.com/pism/pism/commit/ee816f1ec6377cb90c41b3eeac21255ef7df01a6
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-14 (Tue, 14 Sep 2021)
Changed paths:
M src/pism_config.cdl
M src/util/Time.cc
Log Message:
-----------
Fix -time_file handling
Commit: 37a9923de2721f8044f42f0e88003e9459484ede
https://github.com/pism/pism/commit/37a9923de2721f8044f42f0e88003e9459484ede
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-15 (Wed, 15 Sep 2021)
Changed paths:
M examples/ross/fracture/README.md
M examples/ross/fracture/run_frac.sh
A examples/ross/fracture/run_frac_borstad.sh
Log Message:
-----------
Added bash Ross fracture example with Borstad limit as option
Commit: e79da79c2cce40ce32636a89ab006ce6232fb6b0
https://github.com/pism/pism/commit/e79da79c2cce40ce32636a89ab006ce6232fb6b0
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M examples/ross/fracture/README.md
M examples/ross/fracture/run_frac.sh
M examples/ross/fracture/run_frac_borstad.sh
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Added infos to fracture density options in config. Added min criterion for healing. Some clean up in example/ross/fracture
Commit: 9be4c15f18e35b5ad15badf119258697e9a0c5fd
https://github.com/pism/pism/commit/9be4c15f18e35b5ad15badf119258697e9a0c5fd
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/ice-bib.bib
A doc/sphinx/manual/modeling-choices/marine/damage.rst
M doc/sphinx/manual/modeling-choices/marine/index.rst
Log Message:
-----------
Added some documentation (draft) on fracture density code
Commit: 285a9e93fc56a9ab96b03cfe9e51b6b8cbb41675
https://github.com/pism/pism/commit/285a9e93fc56a9ab96b03cfe9e51b6b8cbb41675
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M examples/ross/fracture/README.md
M examples/ross/fracture/run_frac.sh
A examples/ross/fracture/run_frac_borstad.sh
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Merge branch 'ckhrulev/fracture-density-borstad-limit' of ssh://github.com/pism/pism into fracture-density-borstad-limit
Commit: 9171c336b7ee4ba6b2509980c85b5559b2e204ed
https://github.com/pism/pism/commit/9171c336b7ee4ba6b2509980c85b5559b2e204ed
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/ice-bib.bib
M doc/sphinx/manual/modeling-choices/marine/damage.rst
Log Message:
-----------
Some clean up on fracture density documentation in manual
Commit: 17f283dd50e372ae47412fac0ff3050b7f24106f
https://github.com/pism/pism/commit/17f283dd50e372ae47412fac0ff3050b7f24106f
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/sphinx/manual/modeling-choices/marine/damage.rst
Log Message:
-----------
Fix rst formatting issues
Commit: e0982de54d24bdd6677bbed9454dfdf96d5e3ae4
https://github.com/pism/pism/commit/e0982de54d24bdd6677bbed9454dfdf96d5e3ae4
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/sphinx/conf.py
Log Message:
-----------
Support both Sphinx 3.x and Sphinx 4.x
Commit: aa68c39a01e71343ec2380189834cbdaf352ab9e
https://github.com/pism/pism/commit/aa68c39a01e71343ec2380189834cbdaf352ab9e
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M src/geometry/Geometry.cc
M src/geometry/Geometry.hh
M src/icemodel/IceModel.cc
M src/icemodel/IceModel.hh
M src/icemodel/initialization.cc
Log Message:
-----------
A bit of cleanup
Commit: 7ad89f2e3a0f4f613426eb217855ec6383470ccf
https://github.com/pism/pism/commit/7ad89f2e3a0f4f613426eb217855ec6383470ccf
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/sphinx/contributing/development-workflow.rst
Log Message:
-----------
Improve the manual section about editing the manual
Commit: cacba1a5fb22be7dc7c3b5dd0667267d43036b60
https://github.com/pism/pism/commit/cacba1a5fb22be7dc7c3b5dd0667267d43036b60
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-16 (Thu, 16 Sep 2021)
Changed paths:
M doc/sphinx/manual/modeling-choices/marine/damage.rst
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Work on cleaning up the documentation of the fracture density model
Commit: 50464945546af28690956ae6d88307170cfec62e
https://github.com/pism/pism/commit/50464945546af28690956ae6d88307170cfec62e
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-17 (Fri, 17 Sep 2021)
Changed paths:
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Use configuration parameters instead of command-line options
Commit: 38f895b6e2851e1d62443db63e615fce0032edac
https://github.com/pism/pism/commit/38f895b6e2851e1d62443db63e615fce0032edac
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-17 (Fri, 17 Sep 2021)
Changed paths:
M doc/sphinx/manual/modeling-choices/marine/damage.rst
Log Message:
-----------
A few minor edits
Commit: 5d24e5270379d9e0801e4c6587d34e01fd2f09b7
https://github.com/pism/pism/commit/5d24e5270379d9e0801e4c6587d34e01fd2f09b7
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-17 (Fri, 17 Sep 2021)
Changed paths:
M examples/ross/fracture/run_frac.sh
M examples/ross/fracture/run_frac_borstad.sh
Log Message:
-----------
Update example scripts
Commit: ea45b370b0261d08f68794820d18c568eb34623e
https://github.com/pism/pism/commit/ea45b370b0261d08f68794820d18c568eb34623e
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-17 (Fri, 17 Sep 2021)
Changed paths:
M src/pism_config.cdl
Log Message:
-----------
A couple more edits
Commit: 9d5248f8a5253d6f9336400ac53855609075343d
https://github.com/pism/pism/commit/9d5248f8a5253d6f9336400ac53855609075343d
Author: Torsten Albrecht <albr...@pik-potsdam.de>
Date: 2021-09-18 (Sat, 18 Sep 2021)
Changed paths:
M doc/sphinx/manual/modeling-choices/marine/damage.rst
Log Message:
-----------
Minor edits in fracture doc
Commit: 84374371a430ed982fbbac6b9f6e973a72dec04c
https://github.com/pism/pism/commit/84374371a430ed982fbbac6b9f6e973a72dec04c
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-09-20 (Mon, 20 Sep 2021)
Changed paths:
M src/util/Time.cc
Log Message:
-----------
Fix the initialization of time units when -time_file is used
Commit: 6c5a5b26f1ee4340bdb021b0ff24a56b129a616f
https://github.com/pism/pism/commit/6c5a5b26f1ee4340bdb021b0ff24a56b129a616f
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-10-05 (Tue, 05 Oct 2021)
Changed paths:
M examples/ross/fracture/run_frac.sh
M examples/ross/fracture/run_frac_borstad.sh
M examples/ross/prognostic/run_prog.sh
Log Message:
-----------
Add "-regional" to commands running PISM in examples/ross
Commit: c6d15fc7f9349586ca355b5bccef3ac792bede8a
https://github.com/pism/pism/commit/c6d15fc7f9349586ca355b5bccef3ac792bede8a
Author: Constantine Khrulev <ckhr...@alaska.edu>
Date: 2021-10-05 (Tue, 05 Oct 2021)
Changed paths:
M CHANGES.rst
M doc/ice-bib.bib
A doc/sphinx/manual/modeling-choices/marine/damage.rst
M doc/sphinx/manual/modeling-choices/marine/index.rst
M examples/ross/fracture/README.md
M examples/ross/fracture/run_frac.sh
A examples/ross/fracture/run_frac_borstad.sh
M examples/ross/prognostic/run_prog.sh
M src/fracturedensity/FractureDensity.cc
M src/pism_config.cdl
Log Message:
-----------
Merge branch 'ckhrulev/fracture-density-borstad-limit' into dev
Compare: https://github.com/pism/pism/compare/1e8e8d71ffe6...c6d15fc7f934
Reply all
Reply to author
Forward
0 new messages