Set up a consistent `HISTORY.rc` file for Model E by AdelekeBankole · Pull Request #84 · fetch4/GISS-GC

AdelekeBankole · 2025-02-12T16:35:30Z

This PR aims to set up a consistent HISTORY.rc file for Model E. Similarly as diagnostics requested of GEOS-Chem are placed in a HISTORY.rc file.

joewallwork · 2025-02-12T16:37:13Z

I think you need to change the target branch from main to develop?

joewallwork · 2025-02-13T09:07:57Z

@AdelekeBankole note that the idea is to create a separate Model E counterpart to the existing GEOS-Chem HISTORY.rc file, as opposed to modifying the existing one.

AdelekeBankole · 2025-02-13T11:25:12Z

Thank you very much @jwallwork23 for this comment. I will create a separate one for that.

joewallwork · 2025-02-13T17:41:00Z

@AdelekeBankole Note that several CI jobs get triggered each time you push to this PR. If these are unnecessary then consider including [skip ci] or similar in your commit message https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/skipping-workflow-runs

AdelekeBankole · 2025-02-13T17:43:10Z

Oh I will activate skip ci option. I will do that in my subsequent pushes. Thanks very much @jwallwork23

HISTORY_ModelE.rc

.github/rundecks/GISS_GC_14.R

.github/rundecks/GISS_ONLY.R

Co-authored-by: Joe Wallwork <22053413+jwallwork23@users.noreply.github.com>

joewallwork · 2025-03-14T09:31:55Z

.github/rundecks/GISS_ONLY.R

-! SUBDD='OH:4 NO:4 O3:4 NO2:4 CO:4 CH4:4 PS:4' ! TODO: Turn these on
-SUBDD=''


We actually don't want these in the GISS_ONLY rundeck. The work currently underway on diagnostics is only for the coupled GISS-GC model (i.e., GISS_GC_14 rundeck). So instead of enabling these here, I think we just want to leave SUBDD='' and put a more appropriate comment describing the situation, as opposed to the TODO note.

Hook up existing SUBDD-State_Diags

joewallwork · 2025-03-14T11:38:21Z

model/CHEM_DRV.F90

          else
-             State_Met%GWETROOT  (II,JJ) = 1 ! Set to 1 over oceans to match MERRA-2
+             State_Met%GWETTOP  (II,JJ) = 1 ! Set to 1 over oceans to match MERRA-2
          end if


Note I spotted that this seemed to be a typo.

joewallwork · 2025-03-14T13:00:56Z

I think it'd be good to get this merged into develop once we have all the existing diagnostics hooked up, i.e., the ones with TODO notes marked currently.

We can follow up later with the other fields to be added, e.g., those considered in #98.

joewallwork

There's a change required for the GISS_ONLY rundeck that I mentioned above, but otherwise it looks good as far as I can tell.

joewallwork · 2025-03-14T14:19:51Z

model/CHEM_DRV.F90

+          ! TODO: Which array?
+          ! State_Met%AD          (II,JJ) = ???
+
+          ! TODO: Which array?
+          ! State_Met%AIRDEN      (II,JJ) = ???
+
+          ! TODO: Which array?
+          ! State_Met%AIRVOL      (II,JJ) = ???


These will be addressed in ~~#98~~ #100.

joewallwork · 2025-03-14T14:21:18Z

model/CHEM_DRV.F90

-!    DO J = State_Grid%NY,1,-1
-!       WRITE(6,'(144F5.2)') State_Met%SUNCOSmid(:,J) 
-!    ENDDO
-!    CALL FLUSH(6)
-!    STOP
-
-    !IF ( am_I_Root() ) WRITE(6,*) "SUNCOSmid", State_Met%SUNCOSmid(:,40)


Removed some debug prints.

joewallwork · 2025-03-14T14:21:39Z

model/CHEM_DRV.F90

-#ifdef MODEL_GEOS
-          ! Convective fraction [1] (only used by GEOS)
-          State_Met%CNV_FRC     (II,JJ) = 0.0
-#endif


This was moved in the reordering for consistency.

joewallwork · 2025-03-14T14:22:04Z

model/CHEM_DRV.F90

+          ! TODO: AD
+          ! TODO: AIRDEN
+          ! TODO: AIRVOL


Again, these will be addressed in ~~#98~~ #100.

joewallwork · 2025-03-14T14:24:22Z

model/CHEM_DRV.F90

+  ! TODO: AD
+  ! arr(next()) = info_type_(                      &
+  !      sname = 'StateMet_AD',                    &
+  !      lname = 'StateMet_AD',                    &
+  !      units = 'kg'                              &
+  !      )
+
+  ! TODO: AIRDEN
+  ! arr(next()) = info_type_(                      &
+  !      sname = 'StateMet_AIRDEN',                &
+  !      lname = 'StateMet_AIRDEN',                &
+  !      units = 'kg m-3'                          &
+  !      )
+
+  ! TODO: AIRVOL
+  ! arr(next()) = info_type_(                      &
+  !      sname = 'StateMet_AIRVOL',                &
+  !      lname = 'StateMet_AIRVOL',                &
+  !      units = 'm3'                              &
+  !      )


Again, we will do this in ~~#98~~ #100.

Hook up other SUBDD-State_Diag for 2D `StateMet` tracers

joewallwork · 2025-03-18T13:14:18Z

Closing this PR as superseded by #101 and #102.

