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.

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

Jump to bottom

Unify gfs, cfsr, and gefs datm datamodes #63

Merged
merged 4 commits into from
Aug 27, 2024
Merged

Unify gfs, cfsr, and gefs datm datamodes #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb19a44
For gfs and cfsr datm datamodes, use gefs
NickSzapiro-NOAA Aug 6, 2024
50579c2
Delete datm/datm_datamode_gfs_hafs_mod.F90
NickSzapiro-NOAA Aug 11, 2024
7a9755b
Remove gfs_hafs datamode from atm_comp_nuopc.F90
NickSzapiro-NOAA Aug 11, 2024
12d0556
Remove gfs_hafs from CMakeLists.txt
NickSzapiro-NOAA Aug 11, 2024
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
3 changes: 0 additions & 3 deletions datm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ set(SRCFILES atm_comp_nuopc.F90
datm_datamode_core2_mod.F90
datm_datamode_jra_mod.F90
datm_datamode_gefs_mod.F90
datm_datamode_cfsr_mod.F90
datm_datamode_gfs_mod.F90
datm_datamode_gfs_hafs_mod.F90
datm_datamode_era5_mod.F90
datm_datamode_simple_mod.F90)

Expand Down
64 changes: 0 additions & 64 deletions datm/atm_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,24 +75,6 @@ module cdeps_datm_comp
use datm_datamode_gefs_mod , only : datm_datamode_gefs_advance
use datm_datamode_gefs_mod , only : datm_datamode_gefs_restart_write
use datm_datamode_gefs_mod , only : datm_datamode_gefs_restart_read

use datm_datamode_cfsr_mod , only : datm_datamode_cfsr_advertise
use datm_datamode_cfsr_mod , only : datm_datamode_cfsr_init_pointers
use datm_datamode_cfsr_mod , only : datm_datamode_cfsr_advance
use datm_datamode_cfsr_mod , only : datm_datamode_cfsr_restart_write
use datm_datamode_cfsr_mod , only : datm_datamode_cfsr_restart_read

use datm_datamode_gfs_mod , only : datm_datamode_gfs_advertise
use datm_datamode_gfs_mod , only : datm_datamode_gfs_init_pointers
use datm_datamode_gfs_mod , only : datm_datamode_gfs_advance
use datm_datamode_gfs_mod , only : datm_datamode_gfs_restart_write
use datm_datamode_gfs_mod , only : datm_datamode_gfs_restart_read

use datm_datamode_gfs_hafs_mod , only : datm_datamode_gfs_hafs_advertise
use datm_datamode_gfs_hafs_mod , only : datm_datamode_gfs_hafs_init_pointers
use datm_datamode_gfs_hafs_mod , only : datm_datamode_gfs_hafs_advance
use datm_datamode_gfs_hafs_mod , only : datm_datamode_gfs_hafs_restart_write
use datm_datamode_gfs_hafs_mod , only : datm_datamode_gfs_hafs_restart_read

