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

Fixing some doxygen documentation - first pass #918

Draft
wants to merge 40 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
df56588
doxygenated module_wrt_grid_comp.F90
edwardhartnett Jan 21, 2025
fb78e69
doxygenated module_wrt_grid_comp.F90
edwardhartnett Jan 21, 2025
e18c501
turn on more doxygen warnings
edwardhartnett Jan 27, 2025
4fa2612
more doxygen
edwardhartnett Jan 27, 2025
62bbfcd
Merge pull request #18 from edwardhartnett/ejh_012125_2
edwardhartnett Jan 27, 2025
360aaac
Merge pull request #19 from edwardhartnett/ejh_012725
edwardhartnett Jan 27, 2025
78085bb
doxygen for fv3_cap.F90
AlysonStahl-NOAA Jan 27, 2025
2f02889
Update bounding_box.F90
AlysonStahl-NOAA Jan 27, 2025
dbfee72
Update fv_moving_nest.F90
AlysonStahl-NOAA Jan 27, 2025
223bd6c
Update fv_moving_nest_main.F90
AlysonStahl-NOAA Jan 27, 2025
2127023
Update fv_moving_nest_types.F90
AlysonStahl-NOAA Jan 27, 2025
15b3929
Update fv_moving_nest_types.F90
AlysonStahl-NOAA Jan 27, 2025
9bb97d8
missing comment
AlysonStahl-NOAA Jan 27, 2025
4f1af0f
Update fv_moving_nest_physics.F90
AlysonStahl-NOAA Jan 27, 2025
fd28681
Update fv_moving_nest_types.F90
AlysonStahl-NOAA Jan 27, 2025
98656a4
Merge pull request #20 from edwardhartnett/ejh_012725_2
edwardhartnett Jan 28, 2025
de65b31
Fixing same line comments
AlysonStahl-NOAA Feb 3, 2025
2ef2378
Merge pull request #22 from edwardhartnett/as_docs2
edwardhartnett Feb 4, 2025
881d3c4
doxygen
edwardhartnett Feb 4, 2025
847136c
Merge pull request #24 from edwardhartnett/ejh_020425
edwardhartnett Feb 4, 2025
2f39d97
undid changes to fv3atm_rrfs_sd_io.F90
edwardhartnett Feb 4, 2025
3b6e0d0
cleaning up some comments
AlysonStahl-NOAA Feb 4, 2025
f268873
Merge pull request #21 from edwardhartnett/as_docs1
edwardhartnett Feb 4, 2025
0e9b851
Update fv_moving_nest_utils.F90
AlysonStahl-NOAA Feb 4, 2025
7cc7c2f
Update fv_tracker.F90
AlysonStahl-NOAA Feb 4, 2025
1fb16e1
undo some comment changes
AlysonStahl-NOAA Feb 4, 2025
3c243a3
Merge pull request #26 from edwardhartnett/as_docs2
edwardhartnett Feb 5, 2025
7f26153
more doxygen
AlysonStahl-NOAA Feb 6, 2025
a4b4e13
doxygen for cpl subdirectory
AlysonStahl-NOAA Feb 6, 2025
fb3868f
Merge pull request #28 from edwardhartnett/as_docs2
edwardhartnett Feb 7, 2025
8257307
Merge pull request #27 from edwardhartnett/as_docs1
edwardhartnett Feb 7, 2025
07f79d6
Update fv3_cap.F90
DusanJovic-NOAA Feb 7, 2025
9e066b0
Merge pull request #29 from DusanJovic-NOAA/ejh_doxygen
edwardhartnett Feb 8, 2025
6334807
doxygen
edwardhartnett Feb 13, 2025
5ecfe5e
Update stochastic_physics/stochastic_physics_wrapper.F90
edwardhartnett Feb 14, 2025
ea15384
changes
edwardhartnett Feb 14, 2025
71ffddb
Merge branch 'ejh_sp2' of github.com:edwardhartnett/fv3atm into ejh_sp2
edwardhartnett Feb 14, 2025
ad263fd
Update stochastic_physics/stochastic_physics_wrapper.F90
edwardhartnett Feb 14, 2025
730d614
Update stochastic_physics/stochastic_physics_wrapper.F90
edwardhartnett Feb 14, 2025
2217d2c
Merge pull request #31 from edwardhartnett/ejh_sp2
edwardhartnett Feb 14, 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
459 changes: 404 additions & 55 deletions cpl/module_block_data.F90

Large diffs are not rendered by default.

60 changes: 44 additions & 16 deletions cpl/module_cap_cpl.F90
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
!> @file
!> @brief This module contains the the debug subroutines for fv3 coupled run
!> @author ???
!>
!> ## Module History
!>
!> Date | Programmer | Modification
!> -----|------------|-------------
!> 12 Mar 2018 | J. Wang | Pull coupled subroutines from fv3_cap.F90 to this module
module module_cap_cpl
!
!*** this module contains the debug subroutines for fv3 coupled run
!
! revision history
! 12 Mar 2018: J. Wang Pull coupled subroutines from fv3_cap.F90 to this module
!

