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

replace testcase None in config with unset #521

Merged
merged 6 commits into from
Dec 13, 2024
Merged

replace testcase None in config with unset #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a525ebd
remove unused variable isPresent
jedwards4b Dec 9, 2024
1903016
replace tabs with spaces
jedwards4b Dec 10, 2024
7ced1d3
another unused variable
jedwards4b Dec 10, 2024
d1b7b71
replace testcase None in config with unset
jedwards4b Dec 12, 2024
51db268
remove unused variable isPresent
jedwards4b Dec 13, 2024
108a8f6
Merge branch 'fix_github_workflow' into testcase_unset
jedwards4b Dec 13, 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
2 changes: 2 additions & 0 deletions cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
config["MPILIB"] = case.get_value("MPILIB")
config["OS"] = case.get_value("OS")
config["TESTCASE"] = case.get_value("TESTCASE")
if not config["TESTCASE"]:
config["TESTCASE"] = "UNSET"
config["glc_nec"] = (
0 if case.get_value("GLC_NEC") == 0 else case.get_value("GLC_NEC")
)
Expand Down
6 changes: 3 additions & 3 deletions mediator/med.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2603,7 +2603,7 @@ subroutine med_dststatus_write (gcomp, rc)
type(ESMF_Array) :: maskarray
integer(I4), pointer :: meshmask(:)
real(R8), pointer :: r8ptr(:)
integer :: m,n1,n2
integer :: m,n2
character(CL) :: case_name, dststatusfile
logical :: elementMaskIsPresent
logical :: whead(2) = (/.true. , .false./)
Expand Down Expand Up @@ -2641,9 +2641,9 @@ subroutine med_dststatus_write (gcomp, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
! get mask Array
call ESMF_FieldGet(maskfield, array=maskarray, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_MeshGet(mesh_dst, elemMaskArray=maskarray, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_FieldGet(maskfield, localDe=0, farrayPtr=meshmask, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
! now create an R8 mask for writing
Expand Down
1 change: 0 additions & 1 deletion mediator/med_phases_restart_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,6 @@ subroutine med_phases_restart_read(gcomp, rc)
character(ESMF_MAXSTR) :: case_name ! case name
character(ESMF_MAXSTR) :: restart_file ! Local path to restart filename
character(ESMF_MAXSTR) :: restart_pfile ! Local path to restart pointer filename
logical :: isPresent
character(len=*), parameter :: subname='(med_phases_restart_read)'
!---------------------------------------
call t_startf('MED:'//subname)
Expand Down
Loading