-
Notifications
You must be signed in to change notification settings - Fork 24
refactor nudging code to use cdeps on line remapping and interpolation #243
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
base: noresm_develop
Are you sure you want to change the base?
Changes from 22 commits
85adf34
17770d2
e7f5409
3e6c6bd
8bb45f1
a10e8a5
f479a7c
bb36e8e
bf6eac3
45bb124
7ab3db0
afa5c2b
e2289df
06f1855
68cff4a
a50100a
93e6f46
9493bdb
d0ae463
5c81892
875a455
e1e44e8
f2d10a2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -220,32 +220,35 @@ | |||||||||
| Default: FALSE | ||||||||||
| </entry> | ||||||||||
|
|
||||||||||
| <entry id="Nudge_Path" type="char*256" input_pathname="abs" category="nudging" | ||||||||||
| <entry id="Nudge_Datapath" type="char*256" category="nudging" | ||||||||||
| group="nudging_nl" valid_values="" > | ||||||||||
| Full pathname of analyses data to use for nudging. | ||||||||||
| (e.g. '/$DIN_LOC_ROOT/atm/cam/nudging/') | ||||||||||
| Full pathname of datapath where Nudge_Filenames are located. | ||||||||||
| Default: none | ||||||||||
| </entry> | ||||||||||
|
|
||||||||||
| <entry id="Nudge_File_Template" type="char*80" category="nudging" | ||||||||||
| <entry id="Nudge_Filenames" type="char*256(100)" category="nudging" | ||||||||||
| group="nudging_nl" valid_values="" > | ||||||||||
| Template for Nudging analyses file names. | ||||||||||
| (e.g. '%y/ERAI_ne30np4_L30.cam2.i.%y-%m-%d-%s.nc') | ||||||||||
| Filenames of analyses data to use for nudging. | ||||||||||
| Default: none | ||||||||||
| </entry> | ||||||||||
|
|
||||||||||
| <entry id="Nudge_Times_Per_Day" type="integer" category="nudging" | ||||||||||
| <entry id="Nudge_Meshfile" type="char*256" category="nudging" | ||||||||||
| group="nudging_nl" valid_values="" > | ||||||||||
| Number of analyses files per day. | ||||||||||
| (e.g. 4 --> 6 hourly analyses) | ||||||||||
| ESMF mesh file that corresponds to the nudging files | ||||||||||
| Default: none | ||||||||||
| </entry> | ||||||||||
|
|
||||||||||
| <entry id="Model_Times_Per_Day" type="integer" category="nudging" | ||||||||||
| <entry id="Nudge_lev_dimname" type="char*256" category="nudging" | ||||||||||
| group="nudging_nl" valid_values="" > | ||||||||||
| Name of vertical dimension in file. | ||||||||||
| Default: none | ||||||||||
| </entry> | ||||||||||
|
Comment on lines
+241
to
+245
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need this if we have
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||||||||||
|
|
||||||||||
| <entry id="Model_Update_Times_Per_Day" type="integer" category="nudging" | ||||||||||
| group="nudging_nl" valid_values="" > | ||||||||||
| Number of time to update model data per day. | ||||||||||
| (e.g. 48 --> 1800 Second timestep) | ||||||||||
| Default: none | ||||||||||
| Default: 6 | ||||||||||
| </entry> | ||||||||||
|
|
||||||||||
| <entry id="Nudge_Beg_Year" type="integer" category="nudging" | ||||||||||
|
|
@@ -284,6 +287,12 @@ | |||||||||
| Default: none | ||||||||||
| </entry> | ||||||||||
|
|
||||||||||
| <entry id="Nudge_Align_Year" type="integer" category="nudging" | ||||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this name should follow the same convention as other CDEPS stream variables:
Suggested change
|
||||||||||
| group="nudging_nl" valid_values="" > | ||||||||||
| Model year to align with Nudge_Beg_Year. | ||||||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Based on comments above, I think this could be clarified:
Suggested change
|
||||||||||
| Default: none | ||||||||||
| </entry> | ||||||||||
|
|
||||||||||
| <entry id="Nudge_Force_Opt" type="integer" category="nudging" | ||||||||||
| group="nudging_nl" valid_values="" > | ||||||||||
| Select the form of nudging forcing, where (t'==Analysis times ; t==Model Times) | ||||||||||
|
|
@@ -301,6 +310,24 @@ | |||||||||
| Default: 0 | ||||||||||
| </entry> | ||||||||||
|
|
||||||||||
| <entry id="Nudge_Mapalgo" type="char*256" category="nudging" | ||||||||||
| group="nudging_nl" valid_values="bilinear,consf" > | ||||||||||
| Mapping algorithm to map nudge data to model grid. | ||||||||||
| Default: bilinear | ||||||||||
| </entry> | ||||||||||
|
|
||||||||||
| <entry id="Nudge_Taxmode" type="char*256" category="nudging" | ||||||||||
| group="nudging_nl" valid_values="limit,extend" > | ||||||||||
| Time extrapolation mode for time interpolation. | ||||||||||
| Default: limit | ||||||||||
| </entry> | ||||||||||
|
|
||||||||||
| <entry id="Nudge_levname" type="char*256" category="nudging" | ||||||||||
| group="nudging_nl" valid_values="" > | ||||||||||
| Name of vertical variable in Nudge_filenames. | ||||||||||
| Default: bilinear | ||||||||||
| </entry> | ||||||||||
|
|
||||||||||
| <entry id="Nudge_Uprof" type="integer" category="nudging" | ||||||||||
| group="nudging_nl" valid_values="" > | ||||||||||
| Profile index for U nudging. | ||||||||||
|
|
||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ module atm_comp_nuopc | |
| use ESMF , only : ESMF_DistGrid, ESMF_DistGridCreate | ||
| use ESMF , only : ESMF_Mesh, ESMF_MeshCreate, ESMF_MeshGet, ESMF_FILEFORMAT_ESMFMESH | ||
| use ESMF , only : ESMF_Clock, ESMF_ClockGet, ESMF_ClockSet, ESMF_ClockGetNextTime, ESMF_ClockAdvance | ||
| use ESMF , only : ESMF_CLockCreate | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is not used anymore, please remove
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
| use ESMF , only : ESMF_Time, ESMF_TimeGet | ||
| use ESMF , only : ESMF_Alarm, ESMF_ClockGetAlarm, ESMF_AlarmRingerOff, ESMF_AlarmIsRinging | ||
| use ESMF , only : ESMF_ClockGetAlarmList, ESMF_ALARMLIST_ALL, ESMF_AlarmSet | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that since the
Nudge_beginandNudge_endvariables are model times, we need begin and end variables that are specific to the nudging dataset being used (similar to other uses of CDEPS stream info):