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

Update documentation for new NSSL-MP namelist parameters #77

Merged
merged 8 commits into from
Jul 5, 2023

Conversation

MicroTed
Copy link
Collaborator

@MicroTed MicroTed commented May 31, 2023

Add documentation lines for new namelist parameters (nssl_alphar, nssl_ehw0, nssl_ehlw0) with a minor name tweak.
Also, nssl_params(14) is used by another version, so this is changed to nssl_params(15) for consistency (no effect)

Follow-up on #45 (@JiliDong-NOAA)

Dan Kokron and others added 2 commits May 26, 2023 13:52
@MicroTed
Copy link
Collaborator Author

MicroTed commented May 31, 2023

Question: Does SCM need to be updated now, too, or is that a bridge to cross later?

OK, done here: NCAR/ccpp-scm#385

@grantfirl
Copy link
Collaborator

Question: Does SCM need to be updated now, too, or is that a bridge to cross later?

OK, done here: NCAR/ccpp-scm#385

Typically, CCPP code managers handle any changes in FV3 that need to be brought over to the SCM, but thanks for going the extra mile.

@grantfirl
Copy link
Collaborator

@MicroTed I'd like to ask you if you'd be willing to bring in the changes from #76 to this PR to reduce code management workload. That PR changes baselines, but it is only a build system change for the UGWP scheme. I would be responsible for testing the combined PR to make sure it is behaving as expected.

@MicroTed
Copy link
Collaborator Author

MicroTed commented Jun 2, 2023

I'd like to ask you if you'd be willing to bring in the changes from #76 to this PR to reduce code

@grantfirl Sure, that shouldn't be much trouble.

Done.

@grantfirl
Copy link
Collaborator

@MicroTed Please update this branch to the latest ufs/dev branch when you get a chance.

@MicroTed
Copy link
Collaborator Author

MicroTed commented Jun 28, 2023

@MicroTed Please update this branch to the latest ufs/dev branch when you get a chance.

@grantfirl I am getting a conflict in ccpp/physics/CMakeLists.txt. The second half is from #76, and I think that was taken back out of this PR? So should whole thing be removed or no?

Never mind -- I forgot to pull my branch, haha

@grantfirl
Copy link
Collaborator

@MicroTed Please update this branch to the latest ufs/dev branch when you get a chance.

@grantfirl I am getting a conflict in ccpp/physics/CMakeLists.txt. The second half is from #76, and I think that was taken back out of this PR? So should whole thing be removed or no?

<<<<<<< HEAD
# Reduce optimization for mo_gas_optics_kernels.F90 (to avoid an apparent compiler bug with Intel 19+)
if(${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90 IN_LIST SCHEMES_OPENMP_OFF AND
   CMAKE_BUILD_TYPE STREQUAL "Release" AND ${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
  SET_SOURCE_FILES_PROPERTIES(${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90
                              APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_Fortran_FLAGS_PHYSICS} -O1")
endif()

# Increase optimization for ugwp_driver_v0.F
if(CMAKE_BUILD_TYPE STREQUAL "Release" AND ${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
  SET_SOURCE_FILES_PROPERTIES(${LOCAL_CURRENT_SOURCE_DIR}/physics/ugwp_driver_v0.F
                              APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_Fortran_FLAGS_PHYSICS} -fp-model=fast -fprotect-parens -fimf-precision=high")
endif()

=======
>>>>>>> ufs/ufs/dev

Ya, all CMakeLists.txt changes should be removed. So, you can delete everything between the <<<<<< and >>>>>>, then git add the file and git commit. This should fix the conflict.

@zach1221
Copy link

zach1221 commented Jul 2, 2023

Testing on UFS-WM PR #1775 is complete. Feel free to go ahead and merge this sub-pr. @grantfirl

@jkbk2004
Copy link

jkbk2004 commented Jul 3, 2023

@Qingfu-Liu @dustinswales If you have permission, please, go ahead to merge this pr.

@grantfirl grantfirl merged commit c90c3d1 into ufs-community:ufs/dev Jul 5, 2023
drnimbusrain pushed a commit to noaa-oar-arl/ccpp-physics that referenced this pull request Mar 28, 2024
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.

5 participants