use ESMF

implicit none
Expand All @@ -13,9 +17,17 @@ module module_cap_cpl
public diagnose_cplFields
contains

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

!> ???
!>
!> @param[in] gcomp ???
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@junwang-noaa can you please tell us what the ??? should be in this documentation?

!> @param[in] clock_fv3 ???
!> @param[in] fcstpe ???
!> @param[in] statewrite_flag ???
!> @param[in] stdiagnose_flag ???
!> @param[in] state_tag "import" or "export"
!> @param[out] rc ???
!>
!> @author
subroutine diagnose_cplFields(gcomp, clock_fv3, fcstpe, &
statewrite_flag, stdiagnose_flag, state_tag, rc)

Expand Down Expand Up @@ -79,9 +91,15 @@ subroutine diagnose_cplFields(gcomp, clock_fv3, fcstpe, &

end subroutine diagnose_cplFields

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

! This subroutine requires ESMFv8 - for coupled FV3
!> ???
!>
!> This subroutine requires ESMFv8 - for coupled FV3
!>
!> @param[in] state ???
!> @param[in] filename ???
!> @param[out] rc ???
!>
!> @author
subroutine State_RWFields_tiles(state,filename,rc)

type(ESMF_State), intent(in) :: state
Expand Down Expand Up @@ -254,6 +272,13 @@ subroutine State_RWFields_tiles(state,filename,rc)

contains

!> ???
!>
!> @param[in] axis ???
!> @param[in] count ???
!> @result id ???
!>
!> @author
function find_axis_id_for_axis_count(axis, count) result(id)
integer, intent(in) :: axis, count

Expand Down Expand Up @@ -286,8 +311,13 @@ end function find_axis_id_for_axis_count

end subroutine State_RWFields_tiles

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

!> ???
!>
!> @param[in] State ???
!> @param[in] string ???
!> @param[out] rc ???
!>
!> @author
subroutine state_diagnose(State,string, rc)
! ----------------------------------------------
! Diagnose status of state
Expand Down Expand Up @@ -371,6 +401,4 @@ subroutine state_diagnose(State,string, rc)

end subroutine state_diagnose

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

end module module_cap_cpl
106 changes: 79 additions & 27 deletions cpl/module_cplfields.F90
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
!> @file
!> @brief This module contains the fv3 Coupling Fields: export and import
!> @author ???
module module_cplfields

!-----------------------------------------------------------------------------
! This module contains the fv3 Coupling Fields: export and import
!
!-----------------------------------------------------------------------------

use ESMF
use NUOPC

implicit none

private

!> ???
type, public :: FieldInfo
character(len=41) :: name
character(len=1) :: type
character(len=41) :: name !< ???
character(len=1) :: type !< ???
end type

! Export Fields ----------------------------------------
Expand All @@ -26,9 +25,10 @@ module module_cplfields
! l : model levels (3D)
! s : surface (2D)
! t : tracers (4D)
integer, public, parameter :: NexportFields = 121
type(ESMF_Field), target, public :: exportFields(NexportFields)
integer, public, parameter :: NexportFields = 121 !< ???
type(ESMF_Field), target, public :: exportFields(NexportFields) !< ???

!> ???
type(FieldInfo), dimension(NexportFields), public, parameter :: exportFieldsInfo = [ &
FieldInfo("inst_pres_interface ", "i"), &
FieldInfo("inst_pres_levels ", "l"), &
Expand Down Expand Up @@ -158,10 +158,11 @@ module module_cplfields
FieldInfo("cpl_scalars ", "s")]

! Import Fields ----------------------------------------
integer, public, parameter :: NimportFields = 67
logical, public :: importFieldsValid(NimportFields)
type(ESMF_Field), target, public :: importFields(NimportFields)
integer, public, parameter :: NimportFields = 67 !< ???
logical, public :: importFieldsValid(NimportFields) !< ???
type(ESMF_Field), target, public :: importFields(NimportFields) !< ???

!> ???
type(FieldInfo), dimension(NimportFields), public, parameter :: importFieldsInfo = [ &
FieldInfo("inst_tracer_mass_frac ", "t"), &
FieldInfo("land_mask ", "s"), &
Expand Down Expand Up @@ -241,7 +242,7 @@ module module_cplfields
FieldInfo("evap_fire ", "s"), &
FieldInfo("smoke_fire ", "s") ]

! Fields exported exclusively for coupling with chemistry
!> Fields exported exclusively for coupling with chemistry
character(*), public, parameter :: chemistryFieldNames(*) = [ &
"inst_pres_interface ", &
"inst_pres_levels ", &
Expand Down Expand Up @@ -282,9 +283,15 @@ module module_cplfields
public cplFieldGet
public realizeConnectedCplFields

!-----------------------------------------------------------------------------
contains
!-----------------------------------------------------------------------------

!> ???
!>
!> @param[in] fieldname ???
!> @param[in] abortflag ???
!> @return ???
!>
!> @author
integer function queryExportFields(fieldname, abortflag)

character(len=*),intent(in) :: fieldname
Expand All @@ -294,8 +301,13 @@ integer function queryExportFields(fieldname, abortflag)

end function queryExportFields

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

!> ???
!>
!> @param[in] fieldname ???
!> @param[in] abortflag ???
!> @return ???
!>
!> @author
integer function queryImportFields(fieldname, abortflag)

character(len=*),intent(in) :: fieldname
Expand All @@ -305,8 +317,14 @@ integer function queryImportFields(fieldname, abortflag)

end function queryImportFields

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

!> ???
!>
!> @param[in] fieldsInfo ???
!> @param[in] fieldname ???
!> @param[in] abortflag ???
!> @return ???
!>
!> @author
integer function queryFieldList(fieldsInfo, fieldname, abortflag)
! returns integer index of first found fieldname in fieldlist
! by default, will abort if field not found, set abortflag to false
Expand Down Expand Up @@ -343,8 +361,14 @@ integer function queryFieldList(fieldsInfo, fieldname, abortflag)
endif
end function queryFieldList

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

!> ???
!>
!> @param[in] state ???
!> @param[in] fieldList ???
!> @param[out] fieldCount ???
!> @param[out] rc ???
!>
!> @author
subroutine cplStateGet(state, fieldList, fieldCount, rc)

character(len=*), intent(in) :: state
Expand All @@ -371,8 +395,17 @@ subroutine cplStateGet(state, fieldList, fieldCount, rc)

end subroutine cplStateGet

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

!> ???
!>
!> @param[in] state ???
!> @param[in] name ???
!> @param[in] localDe ???
!> @param[in] farrayPtr2d ???
!> @param[in] farrayPtr3d ???
!> @param[in] farrayPtr4d ???
!> @param[out] rc ???
!>
!> @author
subroutine cplFieldGet(state, name, localDe, &
farrayPtr2d, farrayPtr3d, farrayPtr4d, rc)

Expand Down Expand Up @@ -441,7 +474,20 @@ subroutine cplFieldGet(state, name, localDe, &

end subroutine cplFieldGet


!> ???
!>
!> @param[inout] state ???
!> @param[in] grid ???
!> @param[in] numLevels ???
!> @param[in] numSoilLayers ???
!> @param[in] numTracers ???
!> @param[in] fields_info ???
!> @param[in] state_tag ???
!> @param[out] fieldList ???
!> @param[in] fill_value ???
!> @param[out] rc ???
!>
!> @author
subroutine realizeConnectedCplFields(state, grid, &
numLevels, numSoilLayers, numTracers, &
fields_info, state_tag, fieldList, fill_value, rc)
Expand Down Expand Up @@ -565,8 +611,15 @@ subroutine realizeConnectedCplFields(state, grid, &

end subroutine realizeConnectedCplFields

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

!> ???
!>
!> @param[in] field ???
!> @param[in] key ???
!> @param[in] numLevels ???
!> @param[in] values ???
!> @param[out] rc ???
!>
!> @author
subroutine addFieldMetadata(field, key, values, rc)

! This subroutine implements a preliminary method to provide metadata to
Expand Down Expand Up @@ -601,6 +654,5 @@ subroutine addFieldMetadata(field, key, values, rc)

end subroutine addFieldMetadata
!
!------------------------------------------------------------------------------
!
end module module_cplfields
11 changes: 5 additions & 6 deletions cpl/module_cplscalars.F90
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@ module module_cplscalars
public State_GetScalar

! set from config
integer, public :: flds_scalar_num, flds_scalar_index_nx
integer, public :: flds_scalar_index_ny, flds_scalar_index_ntile
character(len=80), public :: flds_scalar_name
integer, public :: flds_scalar_num !< ???
integer, public :: flds_scalar_index_nx !< ???
integer, public :: flds_scalar_index_ny !< ???
integer, public :: flds_scalar_index_ntile !< ???
character(len=80), public :: flds_scalar_name !< ???

contains

!================================================================================
!> Create a scalar field
!>
!> @param[inout] field an ESMF_Field
Expand Down Expand Up @@ -71,7 +72,6 @@ subroutine SetScalarField(field, flds_scalar_name, flds_scalar_num, rc)

end subroutine SetScalarField

!================================================================================
!> Set scalar data into a state
!>
!> @param[inout] State an ESMF_State
Expand Down Expand Up @@ -126,7 +126,6 @@ subroutine State_SetScalar(scalar_value, scalar_id, State, flds_scalar_name, fld

end subroutine State_SetScalar

!===============================================================================
!> Get scalar data from a state
!>
!> @details Obtain the field flds_scalar_name from a State and broadcast and
Expand Down
2 changes: 1 addition & 1 deletion docs/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ WARN_IF_DOC_ERROR = YES
# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
# The default value is: NO.

WARN_NO_PARAMDOC = NO
WARN_NO_PARAMDOC = YES

# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
Expand Down
Loading
Loading