Adeleke Bankole added 2 commits February 7, 2025 19:17

attempt to add consistent HISTORY.rc for model E

2e8f636

attempt to create history rc file for model E

0a490ac

AdelekeBankole changed the base branch from main to develop February 12, 2025 16:38

AdelekeBankole linked an issue Feb 12, 2025 that may be closed by this pull request

Set up HISTORY.rc file for Model E #30

Closed

AdelekeBankole added deliverable1 Associated with deliverable 1 enhancement New feature or request labels Feb 12, 2025

AdelekeBankole self-assigned this Feb 12, 2025

Adeleke Bankole added 2 commits February 13, 2025 11:50

revert back to the GEOSChem file

3105c44

revert back to the original HISTORY.rc file

dfbc70f

Adeleke Bankole and others added 7 commits February 13, 2025 18:24

create history file for model e [skip ci]

17d169a

remove restart collection [skip ci]

a6e2d93

turn on SUBDDs in rundeck [skip ci]

dc25683

Merge branch 'develop' into history-rc-file-for-model-e

f260933

request AdvFluxVert diag in collections [skip ci]

213a7cc

request StatMet diag [skip ci]

5acc51f

add some entries of StateMet [skip ci]

1b60f2d

joewallwork reviewed Mar 13, 2025

View reviewed changes

HISTORY_ModelE.rc Show resolved Hide resolved

joewallwork reviewed Mar 13, 2025

View reviewed changes

.github/rundecks/GISS_GC_14.R Outdated Show resolved Hide resolved

joewallwork reviewed Mar 13, 2025

View reviewed changes

.github/rundecks/GISS_ONLY.R Outdated Show resolved Hide resolved

AdelekeBankole and others added 5 commits March 13, 2025 16:03

Update .github/rundecks/GISS_GC_14.R

19657e1

Co-authored-by: Joe Wallwork <22053413+jwallwork23@users.noreply.github.com>

Update .github/rundecks/GISS_ONLY.R

a6f53c4

Co-authored-by: Joe Wallwork <22053413+jwallwork23@users.noreply.github.com>

moveand rename HISTORY_ModelE.rc file to .dev/config [skip ci]

a6a7acf

add HISTORY_ModelE.rc file to .dev/config [skip ci]

6933270

dump back deleted content of HISTORY_ModelE.rc [skip ci]

648a327

joewallwork reviewed Mar 14, 2025

View reviewed changes

joewallwork and others added 12 commits March 14, 2025 11:03

Syntax fixes

7b170dd

PBLH

62443a1

PHIS

8b8fa20

TODOs

543ba1b

PRECANV

7750852

PRECCON

6d34cb2

PRECTOT

a018d53

PRECLSC

57afed1

PS1WET

0b15df2

PS2WET

478ca40

PSC2WET

f37289b

Merge pull request #97 from fetch4/29_subdd-statediag

bc1f7ef

Hook up existing SUBDD-State_Diags

joewallwork reviewed Mar 14, 2025

View reviewed changes

joewallwork mentioned this pull request Mar 14, 2025

Hook up other SUBDD-State_Diag for 2D StateMet tracers #98

Merged

Adeleke Bankole and others added 3 commits March 14, 2025 13:20

add StatMet fields [skip ci]

f93ee8b

Finish existing hook up; reordering

201ad62

Formatting and consistent ordering

8d86483

joewallwork mentioned this pull request Mar 14, 2025

Hook up SUBDD-State_Diag for 3D StateMet tracers #99

Closed

joewallwork requested changes Mar 14, 2025

View reviewed changes

joewallwork requested a review from ltmurray March 14, 2025 14:36

joewallwork and others added 5 commits March 14, 2025 15:07

TODOs from StateMet and NOTEs [skip ci]

bbe4c98

Add missing preprocessor statement

9545371

Fix typo

79fadd3

Hook up CONVDEPTH and FLASHDENS

f0bb79a

Merge pull request #98 from fetch4/29_subdd-statediag

465d58e

Hook up other SUBDD-State_Diag for 2D `StateMet` tracers

This was referenced Mar 18, 2025

Add HISTORY.rc file for Model E #101

Closed

Model E SUBDDs read and interpret GEOS-Chem StateMet #102

Open

joewallwork closed this Mar 18, 2025

		! SUBDD='OH:4 NO:4 O3:4 NO2:4 CO:4 CH4:4 PS:4' ! TODO: Turn these on
		SUBDD=''

Conversation

AdelekeBankole commented Feb 12, 2025

Uh oh!

joewallwork commented Feb 12, 2025

Uh oh!

joewallwork commented Feb 13, 2025

Uh oh!

AdelekeBankole commented Feb 13, 2025

Uh oh!

joewallwork commented Feb 13, 2025

Uh oh!

AdelekeBankole commented Feb 13, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

joewallwork Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

joewallwork Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

joewallwork commented Mar 14, 2025

Uh oh!

joewallwork left a comment

Choose a reason for hiding this comment

Uh oh!

joewallwork Mar 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joewallwork Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

joewallwork Mar 14, 2025

Choose a reason for hiding this comment

Uh oh!

joewallwork Mar 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joewallwork Mar 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joewallwork commented Mar 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

joewallwork Mar 14, 2025 •

edited

Loading

joewallwork Mar 14, 2025 •

edited

Loading

joewallwork Mar 14, 2025 •

edited

Loading