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

fix the output file name and diag time #404

Merged
merged 85 commits into from
Oct 1, 2021
Merged
Show file tree
Hide file tree
Changes from 83 commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
9328c87
Merge pull request #1 from NOAA-EMC/develop
DeniseWorthen Nov 18, 2019
cb908e9
Merge pull request #2 from NOAA-EMC/develop
DeniseWorthen Dec 2, 2019
c96eaef
Merge pull request #3 from NOAA-EMC/develop
DeniseWorthen Dec 6, 2019
1067e95
Merge pull request #4 from NOAA-EMC/develop
DeniseWorthen Jan 4, 2020
c8abdc6
Merge pull request #9 from NOAA-EMC/develop
DeniseWorthen Jan 16, 2020
3e0e847
Merge pull request #10 from NOAA-EMC/develop
DeniseWorthen Jan 25, 2020
5b2831e
Merge pull request #12 from NOAA-EMC/develop
DeniseWorthen Feb 18, 2020
69b7a01
Merge pull request #13 from NOAA-EMC/develop
DeniseWorthen Mar 23, 2020
2a2b89a
Merge pull request #15 from NOAA-EMC/develop
DeniseWorthen Apr 3, 2020
0671b18
Merge pull request #16 from NOAA-EMC/develop
DeniseWorthen Apr 17, 2020
1e25e61
Merge pull request #17 from NOAA-EMC/develop
DeniseWorthen Apr 17, 2020
fce0b06
Merge pull request #18 from NOAA-EMC/develop
DeniseWorthen Apr 23, 2020
e655629
Merge pull request #19 from NOAA-EMC/develop
DeniseWorthen Apr 24, 2020
3df3898
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 26, 2020
7f89d1f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 1, 2020
d3a9665
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 12, 2020
c2aae4e
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 16, 2020
a1e05e0
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 27, 2020
24d4fe6
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 2, 2020
ebfcf47
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 2, 2020
ff8c950
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Nov 2, 2020
7e1489d
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Nov 3, 2020
9619fe7
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Nov 12, 2020
a87558f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Nov 16, 2020
d8e5772
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Nov 18, 2020
484782a
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Nov 30, 2020
5514ecc
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Dec 2, 2020
7beaa31
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Dec 16, 2020
624b4e2
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Dec 18, 2020
e174f2a
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jan 12, 2021
1f2356a
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jan 14, 2021
3000a5f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jan 20, 2021
c3475dc
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jan 27, 2021
ccd81ee
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jan 30, 2021
147e4eb
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Feb 8, 2021
006e6f9
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Feb 16, 2021
38041e6
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Feb 19, 2021
f61a8f7
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Feb 25, 2021
33e440e
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 3, 2021
1276541
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 11, 2021
44fff6d
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 16, 2021
7ad23d9
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 18, 2021
e14c8e4
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 21, 2021
9b510fc
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 26, 2021
97d5e0f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 30, 2021
54b76d7
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 31, 2021
869844d
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 5, 2021
6252c14
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 10, 2021
72176d4
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 12, 2021
bc0b9e0
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 15, 2021
e157ef7
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 26, 2021
346ec41
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 29, 2021
23bed1f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 30, 2021
ab82a7f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 4, 2021
497008e
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 10, 2021
941febe
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 12, 2021
b4c84c8
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Jun 12, 2021
7fe1c01
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Jul 9, 2021
4cb4ac0
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Jul 20, 2021
f2dd659
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Jul 26, 2021
e53ab50
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Jul 28, 2021
86e002c
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Aug 3, 2021
b4d07ef
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Aug 6, 2021
a1cc24b
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Aug 17, 2021
f8ecc62
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Aug 18, 2021
346ea3c
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Sep 22, 2021
c02403a
remove unused coupled suites
DeniseWorthen Sep 22, 2021
d4b14b3
delete v15p2 coupled suites
DeniseWorthen Sep 23, 2021
10c3f53
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Sep 24, 2021
2d263ba
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Sep 24, 2021
63749a8
Merge branch 'NOAA-EMC:develop' into feature/removesuites
DeniseWorthen Sep 24, 2021
c1a94ed
Merge branch 'NOAA-EMC:develop' into develop
DeniseWorthen Sep 27, 2021
4109c2a
Merge branch 'NOAA-EMC:develop' into feature/removesuites
DeniseWorthen Sep 27, 2021
cd81b81
update filename when the output time is not integer hours
junwang-noaa Sep 28, 2021
9f7f801
Merge branch 'develop' into feature/removesuites
DeniseWorthen Sep 28, 2021
d2c8b71
fix the diag time issue with output_fh
junwang-noaa Sep 29, 2021
0230f2b
Merge branch 'NOAA-EMC:develop' into feature/removesuites
DeniseWorthen Sep 29, 2021
c69f676
fix lflname_fulltime
junwang-noaa Sep 29, 2021
036e270
fix lflname_fulltime for output time starting with 0
junwang-noaa Sep 29, 2021
c3b08ce
Merge remote-tracking branch 'upstream/develop' into filename_nonint
junwang-noaa Sep 30, 2021
bfb50fb
Merge branch 'NOAA-EMC:develop' into feature/removesuites
DeniseWorthen Sep 30, 2021
090b893
Merge remote-tracking branch 'upstream/develop' into filename_nonint
junwang-noaa Sep 30, 2021
d86c57a
Merge remote-tracking branch 'denise/feature/removesuites' into filen…
junwang-noaa Sep 30, 2021
439f485
add doc for lflname_fulltime
junwang-noaa Sep 30, 2021
8fe3d7a
fix typo
junwang-noaa Sep 30, 2021
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
13 changes: 7 additions & 6 deletions atmos_model.F90
Original file line number Diff line number Diff line change
Expand Up @@ -913,13 +913,14 @@ subroutine update_atmos_model_state (Atmos, rc)
call FV3GFS_diag_output(Atmos%Time, GFS_Diag, Atm_block, GFS_control%nx, GFS_control%ny, &
GFS_control%levs, 1, 1, 1.0_GFS_kind_phys, time_int, time_intfull, &
GFS_control%fhswr, GFS_control%fhlwr)
if (nint(GFS_control%fhzero) > 0) then
if (mod(isec,3600*nint(GFS_control%fhzero)) == 0) diag_time = Atmos%Time
else
if (mod(isec,nint(3600*GFS_control%fhzero)) == 0) diag_time = Atmos%Time
endif
call diag_send_complete_instant (Atmos%Time)
endif
if (nint(GFS_control%fhzero) > 0) then
if (mod(isec,3600*nint(GFS_control%fhzero)) == 0) diag_time = Atmos%Time
else
if (mod(isec,nint(3600*GFS_control%fhzero)) == 0) diag_time = Atmos%Time
endif
call diag_send_complete_instant (Atmos%Time)


!--- this may not be necessary once write_component is fully implemented
!!!call diag_send_complete_extra (Atmos%Time)
Expand Down
88 changes: 0 additions & 88 deletions ccpp/suites/suite_FV3_GFS_2017_coupled.xml

This file was deleted.

90 changes: 0 additions & 90 deletions ccpp/suites/suite_FV3_GFS_2017_couplednsst.xml

This file was deleted.

88 changes: 0 additions & 88 deletions ccpp/suites/suite_FV3_GFS_2017_satmedmf_coupled.xml

This file was deleted.

93 changes: 0 additions & 93 deletions ccpp/suites/suite_FV3_GFS_v15p2_coupled.xml

This file was deleted.

Loading