Skip to content

Sync jra55 data mode with upstream #2

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.

Sign up for GitHub

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

Merged
anton-seaice merged 8 commits into from
Feb 27, 2026
Merged

Sync jra55 data mode with upstream #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01c79eb
Standardise jra55do datamode with other updates to CDEPS
anton-seaice Feb 25, 2026
4ae7484
More changes related to https://github.com/ESCOMP/CDEPS/pull/376
anton-seaice Feb 25, 2026
3731e1d
fixing my handiwork
anton-seaice Feb 25, 2026
ed834f2
merge jra55 into jra driver
anton-seaice Feb 25, 2026
4d3e67b
cleanup
anton-seaice Feb 26, 2026
3b1a873
cleanup #2
anton-seaice Feb 26, 2026
dc692fe
cleanup #2
anton-seaice Feb 26, 2026
2a8cfb5
cleanup #2
anton-seaice Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions datm/atm_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ module cdeps_datm_comp
use datm_datamode_jra_mod , only : datm_datamode_jra_init_pointers
use datm_datamode_jra_mod , only : datm_datamode_jra_advance

use datm_datamode_jra55do_mod , only : datm_datamode_jra55do_advertise
use datm_datamode_jra55do_mod , only : datm_datamode_jra55do_init_pointers
use datm_datamode_jra55do_mod , only : datm_datamode_jra55do_advance

use datm_datamode_clmncep_mod , only : datm_datamode_clmncep_advertise
use datm_datamode_clmncep_mod , only : datm_datamode_clmncep_init_pointers
use datm_datamode_clmncep_mod , only : datm_datamode_clmncep_advance
Expand Down Expand Up @@ -396,13 +392,9 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
case ('CORE2_NYF', 'CORE2_IAF')
call datm_datamode_core2_advertise(exportState, fldsExport, flds_scalar_name, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case ('CORE_IAF_JRA', 'CORE_RYF6162_JRA', 'CORE_RYF8485_JRA', 'CORE_RYF9091_JRA', 'CORE_RYF0304_JRA')
case ('CORE_IAF_JRA', 'CORE_RYF6162_JRA', 'CORE_RYF8485_JRA', 'CORE_RYF9091_JRA', 'CORE_RYF0304_JRA', 'JRA55do')
call datm_datamode_jra_advertise(exportState, fldsExport, flds_scalar_name, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case ('JRA55do')
call datm_datamode_jra55do_advertise(exportState, fldsExport, flds_scalar_name, &
flds_co2, flds_wiso, flds_presaero, flds_presndep, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case ('CLMNCEP')
call datm_datamode_clmncep_advertise(exportState, fldsExport, flds_scalar_name, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down Expand Up @@ -667,12 +659,9 @@ subroutine datm_comp_run(gcomp, importState, exportState, target_ymd, target_tod
case('CORE2_NYF','CORE2_IAF')
call datm_datamode_core2_init_pointers(exportState, sdat, datamode, factorfn_mesh, factorfn_data, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case ('CORE_IAF_JRA', 'CORE_RYF6162_JRA', 'CORE_RYF8485_JRA', 'CORE_RYF9091_JRA', 'CORE_RYF0304_JRA')
case ('CORE_IAF_JRA', 'CORE_RYF6162_JRA', 'CORE_RYF8485_JRA', 'CORE_RYF9091_JRA', 'CORE_RYF0304_JRA', 'JRA55do')
call datm_datamode_jra_init_pointers(exportState, sdat, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('JRA55do')
call datm_datamode_jra55do_init_pointers(exportState, sdat, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('CLMNCEP')
call datm_datamode_clmncep_init_pointers(importState, exportState, sdat, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down Expand Up @@ -748,12 +737,9 @@ subroutine datm_comp_run(gcomp, importState, exportState, target_ymd, target_tod
call datm_datamode_core2_advance(datamode, target_ymd, target_tod, target_mon, &
sdat%model_calendar, factorfn_mesh, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('CORE_IAF_JRA','CORE_RYF6162_JRA','CORE_RYF8485_JRA','CORE_RYF9091_JRA','CORE_RYF0304_JRA')
case('CORE_IAF_JRA','CORE_RYF6162_JRA','CORE_RYF8485_JRA','CORE_RYF9091_JRA','CORE_RYF0304_JRA', 'JRA55do')
call datm_datamode_jra_advance(exportstate, target_ymd, target_tod, sdat%model_calendar, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('JRA55do')
call datm_datamode_jra55do_advance(exportstate, target_ymd, target_tod, sdat%model_calendar, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('CLMNCEP')
call datm_datamode_clmncep_advance(mainproc, logunit, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down
287 changes: 0 additions & 287 deletions datm/datm_datamode_jra55do_mod.F90
View file
Open in desktop

This file was deleted.

Loading