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

Adds a broadcast of the namelist value 'urbantvmapalgo', also fixed stream options so it uses NUOPC options rather than MCT #2534

Open
wants to merge 65 commits into
base: b4b-dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
bdf6b32
Changes to remove 0th timestep
olyson Jun 1, 2023
a9eb1e7
Changes for lilac
olyson Jul 25, 2023
b8be204
Remove do while loop and dosend variable.
olyson Jul 25, 2023
7f38c07
Fix unit tests for nstep starting at 1 instead of 0
billsacks Jul 25, 2023
55184f4
Merge pull request #1 from billsacks/zerothtstep
olyson Jul 26, 2023
750ed1d
Cleanup.
olyson Jul 27, 2023
198ac31
Merge branch 'zerothtstep' of https://github.com/olyson/ctsm into zer…
olyson Jul 27, 2023
caa384b
Remove comment.
olyson Aug 1, 2023
0dfd901
Remove BACKWARD COMPATIBILITY comment.
olyson Aug 3, 2023
d5b007f
Merge tag 'ctsm5.1.dev147' into zerothtstep
olyson Nov 1, 2023
c9c89a8
Correct a comment.
samsrabin Nov 1, 2023
d059220
Print error()s to console, not just log file.
samsrabin Nov 1, 2023
b311d1d
Rearrange search for h2 files in import_and_process_1yr().
samsrabin Nov 1, 2023
fa843e5
Fix h2 file patterns in import_and_process_1yr().
samsrabin Nov 1, 2023
11b6042
Merge pull request #2 from samsrabin/zerothtstep-fix-RXCROPMATURITY
olyson Nov 2, 2023
258792e
If avgflag /= 'I', time_bounds is present and time = mid of time_bounds
slevis-lmwg Mar 28, 2024
bf059a4
Adds a broadcast of the namelist value (urbantvmapalgo) after reading…
briandobbins May 9, 2024
1738156
Merge remote-tracking branch 'escomp/b4b-dev' into fix_urbantvmapalgo…
samsrabin Oct 8, 2024
020db62
Merge commit '258792e9c2ecf34d5e7dd58b556b34330edd0884' into hist_tim…
slevis-lmwg Oct 17, 2024
1e81456
Remove a comment unrelated to these modifications
slevis-lmwg Oct 17, 2024
268ad5a
Merge tag 'ctsm5.3.010' into zerothtstep
slevis-lmwg Nov 12, 2024
d07fd9d
Removed comments with prefix !KO
slevis-lmwg Nov 12, 2024
0f54bc2
Merge tag 'ctsm5.3.011' into zerothtstep
slevis-lmwg Nov 12, 2024
a4b9dcf
Update docstring of is_first_step function
slevis-lmwg Nov 12, 2024
4d0ac48
New update of function's docstring
slevis-lmwg Nov 12, 2024
e578ae7
Fix typo in comment
slevis-lmwg Nov 12, 2024
bd51b8c
Correct a variable name that came in with a merge conflict
slevis-lmwg Nov 12, 2024
e87b119
Correct another error that came in with a merge conflict
slevis-lmwg Nov 13, 2024
18acd55
Merge remote-tracking branch 'escomp/master' into hist_time_mid_of_ti…
slevis-lmwg Nov 13, 2024
c42cd12
Update .gitmodules to the mosart/rtm tags corresponding to this ctsm
slevis-lmwg Nov 13, 2024
71fbe09
cropcal_module.py import_output(): Handle "instantaneous files."
samsrabin Nov 14, 2024
a51816e
Reformat with black.
samsrabin Nov 15, 2024
3220dbb
Add previous commit to .git-blame-ignore-revs.
samsrabin Nov 15, 2024
760eb96
Merge pull request #16 from samsrabin/ctsm_hist_time_mid_of_time_boun…
slevis-lmwg Nov 15, 2024
ea91981
Draft ChangeLog/ChangeSum
slevis-lmwg Nov 15, 2024
c7e1366
Revert change I brought in with the conflicts
slevis-lmwg Nov 15, 2024
f85104b
Merge branch 'hist_time_mid_of_time_bounds' into zerothtstep
slevis-lmwg Nov 15, 2024
5148dbc
Update .gitmodules to the mosart/rtm tags corresponding to this ctsm
slevis-lmwg Nov 15, 2024
dc295f7
Correct variable name that came in with the conflicts
slevis-lmwg Nov 15, 2024
eeedbc6
Change "if instantaneous" statement with more appropriate conditional
slevis-lmwg Nov 22, 2024
957d032
Merge branch 'b4b-dev' into fix_urbantvmapalgo_broadcast
ekluzek Dec 4, 2024
ffeb713
Merge tag 'ctsm5.3.017' into hist_time_mid_of_time_bounds
slevis-lmwg Jan 9, 2025
332f7c1
Update to mosart1.1.06 and rtm1_0_84
slevis-lmwg Jan 10, 2025
5d87682
Update ChangeLog/Sum
slevis-lmwg Jan 10, 2025
3ffe654
Finalize ChangeLog
slevis-lmwg Jan 11, 2025
fb89f33
Merge pull request #2838 from slevis-lmwg/hist_time_mid_of_time_bounds
slevis-lmwg Jan 11, 2025
8b2f216
Merge remote-tracking branch 'escomp/master' into zerothtstep
slevis-lmwg Jan 11, 2025
f3a1dc6
call advance_timestep if startup or hybrid, not branch or continue
slevis-lmwg Jan 13, 2025
b66e1e9
Draft ChangeLog/Sum files
slevis-lmwg Jan 14, 2025
8d198cf
Update ChangeLog
slevis-lmwg Jan 14, 2025
71e56b9
Update ChangeLog
slevis-lmwg Jan 14, 2025
2f6b129
Merge pull request #2084 from olyson/zerothtstep
slevis-lmwg Jan 14, 2025
6d1a0e0
[BROKEN] Merge tag 'ctsm5.3.019' into merge-b4bdev-20250116
samsrabin Jan 16, 2025
c9e2ca8
Fix conflicts in lilac/lnd_comp_esmf.F90 with 019 version.
samsrabin Jan 16, 2025
031407c
lilac/lnd_comp_esmf.F90: Switch stop/restart alarm order.
samsrabin Jan 16, 2025
6194751
Update MOSART and RTM to fix nag build error.
samsrabin Jan 16, 2025
b427fc9
Remove two expected failures due to issue ESCOMP/CTSM#2914.
samsrabin Jan 17, 2025
bf65082
Remove an expected failure due to ESCOMP/CTSM#2905.
samsrabin Jan 17, 2025
bc03504
Remove failures expected due to ESCOMP/CTSM#2454.
samsrabin Jan 17, 2025
ff2ac19
Update ChangeLog/ChangeSum.
samsrabin Jan 17, 2025
a4aa4ec
Merge pull request #2938 from samsrabin/merge-b4bdev-20250116
samsrabin Jan 17, 2025
b8e71e5
Merge tag 'ctsm5.3.020' into merge-master-20250116
samsrabin Jan 17, 2025
ec0986b
Merge pull request #2939 from samsrabin/merge-master-20250116
samsrabin Jan 17, 2025
a1765aa
Merge branch 'ESCOMP:master' into fix_urbantvmapalgo_broadcast
briandobbins Jan 22, 2025
3360409
Adds the 'redist' method for the urban time-varying data, which is cu…
briandobbins Jan 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lilac/lnd_comp_esmf.F90: Switch stop/restart alarm order.
As in #2912.
  • Loading branch information
samsrabin committed Jan 16, 2025
commit 031407c04023aff322f5a63c8e11cdf62155b53d
20 changes: 10 additions & 10 deletions src/cpl/lilac/lnd_comp_esmf.F90
Original file line number Diff line number Diff line change
@@ -694,41 +694,41 @@ subroutine lnd_run(gcomp, import_state, export_state, clock, rc)
call update_rad_dtime(doalb)

!--------------------------------
! Determine if time to write restart
! Determine if time to stop
!--------------------------------

call ESMF_ClockGetAlarm(clock, alarmname='lilac_restart_alarm', alarm=alarm, rc=rc)
call ESMF_ClockGetAlarm(clock, alarmname='lilac_stop_alarm', alarm=alarm, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return

if (ESMF_AlarmIsRinging(alarm, rc=rc)) then
if (ChkErr(rc,__LINE__,u_FILE_u)) return
rstwr = .true.
nlend = .true.
call ESMF_AlarmRingerOff( alarm, rc=rc )
if (ChkErr(rc,__LINE__,u_FILE_u)) return
else
rstwr = .false.
nlend = .false.
endif
if (masterproc) then
write(iulog,*)' restart alarm is ',rstwr
write(iulog,*)' stop alarm is ',nlend
end if

!--------------------------------
! Determine if time to stop
! Determine if time to write restart
!--------------------------------

call ESMF_ClockGetAlarm(clock, alarmname='lilac_stop_alarm', alarm=alarm, rc=rc)
call ESMF_ClockGetAlarm(clock, alarmname='lilac_restart_alarm', alarm=alarm, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return

if (ESMF_AlarmIsRinging(alarm, rc=rc)) then
if (ChkErr(rc,__LINE__,u_FILE_u)) return
nlend = .true.
rstwr = .true.
call ESMF_AlarmRingerOff( alarm, rc=rc )
if (ChkErr(rc,__LINE__,u_FILE_u)) return
else
nlend = .false.
rstwr = .false.
endif
if (masterproc) then
write(iulog,*)' stop alarm is ',nlend
write(iulog,*)' restart alarm is ',rstwr
end if

!--------------------------------