Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master for release v0.6.6 #56

Merged
merged 13 commits into from
Feb 14, 2024
Merged

Update master for release v0.6.6 #56

merged 13 commits into from
Feb 14, 2024

Conversation

mbakker7
Copy link
Owner

No description provided.

mbakker7 and others added 8 commits October 25, 2023 16:31
timmlmodel is solved when supplied
…del-raises-error

51 providing an unsolved timmlmodel raises error
* improve docs
- add new sections (like TimML)
- run docformatter
- fix some linting issues

* fix coveralls parallel build issue

* update gitignore

* add sphinx-bibtex to  docs deps

* move pumptests notebooks to docs

* rename api folder

* add about section with bibliography

* update main docs page layout
update conf.py

* add all examples

* add newline

* delete moved notebooks from notebook dir
- update tests accordingly

* update nbdirs

* no more notebooks remaining in notebooks dir

* fix nb tests

* hopefully final fix
* added howto pumpintests

* fix output in notebooks

---------

Co-authored-by: Davíd Brakenhoff <d.brakenhoff@artesia-water.nl>
* added howto pumpintests

* fix output in notebooks

---------

Co-authored-by: Davíd Brakenhoff <d.brakenhoff@artesia-water.nl>
@dbrakenhoff dbrakenhoff marked this pull request as ready for review February 13, 2024 14:04
@dbrakenhoff
Copy link
Collaborator

dbrakenhoff commented Feb 13, 2024

Using this PR to make a new release for TTim.

@dbrakenhoff dbrakenhoff changed the title Update Master with latest dev Update master for release v0.6.6 Feb 13, 2024
dbrakenhoff and others added 2 commits February 13, 2024 15:16
* Adding files with completed notebooks for tracking (Testing, some fixes still needs to be done)

* Adding README, first version

* Correcting English and adding extra images to the unconfined notes + rerunning the code in the leaky notes

* Corrected English in notebooks and minor change in aquifer.py to avoid bug in leaky2_hardixveld

* Reruning the outputs and correcting english

* adding pumpingtest folders

* merged change in pumping test notebook (dont know why it dind merge before)

* removing unwanted files

* revert all files in docs directory

* last files to remove

* Update confined1_oude_korendijk.ipynb

Update using import ttim as ttm and change all ttim commands
Fix pandas error for use of append - still gives deprecation warning
Set default figure size and remove setting figure size
Add grid to all graphs
Remove next notebook cell at end

* remove fitm

fitm is part of ttim

* modified confined pumpingtest notebooks according to #58 (comment)

* move updated pumping test noteboks

* update tutorials

* move elements to concepts (from howto section)

* move elements to concepts (from howto section)

* delete old pumping test notebooks

* remove url visited date from bib file

* ruff formatting

* organize examples in docs

* ruff format notebooks

* display inline math in notebooks in docs

---------

Co-authored-by: vcantarella <vcantarella@gmail.com>
Co-authored-by: Mark Bakker <markbak@gmail.com>
@dbrakenhoff
Copy link
Collaborator

@mbakker7, all good to go?

@mbakker7
Copy link
Owner Author

Looks good. Only improvement I am wondering about is the cross-sectional figures in the pumping test notebooks. There is a nice figure in, for example, the Oude Korendijk notebook with. a cross-section of the aquifer. The code for this figure is also shown in the notebook, but the code is exceedingly long (several screens). Any way we can hide the code of this cell in ReadTheDocs?

@dbrakenhoff
Copy link
Collaborator

dbrakenhoff commented Feb 14, 2024

Let's move the code for creating the cross sections to a separate file and call it from there. I'll make the change.

EDIT: better idea, there is a way to hide that code cell. I'll try that first.

- hide cross section figure cell
- add trailing semi colons to suppress output
- remove last cell linking to next nb
@mbakker7
Copy link
Owner Author

That worked! Code cell is hidden in Oude Korendijk. You're gonna have to tell me how you did that.
Ready to merge.

@dbrakenhoff
Copy link
Collaborator

dbrakenhoff commented Feb 14, 2024

Add the cell tag "hide-input" to the cell metadata. I believe you can edit cell metadata in Jupyter Lab through a separate small window somehow. In VS Code you can use the "Add cell tag"-command and then type "hide-input".

This is what it looks like in JSON:

  {
   "cell_type": "code",
   "execution_count": 1,
   "metadata": {
    "tags": [
     "hide-input"
    ]
   },
   "outputs": [
    {
     "data": {
        "<output here>"
     },
     "metadata": {},
     "output_type": "display_data"
    }
   ],
   "source": [
    "<python code here>"
   ]
  },

@dbrakenhoff dbrakenhoff merged commit 297343e into master Feb 14, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants