Skip to content

Commit 01e5631

Browse files
authored
Documentation structure reorganization (#65)
* Used TSMP2 to build eCLM. This vastly simplifies the build procedure. * Updated the documentation structure - Created separate chapter dedicated to all aspects of running eCLM - Removed pages without content - Added external links to [TSMP2 Workflow Engine](https://hpscterrsys.github.io/TSMP2_workflow-engine/INDEX.html) and [eCLM static file generator](https://github.com/HPSCTerrSys/eCLM_static-file-generator/blob/main/README.md)
1 parent 4d567d2 commit 01e5631

21 files changed

Lines changed: 138 additions & 426 deletions

File tree

.github/workflows/CI.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
name: eCLM CI Test
22

3-
# Controls when the action will run.
4-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
510

611
jobs:
712
eclm_build_job:

.github/workflows/docs.yml

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ on:
44
push:
55
branches:
66
- master
7-
- 'docs-**'
7+
pull_request:
8+
branches:
9+
- master
810

911
env:
1012
BASE_URL: /${{ github.event.repository.name }}
@@ -16,24 +18,18 @@ concurrency:
1618
cancel-in-progress: false
1719

1820
jobs:
19-
deploy-docs:
20-
runs-on: ubuntu-latest
21-
environment:
22-
name: github-pages
23-
url: ${{ steps.deployment.outputs.page_url }}
24-
permissions:
25-
pages: write
26-
id-token: write
21+
build-docs:
22+
runs-on: ubuntu-24.04
2723
steps:
2824
- uses: actions/checkout@v4
2925

30-
- name: Set up Python 3.11
26+
- name: Set up Python 3.12
3127
uses: actions/setup-python@v5
3228
with:
33-
python-version: 3.11
29+
python-version: 3.12
3430
cache: 'pip'
3531

36-
- name: Install dependencies
32+
- name: Install pip packages
3733
run: pip install -r ${GITHUB_WORKSPACE}/docs/requirements.txt
3834

3935
- name: Build eCLM doc homepage
@@ -50,7 +46,23 @@ jobs:
5046
uses: actions/upload-pages-artifact@v3
5147
with:
5248
path: "docs/_build/html"
49+
name: eCLM_docs
5350

54-
- name: Deploy to GitHub Pages
55-
id: deployment
56-
uses: actions/deploy-pages@v4
51+
deploy-docs:
52+
if: github.event_name != 'pull_request'
53+
needs: build-docs
54+
runs-on: ubuntu-24.04
55+
environment:
56+
name: github-pages
57+
url: ${{ steps.deployment.outputs.page_url }}
58+
59+
permissions:
60+
pages: write
61+
id-token: write
62+
63+
steps:
64+
- name: Deploy to GitHub Pages
65+
id: deployment
66+
uses: actions/deploy-pages@v4
67+
with:
68+
artifact_name: eCLM_docs

docs/INDEX.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
**Welcome!** You are viewing the first version of the documentation for eCLM. This is a living document, which means it will be continuously updated and improved. Please check back regularly for the latest information and updates.
55
```
66

7-
```{tableofcontents}
8-
```
7+
eCLM is based on version 5.0 of the Community Land Model ([CLM5](https://www.cesm.ucar.edu/models/clm)) with simplified infrastructure for build and namelist generation. The build system is handled entirely by Cmake and namelists are generated through a small set of Python scripts. Similar to CLM5, eCLM is forced with meteorological data and uses numerous input streams on soil properties, land cover and land use, as well as complex parameter sets on crop phenology, and plant hydraulics for simulations.
8+

docs/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
BUILD_DIR = ./_build
22
SRC_DIR = ../src
33

4-
all: docs src-browser
5-
64
docs:
75
jupyter-book build -W -n --keep-going .
86

97
src-browser:
108
ford -d $(SRC_DIR) -o $(BUILD_DIR)/html/src FORD_options.md
119

10+
all: docs src-browser
11+
1212
.PHONY: clean
1313

1414
clean:
15-
jupyter-book clean .
15+
jupyter-book clean .

docs/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Book settings
88
title : eCLM Documentation # The title of the book. Will be placed in the left navbar.
99
author : HPSC TerrSys # The author of the book
10-
copyright : "2024" # Copyright year to be placed in the footer
10+
copyright : "2025" # Copyright year to be placed in the footer
1111
logo : "" # A path to the book logo
1212

1313
# Force re-execution of notebooks on each build.

docs/_toc.yml

Lines changed: 48 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,57 +3,51 @@
33
format: jb-book
44
root: INDEX
55
parts:
6-
- caption: User's Guide
7-
chapters:
8-
9-
- file: users_guide/introduction_to_eCLM/README
10-
title: Introduction to eCLM
11-
sections:
12-
- file: users_guide/introduction_to_eCLM/introduction
13-
- file: users_guide/introduction_to_eCLM/prerequisites
14-
- file: users_guide/introduction_to_eCLM/how_to_use_this_document
15-
16-
- file: users_guide/building_eCLM/README
17-
title: Building eCLM
18-
sections:
19-
- file: users_guide/building_eCLM/Ubuntu
20-
- file: users_guide/building_eCLM/JSC/README
21-
title: JSC
22-
sections:
23-
- file: users_guide/building_eCLM/JSC/prerequisites_JSC_users
24-
- file: users_guide/building_eCLM/JSC/setting_up_eCLM
25-
- file: users_guide/building_eCLM/Levante
26-
27-
- file: users_guide/case_examples/README
28-
title: Running example cases
29-
sections:
30-
- file: users_guide/case_examples/Wuestebach
31-
- file: users_guide/case_examples/NRW
32-
- file: users_guide/case_examples/EURO-CORDEX
33-
34-
- file: users_guide/case_creation/README
35-
title: Creating a custom case
36-
sections:
37-
- file: users_guide/case_creation/1_create_grid_file
38-
- file: users_guide/case_creation/2_create_mapping_file
39-
- file: users_guide/case_creation/3_create_domain_file
40-
- file: users_guide/case_creation/4_create_surface_file
41-
- file: users_guide/case_creation/5_modifications_surface_domain_file
42-
- file: users_guide/case_creation/6_create_atm_forcings
43-
44-
- file: users_guide/running_eCLM/README
45-
title: Running eCLM
46-
sections:
47-
- file: users_guide/running_eCLM/basic_commands
48-
- file: users_guide/running_eCLM/case_customization
49-
50-
- file: users_guide/analyzing_model_output
51-
title: Analyzing model output
52-
53-
- caption: Reference
54-
chapters:
55-
- file: reference/history_fields
56-
- url: https://escomp.github.io/ctsm-docs/versions/release-clm5.0/html/tech_note/index.html
57-
title: Technical Note
58-
- url: https://hpscterrsys.github.io/eCLM/src
59-
title: eCLM Source Code Browser
6+
- caption: Introduction
7+
chapters:
8+
- file: users_guide/installation/README
9+
title: Installing eCLM
10+
- file: users_guide/introduction/introduction
11+
title: Scientific Background
12+
13+
- caption: User's Guide
14+
chapters:
15+
- file: users_guide/case_examples/README
16+
title: Running example cases
17+
sections:
18+
- file: users_guide/case_examples/Wuestebach
19+
- file: users_guide/case_examples/NRW
20+
- file: users_guide/case_examples/EURO-CORDEX
21+
22+
- file: users_guide/running_cases/case_customization
23+
title: Customizing eCLM namelists
24+
25+
- file: users_guide/analyzing_model_output
26+
title: Analyzing model output
27+
28+
- file: users_guide/case_creation/README
29+
title: Creating a custom case
30+
sections:
31+
- file: users_guide/case_creation/1_create_grid_file
32+
- file: users_guide/case_creation/2_create_mapping_file
33+
- file: users_guide/case_creation/3_create_domain_file
34+
- file: users_guide/case_creation/4_create_surface_file
35+
- file: users_guide/case_creation/5_modifications_surface_domain_file
36+
- file: users_guide/case_creation/6_create_atm_forcings
37+
38+
- caption: Developer's Guide
39+
chapters:
40+
- file: users_guide/installation/source_installation
41+
title: Building eCLM from source
42+
- url: https://hpscterrsys.github.io/eCLM/src
43+
title: eCLM Source Code Browser
44+
45+
- caption: Reference
46+
chapters:
47+
- file: reference/history_fields
48+
- url: https://escomp.github.io/CTSM/release-clm5.0/tech_note/index.html
49+
title: CLM5 Technical Note
50+
- url: https://github.com/HPSCTerrSys/eCLM_static-file-generator/blob/main/README.md)
51+
title: eCLM static file generator
52+
- url: https://hpscterrsys.github.io/TSMP2_workflow-engine
53+
title: TSMP2 Workflow Engine

docs/users_guide/building_eCLM/JSC/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

docs/users_guide/building_eCLM/JSC/prerequisites_JSC_users.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

docs/users_guide/building_eCLM/JSC/setting_up_eCLM.md

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)