use datm_datamode_simple_mod , only : datm_datamode_simple_advertise
use datm_datamode_simple_mod , only : datm_datamode_simple_init_pointers
Expand Down Expand Up @@ -379,9 +361,6 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
trim(datamode) == 'CLMNCEP' .or. &
trim(datamode) == 'CPLHIST' .or. &
trim(datamode) == 'GEFS' .or. &
trim(datamode) == 'CFSR' .or. &
trim(datamode) == 'GFS' .or. &
trim(datamode) == 'GFS_HAFS' .or. &
trim(datamode) == 'ERA5' .or. &
trim(datamode) == 'SIMPLE') then
else
Expand Down Expand Up @@ -412,14 +391,6 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
case ('GEFS')
call datm_datamode_gefs_advertise(exportState, fldsExport, flds_scalar_name, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case ('CFSR')
call datm_datamode_cfsr_advertise(exportState, fldsExport, flds_scalar_name, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case ('GFS')
call datm_datamode_gfs_advertise(exportState, fldsExport, flds_scalar_name, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case ('GFS_HAFS')
call datm_datamode_gfs_hafs_advertise(exportState, fldsExport, flds_scalar_name, rc)
case ('SIMPLE')
call datm_datamode_simple_advertise(exportState, fldsExport, flds_scalar_name, &
nlfilename, my_task, vm, rc)
Expand Down Expand Up @@ -664,14 +635,6 @@ subroutine datm_comp_run(importState, exportState, target_ymd, target_tod, targe
case('GEFS')
call datm_datamode_gefs_init_pointers(exportState, sdat, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('CFSR')
call datm_datamode_cfsr_init_pointers(exportState, sdat, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('GFS')
call datm_datamode_gfs_init_pointers(exportState, sdat, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('GFS_HAFS')
call datm_datamode_gfs_hafs_init_pointers(exportState, sdat, rc)
case('SIMPLE')
call datm_datamode_simple_init_pointers(exportState, sdat, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand All @@ -692,12 +655,6 @@ subroutine datm_comp_run(importState, exportState, target_ymd, target_tod, targe
call datm_datamode_era5_restart_read(restfilm, inst_suffix, logunit, my_task, mpicom, sdat)
case('GEFS')
call datm_datamode_gefs_restart_read(restfilm, inst_suffix, logunit, my_task, mpicom, sdat)
case('CFSR')
call datm_datamode_cfsr_restart_read(restfilm, inst_suffix, logunit, my_task, mpicom, sdat)
case('GFS')
call datm_datamode_gfs_restart_read(restfilm, inst_suffix, logunit, my_task, mpicom, sdat)
case('GFS_HAFS')
call datm_datamode_gfs_hafs_restart_read(restfilm, inst_suffix, logunit, my_task, mpicom, sdat)
case('SIMPLE')
call datm_datamode_simple_restart_read(restfilm, inst_suffix, logunit, my_task, mpicom, sdat)
end select
Expand Down Expand Up @@ -751,17 +708,6 @@ subroutine datm_comp_run(importState, exportState, target_ymd, target_tod, targe
call datm_datamode_gefs_advance(exportstate, mainproc, logunit, mpicom, target_ymd, &
target_tod, sdat%model_calendar, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('CFSR')
call datm_datamode_cfsr_advance(exportstate, mainproc, logunit, mpicom, target_ymd, &
target_tod, sdat%model_calendar, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('GFS')
call datm_datamode_gfs_advance(exportstate, mainproc, logunit, mpicom, target_ymd, &
target_tod, sdat%model_calendar, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('GFS_HAFS')
call datm_datamode_gfs_hafs_advance(exportstate, mainproc, logunit, mpicom, target_ymd, &
target_tod, sdat%model_calendar, rc)
case('SIMPLE')
call datm_datamode_simple_advance(target_ymd, target_tod, target_mon, &
sdat%model_calendar, rc)
Expand Down Expand Up @@ -790,16 +736,6 @@ subroutine datm_comp_run(importState, exportState, target_ymd, target_tod, targe
call datm_datamode_gefs_restart_write(case_name, inst_suffix, target_ymd, target_tod, &
logunit, my_task, sdat)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('CFSR')
call datm_datamode_cfsr_restart_write(case_name, inst_suffix, target_ymd, target_tod, &
logunit, my_task, sdat)
case('GFS')
call datm_datamode_gfs_restart_write(case_name, inst_suffix, target_ymd, target_tod, &
logunit, my_task, sdat)
case('GFS_HAFS')
call datm_datamode_gfs_hafs_restart_write(case_name, inst_suffix, target_ymd, target_tod, &
logunit, my_task, sdat)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
case('SIMPLE')
call datm_datamode_simple_restart_write(case_name, inst_suffix, target_ymd, target_tod, &
logunit, my_task, sdat)
Expand Down
256 changes: 0 additions & 256 deletions datm/datm_datamode_cfsr_mod.F90
View file
Open in desktop

This file was deleted.

Loading