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

Post refactor p1 #196

Merged
merged 37 commits into from
Nov 5, 2020
Merged

Conversation

WenMeng-NOAA
Copy link
Collaborator

UPP refactor phase 1 merging:

  1. Remove writing out GRIB1 option.
  2. Improve legacy goto statements.

@BoCui-NOAA
Copy link
Contributor

  1. AVIATION.f : reviewed, remove  “go To”

  2. CALHEL.f: reviewed , remove  “go To”

  3. CALLCL.f: reviewed , remove  “go To”

  4. CALMICT.f : modified, keep using “go to”

  5. CALWXT.f: modified, use “cycle” and “do while” to replace “go to”

  6. CALWXT_RAMER.f: modified, use “cycle” and “exit” to replace “go to, keep using several “go to”

  7. CALWXT_REVISED.f: modified, use “cycle” and “do while” to replace “go to”

  8. WETBULB.f : checked, use cycle to replace “goto”

  9. WETFRZLVL.f: modified, use cycle and exit to replace “goto”

  10. getIVariableN.f: checked, read data from WRF output, keep using “goto”

  11. getVariable.f: checked, read data from WRF output, keep using “goto”

@BoCui-NOAA
Copy link
Contributor

DEWPOINT.f: modified , use do while to replace “go to”
FGAMMA.f: unconditional GO TO statement, keep it or remove it?
FRZLVL.f: modified , use cycle to replace “go to”
LFMFLD.f: modified , use exit to replace “go to”
LFMFLD_GFS.f: modified , use exit to replace “go to”
MDL2AGL.f: reviewed , remove  “go To”
MDL2P.f : modified, keep using “go to”

Merge remote-tracking branch 'upstream/develop' into post_refactor_p1
@WenMeng-NOAA WenMeng-NOAA requested a review from hu5970 October 23, 2020 15:32
@WenMeng-NOAA
Copy link
Collaborator Author

@BoCui-NOAA, @HuiyaChuang-NOAA In the CALHEL.f, I might think the "goto 30" is for jumping out the L loop not if statement.

@BoCui-NOAA
Copy link
Contributor

Wen,

I already modified the 3 codes, please take a review.

Bo

@BoCui-NOAA
Copy link
Contributor

@hu5970 Will you think the replace of "GOTO 666" in SERVER.f could be:
!666 continue
do while (.not. DONE)
CALL MPI_RECV(...)
IF (DONE) THEN
PRINT *, 'SHUTTING DOWN IO SERVER ...'
!!RETURN ! RETURNING to MAIN
EXIT !RETURNING to MAIN
ENDIF
...
...
!
! OUT TO DISK WE GO ...
!
CALL WRYTE(LUN,COUNT,BUF)
DEALLOCATE(BUF)
!GTO 666 !remove goto
enddo !end do while loop

modified the code following Ming's comments.

@fossell
Copy link
Contributor

fossell commented Oct 28, 2020

@JesseMeng-NOAA and @fossell, I see "GRIBIT.o" is removed from makefile_module, will we consider delete file GRIBIT.F from source code directory?

I think we should remove the routine entirely since it will not be used.

@JesseMeng-NOAA
Copy link
Contributor

JesseMeng-NOAA commented Oct 29, 2020 via email

@WenMeng-NOAA
Copy link
Collaborator Author

@fossell and @JesseMeng-NOAA Thanks for clarifying. I will remove this routine.

@WenMeng-NOAA
Copy link
Collaborator Author

The UPP regression tests were conducted on WCOSS Dell, Cray and Hera. No changed results were found. This PR is ready for merging.

@WenMeng-NOAA WenMeng-NOAA merged commit eed90f5 into NOAA-EMC:develop Nov 5, 2020
@WenMeng-NOAA WenMeng-NOAA deleted the post_refactor_p1 branch April 8, 2021 00:03
EricJames-NOAA pushed a commit to EricJames-NOAA/UPP that referenced this pull request Dec 14, 2022
…ach repository (NOAA-EMC#304)

## DESCRIPTION OF CHANGES: 
The new top-level cmake build for the SRW App ([SRW App PR#27](ufs-community/ufs-srweather-app#27)) results in some executables having different names. This PR makes modifications that
 1. Allow the workflow to run successfully with the new cmake build and its different executable names, and
 2. Allow back-compatibility with the old build system to allow for a gradual transition to new build system

This PR also explicitly disallows running the workflow without CCPP, which we decided against supporting several months ago. I don't think the capability even works so this shouldn't effect anyone at this time.

## TESTS CONDUCTED: 
 - **Cheyenne**: Build and end-to-end test ("DOT_OR_USCORE" test case) was successful on Cheyenne with intel, both for the cmake build and the old build script (that will soon be deprecated). 
 - **Hera**: Build and end-to-end tests successful (aside from expected failures). Also built with old build script successfully.
 - **Jet**: Build test was successful. 

## ISSUE: 
It was not the primary aim of this PR, but it does partially resolve NOAA-EMC#196
EricJames-NOAA pushed a commit to EricJames-NOAA/UPP that referenced this pull request Dec 14, 2022
## DESCRIPTION OF CHANGES:
This PR removes the USE_CCPP variable from all scripts and other files.  The workflow only supports running the FV3 model with CCPP, so USE_CCPP is deprecated.

## TESTS CONDUCTED: 
Ran one WE2E test (regional_002) on hera.  Succeeded.

## ISSUE (optional):
This resolves Issue NOAA-EMC#196.
EricJames-NOAA pushed a commit to EricJames-NOAA/UPP that referenced this pull request Dec 14, 2022
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.

6 participants