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.

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

Changes shr_file to shr_log. #960

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Conversation

dabail10
Copy link
Contributor

For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers

PR checklist

  • Short (1 sentence) summary of your PR:
    This changes the CESM nuopc driver to use shr_log.
  • Developer(s):
    jedwards
  • Suggest PR reviewers from list in the column to the right.
  • Please copy the PR test results link or provide a summary of testing completed below.
    Tested within the CESM scripts
  • How much do the PR code changes differ from the unmodified code?
    • bit for bit
    • different at roundoff level
    • more substantial
  • Does this PR create or have dependencies on Icepack or any other models?
    • Yes
    • No
  • Does this PR update the Icepack submodule? If so, the Icepack submodule must point to a hash on Icepack's main branch.
    • Yes
    • No
  • Does this PR add any new test cases?
    • Yes
    • No
  • Is the documentation being updated? ("Documentation" includes information on the wiki or in the .rst files from doc/source/, which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-cice/. A test build of the technical docs will be performed as part of the PR testing.)
    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No
  • Please document the changes in detail, including why the changes are made. This will become part of the PR commit log.
    Only impacts CESMCOUPLED cases.

@DeniseWorthen
Copy link
Contributor

@dabail10 We need the names changed in the cice_wrapper stubs also. With that change, this is fine for UFS.

diff --git a/cicecore/drivers/nuopc/cmeps/cice_wrapper_mod.F90 b/cicecore/drivers/nuopc/cmeps/cice_wrapper_mod.F90
index 2d35d3a..db0140b 100644
--- a/cicecore/drivers/nuopc/cmeps/cice_wrapper_mod.F90
+++ b/cicecore/drivers/nuopc/cmeps/cice_wrapper_mod.F90
@@ -82,12 +82,12 @@ end subroutine ufs_logfhour

   ! Define stub routines that do nothing - they are just here to avoid
   ! having cppdefs in the main program
-  subroutine shr_file_setLogUnit(nunit)
+  subroutine shr_log_setLogUnit(nunit)
     integer, intent(in) :: nunit
-  end subroutine shr_file_setLogUnit
-  subroutine shr_file_getLogUnit(nunit)
+  end subroutine shr_log_setLogUnit
+  subroutine shr_log_getLogUnit(nunit)
     integer, intent(in) :: nunit
-  end subroutine shr_file_getLogUnit
+  end subroutine shr_log_getLogUnit
   subroutine t_startf(string)
     character(len=*) :: string
   end subroutine t_startf

@dabail10
Copy link
Contributor Author

dabail10 commented Jul 1, 2024

Hopefully this addresses it.

@DeniseWorthen
Copy link
Contributor

That looks right to me.

@dabail10 dabail10 merged commit b109fa4 into CICE-Consortium:main Jul 2, 2024
2 checks passed
NickSzapiro-NOAA pushed a commit to NOAA-EMC/CICE that referenced this pull request Sep 25, 2024
* replace shr_file with shr_log

* Change names for stub routines

---------

Co-authored-by: Jim Edwards <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants