merge Noresmhub noresm branch to dev/unified#42
Open
mvertens wants to merge 366 commits into
Open
Conversation
…ere are quite some differences to OGM
…ASIS, there are quite some differences to OGM" This reverts commit b4825a3.
…est output for setup
…into ww3_wise_merge_develop
…he block explicit for the global
…utput for setup and oasis
…into ww3_wise_merge_develop
… explicit scheme ...
new capability for netcdf restarts
fix for history output given current namelist for noresm
additional fix for having output fields set by buildnml hist_n and hist_option
updates for averaging fields
Updates WW3 to the head of emc/dev/ufs-weather-model via ESCOMP's merge_dev/ufs-weather-model_20260609 sync. NorESM-specific changes follow in the next commit.
…e-averaging fix - netCDF/PIO restart and history I/O for the CESM/NorESM WW3 cap - CESM/NorESM initialization fixes (initial/continue/branch/cold-start) - Restore aux_flds_to_cmeps argument to w3wave so the per-coupling-step w3cprt/w3outg refresh runs for the daily-averaged Sw_*_avg fields
…le allocatable arrays
…e NorESM or CESM build - which calls model/src/CMakeLists.txt and circumvents this file
…arts Updates to the current head of escomp/dev/unified
| FLPART, LOCAL, FLOUTG2 = .false. | ||
| ! | ||
| #ifdef W3_DEBUGRUN | ||
| LOGICAL :: FLAG0 = .FALSE. |
Member
There was a problem hiding this comment.
This is a duplicate of the FLAG0 variable already defined in line 603.
Collaborator
Author
There was a problem hiding this comment.
I've removed the duplicate. Thanks for finding this.
|
|
||
| call ESMF_ClockGetAlarmList(mclock, alarmlistflag=ESMF_ALARMLIST_ALL, alarmCount=alarmCount, rc=rc) | ||
| if (ChkErr(rc,__LINE__,u_FILE_u)) return | ||
| dtime_drv = get_minimum_timestep(gcomp, rc) |
Member
There was a problem hiding this comment.
With the removal of this line, there's no other assignment of dtime_drv anywhere in model/src. This variable is still used by wav_shr_mod alarmInit for the nstep/nsteps alarm option. So I am wondering if this line was removed inadvertently.
Collaborator
Author
There was a problem hiding this comment.
@alperaltuntas - good question. It looks like this was not in the noresm branch - and my tests still passed. That said - it's the right thing to do to put it back. Thanks for catching this. I'll push the fix back to my branch.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request Summary
Merge NorESMhub develop branch to dev/unified
Summary
Changes vs
dev/unified(7 files)NUOPC coupling cap
model/src/wav_import_export.F90— implementation of wave-field time-averaging for fields sent to CMEPS
model/src/wav_comp_nuopc.F90model/src/wav_shel_inp.F90and the nml_output_date is now ignored
model/src/wav_wrapper_mod.F90Core model
model/src/w3wavemd.F90— restart/history hooks. NOTE: this is minimally different from the https://github.com/NOAA-EMC/WW3 dev/ufs-weather-model head (dcc9da7)
model/src/w3src4md.F90I/O
model/src/wav_pio_mod.F90Testing