Skip to content

Remove stats file production #293

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.

Sign up for GitHub

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

Open
David Davies (DJDavies2) wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Remove stats file production #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad6979f
Remove stats file production
DJDavies2 Aug 11, 2026
c6b3c76
Merge branch 'develop' into feature/291
ctgh Aug 14, 2026
e3789a4
Merge remote-tracking branch 'origin/develop' into feature/291
DJDavies2 Aug 20, 2026
fe423cb
Move GenMod_Control to stubs
DJDavies2 Sep 3, 2026
6408b46
Merge remote-tracking branch 'origin/develop' into feature/291
DJDavies2 Sep 3, 2026
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
2 changes: 1 addition & 1 deletion deps/ops/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ set(OPS_SOURCE_FILES
code/OpsMod_Utilities/OpsMod_Utilities.f90
code/OpsMod_VarobsLib/OpsMod_VarobsLib.f90
code/OpsProg_Utils/OpsMod_UtilsProgs.f90
public/GenMod_Control/GenMod_Control.F90
public/GenMod_Control/GenMod_Setup.F90
public/GenMod_Core/GenMod_Core.F90
public/GenMod_Platform/GenMod_Matmul.F90
Expand Down Expand Up @@ -70,6 +69,7 @@ set(OPS_SOURCE_FILES
stubs/Ops_Constants/OpsMod_SatIds.f90
stubs/Ops_Constants/OpsMod_Stash.f90
stubs/Ops_Constants/OpsMod_Varfields.f90
stubs/GenMod_Control.F90
stubs/OpsMod_AODGeneral/OpsMod_AODGeneral.f90
stubs/OpsMod_GPSRO/OpsMod_GPSRO.f90
stubs/OpsMod_GPSRO/OpsMod_GPSROInfo.f90
Expand Down
6 changes: 0 additions & 6 deletions deps/ops/public/GenMod_Core/GenMod_Core.F90
View file
Open in desktop

@mikecooke77 Michael Cooke (mikecooke77) Aug 12, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think now this is modified it should move to the stubs directory as it has diverged from the original file copied from OPS.

@DJDavies2 David Davies (DJDavies2) Aug 12, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean just this file or the whole directory?

Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ MODULE GenMod_Core
INTEGER, PARAMETER :: MessageIn = 5 ! unit number for standard input
INTEGER, PARAMETER :: MessageOut = 6 ! unit number for standard output
INTEGER, PARAMETER :: ErrorOut = 0 ! unit number for standard error output
INTEGER, PARAMETER :: StatsOut = 7 ! unit number for statistics output
INTEGER :: WarningCount = 0 ! number of warning messages

INTEGER, PARAMETER :: MaxFileNameLen = 255 ! maximum file name length
Expand Down Expand Up @@ -146,7 +145,6 @@ MODULE GenMod_Core
MODULE PROCEDURE gen_warn_scalar
END INTERFACE gen_warn

PUBLIC :: gen_close_stats_file
PUBLIC :: gen_do_trace
PUBLIC :: gen_error_report
PUBLIC :: gen_free_unit
Expand All @@ -157,7 +155,6 @@ MODULE GenMod_Core
PUBLIC :: gen_fail
PUBLIC :: gen_message
PUBLIC :: gen_message_report_sync
PUBLIC :: gen_open_stats_file
PUBLIC :: Gen_ReadConfigNL
PUBLIC :: gen_replace_text
PUBLIC :: Gen_StringSplit
Expand All @@ -174,7 +171,6 @@ MODULE GenMod_Core
PUBLIC :: MaxFileNameLen
PUBLIC :: MessageIn
PUBLIC :: MessageOut
PUBLIC :: StatsOut
PUBLIC :: StatusFatal
PUBLIC :: StatusOK
PUBLIC :: StatusWarning
Expand Down Expand Up @@ -210,10 +206,8 @@ MODULE GenMod_Core
INCLUDE 'gen_write_trace_js_file.inc'

#include "gen_fortran_version.h"
#include "gen_close_stats_file.inc"
#include "gen_get_env.inc"
#include "gen_get_env_a.inc"
#include "gen_message_report_sync.inc"
#include "gen_open_stats_file.inc"

END MODULE GenMod_Core
6 changes: 2 additions & 4 deletions deps/ops/public/GenMod_Core/Gen_ReadConfigNL.inc
View file
Open in desktop

@mikecooke77 Michael Cooke (mikecooke77) Aug 12, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think now this is modified it should move to the stubs directory as it has diverged from the original file copied from OPS.

@DJDavies2 David Davies (DJDavies2) Aug 12, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean just this file or the whole directory?

Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ USE GenMod_Control, ONLY: &
GCOMBitRep, &
GenMode, &
WarningToError, &
WarningsMax, &
StatsAppend
WarningsMax

IMPLICIT NONE

Expand All @@ -46,8 +45,7 @@ NAMELIST / Gen_ConfigNL / &
GCOMBitRep, &
GenMode, &
WarningToError, &
WarningsMax, &
StatsAppend
WarningsMax

CALL gen_get_unit_from_env (file_unit, &
(/'GEN_CONFIG_NL'/), &
Expand Down
69 changes: 0 additions & 69 deletions deps/ops/public/GenMod_Core/gen_close_stats_file.inc
View file
Open in desktop

This file was deleted.

101 changes: 0 additions & 101 deletions deps/ops/public/GenMod_Core/gen_open_stats_file.inc
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .../public/GenMod_Control/GenMod_Control.F90 → deps/ops/stubs/GenMod_Control.F90
View file
Open in desktop

@mikecooke77 Michael Cooke (mikecooke77) Aug 12, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think now this is modified it should move to the stubs directory as it has diverged from the original file copied from OPS.

@DJDavies2 David Davies (DJDavies2) Aug 12, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean just this file or the whole directory?

Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ MODULE GenMod_Control
LOGICAL :: GCOMBitRep = .FALSE.
REAL :: ErrorSleep = 2.5 ! Seconds to sleep when exiting program on error
LOGICAL :: WarningToError = .FALSE. ! Convert calls to gen_warn to calls to gen_fail
LOGICAL :: StatsAppend = .FALSE. ! Allow capability to revert to old behaviour

INTEGER :: UM_SECTOR_SIZE = 2048

Expand Down
52 changes: 8 additions & 44 deletions deps/ops/stubs/OpsMod_ODB/OpsProg_CreateODB.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,14 @@ PROGRAM OpsProg_CreateODB
QuietMode, &
mype

USE GenMod_Core, ONLY: &
gen_close_stats_file, &
gen_fail, &
gen_open_stats_file, &
gen_summary, &
gen_trace_entry, &
gen_trace_exit, &
gen_trace_report, &
gen_warn, &
MessageOut, &
StatsOut, &
StatusOK, &
USE GenMod_Core, ONLY: &
gen_fail, &
gen_summary, &
gen_trace_entry, &
gen_trace_exit, &
gen_trace_report, &
gen_warn, &
MessageOut, &
UseTrace

USE GenMod_MiscUMScienceConstants, ONLY: &
Expand Down Expand Up @@ -149,7 +145,6 @@ PROGRAM OpsProg_CreateODB
! Local declarations:
CHARACTER(len=*), PARAMETER :: ProgName = "OpsProg_CreateODB"
INTEGER :: Error
INTEGER :: rc
TYPE (ODBSession_type) :: ecma
INTEGER :: i
INTEGER :: j
Expand Down Expand Up @@ -185,13 +180,6 @@ PROGRAM OpsProg_CreateODB

IF (UseTrace) CALL gen_trace_entry (ProgName)

CALL gen_open_stats_file ("OpsProg_CreateODB statistics", &
rc)
IF (rc /= StatusOK) THEN
CALL gen_fail (ProgName, &
"Error in gen_open_stats_file")
END IF

CALL Ops_ReadODBControlNL

odb1_mode = .NOT. ops_env_is_true ("OPS_CREATEODB_FORMAT_ODB2")
Expand All @@ -210,12 +198,6 @@ PROGRAM OpsProg_CreateODB

CALL Ops_ReadCycleTime

IF (mype == 0) THEN
WRITE (StatsOut, "(A,2(I2.2,A),I4.4,A,I2.2)") " " // TRIM (Runid) // " ",&
CycleTime(cycle_day), "/", CycleTime(cycle_month), "/", &
CycleTime(cycle_year), " ", cycleTime(cycle_hour)
END IF

CALL Ops_ReadObsGroupSwitches (obs_group_list)
CALL Ops_ReadOutputSwitches

Expand Down Expand Up @@ -351,18 +333,6 @@ PROGRAM OpsProg_CreateODB
END IF
END IF

IF (mype == 0) THEN
WRITE (StatsOut, "(A)") &
" --------------------------------------------------------------------"
StatsString = " Total " // TRIM (OpsFn_ObsourcetoString(MainObsource)) // " " // &
TRIM (OpsFn_ObsGroupNumToName(obs_group_list(i))) // " obs "
WRITE (StatsString(35:44), "(A2,I8)") "= ", &
SUM (TempMDBData % SubTypeData(:) % TotalNumObs)
WRITE (StatsOut, "(A)") TRIM (StatsString)
WRITE (StatsOut, "(A)") &
" --------------------------------------------------------------------"
WRITE (StatsOut, "(A)") " "
END IF
IF (TempMDBData % NumSubTypes > 0) THEN
DEALLOCATE (TempMDBData % SubTypeData)
END IF
Expand All @@ -381,12 +351,6 @@ PROGRAM OpsProg_CreateODB

9999 CONTINUE

CALL gen_close_stats_file (Error)
IF (Error /= StatusOK) THEN
CALL gen_fail (ProgName, &
"Cannot close stats file")
END IF

CALL gen_summary

IF (UseTrace) THEN
Expand Down
Loading