Skip to content

Commit

Permalink
Merge pull request #367 from ywkawai/feature/refactor
Browse files Browse the repository at this point in the history
Feature/refactor
  • Loading branch information
ywkawai authored Oct 6, 2024
2 parents dbeff53 + e49ea54 commit 0b85239
Show file tree
Hide file tree
Showing 98 changed files with 268 additions and 258 deletions.
2 changes: 1 addition & 1 deletion FElib/src/common/scale_coriolis_param.F90
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
!!
!! @par Reference
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
#include "scaleFElib.h"
module scale_coriolis_param
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/common/scale_cubedsphere_coord_cnv.F90
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
!! Geophysical Journal International, 209, 1934–1954.
!! (Appendix A)
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
#include "scaleFElib.h"
module scale_cubedsphere_coord_cnv
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/common/scale_geographic_coord_cnv.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
!! @par Description
!! Coordinate conversion with a geographic coordinate
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
#include "scaleFElib.h"
module scale_geographic_coord_cnv
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/common/scale_gmres.F90
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
!! GMRES: A generalized minimal residual algorithm for solving nonsymmetric linear systems.
!! SIAM J. Sci. Stat. Comput., 7:856–869
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
#include "scaleFElib.h"
module scale_gmres
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/common/scale_linalgebra.F90
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
!!
!! @par Reference
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
#include "scaleFElib.h"
module scale_linalgebra
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/common/scale_linkedlist.F90
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
!!
!! @par Reference
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
#include "scaleFElib.h"
module scale_linkedlist
Expand Down
9 changes: 9 additions & 0 deletions FElib/src/common/scale_polygon.F90
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
!> module common / Polygon
!!
!! @par Description
!! A module to provide utilities for polygon
!!
!! @par Reference
!!
!! @author Yuta Kawai, Team SCALE
!!
#include "scaleFElib.h"
module scale_polygon
!-----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/common/scale_polynominal.F90
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
!!
!! @par Reference
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
#include "scaleFElib.h"
module scale_polynominal
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/common/scale_quicksort.F90
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
!!
!! @par Reference
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
#include "scaleFElib.h"
module scale_quicksort
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/common/scale_quicksort.F90.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
!!
!! @par Reference
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
#include "scaleFElib.h"
module scale_quicksort
Expand Down
9 changes: 9 additions & 0 deletions FElib/src/common/scale_sparsemat.F90
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
!-------------------------------------------------------------------------------
!> module common / sparsemat
!!
!! @par Description
!! module to treat sparse matrix and the associated operations
!!
!! @author Yuta Kawai, Team SCALE
!!
!<
#include "scaleFElib.h"
module scale_sparsemat
!-----------------------------------------------------------------------------
Expand Down
9 changes: 9 additions & 0 deletions FElib/src/common/scale_time_manager.F90
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
!-------------------------------------------------------------------------------
!> module common / time
!!
!! @par Description
!! Module to manage time with temporal integration
!!
!! @author Yuta Kawai, Team SCALE
!!
!<
#include "scaleFElib.h"
module scale_time_manager
!-----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/common/scale_timeint_rk.F90
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
!! @par Description
!! Driver module to provide various Runge-Kutta schemes.
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!<
#include "scaleFElib.h"
module scale_timeint_rk
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/common/scale_timeint_rk.F90.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
!! @par Description
!! Driver module to provide various Runge-Kutta schemes.
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!<
#include "scaleFElib.h"
module scale_timeint_rk
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/data/scale_localmeshfield_base.F90
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
!> module FElib / Data / base
!!
!! @par Description
!! A module for managing field data with FEM
!! A module for managing field data with subdomains included in each MPI process
!!
!! @author Yuta Kawai, Team SCALE
!!
Expand Down
4 changes: 2 additions & 2 deletions FElib/src/data/scale_meshfield_analysis_numerror.F90
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
!-------------------------------------------------------------------------------
!> module meshfield_analysis_numerror_base
!> module FElib / Data / Statistics / numerical error
!!
!! @par Description
!! This module provides classes to evaluate numerical error for 1D, 2D, and 3D fields
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
!<
!-------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions FElib/src/data/scale_meshfield_analysis_numerror_base.F90
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
!-------------------------------------------------------------------------------
!> module meshfield_analysis_numerror_base
!> module FElib / Data / Statistics / numerical error
!!
!! @par Description
!! This module provides a base class useful for evaluating numerical errrors
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
!<
!-------------------------------------------------------------------------------
Expand Down
10 changes: 9 additions & 1 deletion FElib/src/data/scale_meshfield_base.F90
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
!> module FElib / Data / base
!!
!! @par Description
!! A module for managing field data with FEM
!!
!! @author Yuta Kawai, Team SCALE
!!
!<
#include "scaleFElib.h"
module scale_meshfield_base

Expand All @@ -21,7 +29,7 @@ module scale_meshfield_base
LocalMeshField1D, LocalMeshField2D, LocalMeshField3D

use scale_element_base, only: &
elementbase1D, elementbase2D, elementbase3D
ElementBase1D, ElementBase2D, ElementBase3D


!-----------------------------------------------------------------------------
Expand Down
8 changes: 8 additions & 0 deletions FElib/src/data/scale_meshfield_statistics.F90
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
!> module FElib / Data / Statistics
!!
!! @par Description
!! A module for analyzing statistics of field data
!!
!! @author Yuta Kawai, Team SCALE
!!
!<
#include "scaleFElib.h"
module scale_meshfield_statistics

Expand Down
2 changes: 1 addition & 1 deletion FElib/src/data/scale_meshfieldcomm_1d.F90
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module scale_meshfieldcomm_1d
use scale_precision
use scale_io

use scale_element_base, only: elementbase, elementbase1d
use scale_element_base, only: ElementBase, ElementBase1d
use scale_mesh_base1d, only: MeshBase1D
use scale_meshfield_base, only: MeshField1D
use scale_meshfieldcomm_base, only: &
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/data/scale_meshfieldcomm_base.F90
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module scale_meshfieldcomm_base
use scale_precision
use scale_io

use scale_element_base, only: elementbase
use scale_element_base, only: ElementBase
use scale_mesh_base, only: MeshBase
use scale_meshfield_base, only: &
MeshFieldBase, MeshField1D, MeshField2D, MeshField3D
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/data/scale_meshfieldcomm_cubedom3d.F90
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module scale_meshfieldcomm_cubedom3d
use scale_precision
use scale_io

use scale_element_base, only: elementbase, elementBase3D
use scale_element_base, only: ElementBase, ElementBase3D
use scale_mesh_cubedom3d, only: MeshCubeDom3D
use scale_meshfield_base, only: MeshField3D
use scale_meshfieldcomm_base, only: &
Expand Down
4 changes: 2 additions & 2 deletions FElib/src/data/scale_meshfieldcomm_cubedspheredom2d.F90
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module scale_meshfieldcomm_cubedspheredom2d
use scale_precision
use scale_io

use scale_element_base, only: elementbase, elementBase2D
use scale_element_base, only: ElementBase, ElementBase2D
use scale_mesh_cubedspheredom2d, only: MeshCubedSphereDom2D
use scale_meshfield_base, only: MeshField2D
use scale_meshfieldcomm_base, only: &
Expand Down Expand Up @@ -363,7 +363,7 @@ end subroutine push_localsendbuf
subroutine extract_boundary_data2D( var, refElem, mesh, buf )
implicit none

type(elementbase2D), intent(in) :: refElem
type(ElementBase2D), intent(in) :: refElem
type(LocalMesh2D), intent(in) :: mesh
real(DP), intent(in) :: var(refElem%Np * mesh%Ne)
real(DP), intent(inout) :: buf(refElem%Nfp * mesh%NeX * 4)
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/data/scale_meshfieldcomm_cubedspheredom3d.F90
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module scale_meshfieldcomm_cubedspheredom3d
use scale_precision
use scale_io

use scale_element_base, only: elementbase, elementBase3D
use scale_element_base, only: ElementBase, ElementBase3D
use scale_mesh_cubedspheredom3d, only: MeshCubedSphereDom3D
use scale_meshfield_base, only: MeshField3D
use scale_meshfieldcomm_base, only: &
Expand Down
8 changes: 8 additions & 0 deletions FElib/src/data/scale_variableinfo.F90
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
!> module FElib / Data / base
!!
!! @par Description
!! A module for managing information of variable
!!
!! @author Yuta Kawai, Team SCALE
!!
!<
#include "scaleFElib.h"
module scale_variableinfo
!-----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions FElib/src/element/scale_element_base.F90
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
!> module FElib/ Element / Base
!> module FElib / Element / Base
!!
!! @par Description
!! A base module for finite element
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
!<
!-------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/element/scale_element_hexahedral.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
!! @par Description
!! A module for a hexahedral finite element
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
!<
#include "scaleFElib.h"
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/element/scale_element_line.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
!! @par Description
!! A module for a line finite element
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
!<
#include "scaleFElib.h"
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/element/scale_element_modalfilter.F90
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
!! @par Description
!! Modal filter
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!<
!-------------------------------------------------------------------------------
#include "scaleFElib.h"
Expand Down
4 changes: 2 additions & 2 deletions FElib/src/element/scale_element_quadrilateral.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
!! @par Description
!! A module for a quadrilateral finite element
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
!<
#include "scaleFElib.h"
Expand All @@ -16,7 +16,7 @@ module scale_element_quadrilateral
use scale_precision

use scale_element_base, only: &
elementbase2D, &
ElementBase2D, &
ElementBase2D_Init, ElementBase2D_Final

!-----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions FElib/src/file/scale_file_base_meshfield.F90
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
!! @par Description
!! A base module for outputting data with MeshField type
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!<
!-------------------------------------------------------------------------------
#include "scaleFElib.h"
Expand Down Expand Up @@ -37,7 +37,7 @@ module scale_file_base_meshfield
MF3D_DIMTYPE_Z => MeshBase3D_DIMTYPEID_Z, &
MF3D_DTYPE_NUM => MeshBase3D_DIMTYPE_NUM

use scale_element_base, only: elementbase1D, elementbase2D, elementbase3D
use scale_element_base, only: ElementBase1D, ElementBase2D, ElementBase3D
use scale_mesh_base1d, only: MeshBase1D
use scale_mesh_base2d, only: MeshBase2D
use scale_mesh_base3d, only: MeshBase3D
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/file/scale_file_common_meshfield.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
!! @par Description
!! A common module for outputing field data
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
!<
!-------------------------------------------------------------------------------
Expand Down
5 changes: 3 additions & 2 deletions FElib/src/file/scale_file_history_meshfield.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
!!
!! @par Description
!! A module for managing file history
!! @author Team SCALE
!!
!! @author Yuta Kawai, Team SCALE
!<
!-------------------------------------------------------------------------------
#include "scaleFElib.h"
Expand All @@ -27,7 +28,7 @@ module scale_file_history_meshfield
FILE_HISTORY_Set_Axis, &
FILE_HISTORY_finalize

use scale_element_base, only: elementbase1D, elementbase2D, elementbase3D
use scale_element_base, only: ElementBase1D, ElementBase2D, ElementBase3D
use scale_mesh_base1d, only: MeshBase1D
use scale_mesh_base2d, only: MeshBase2D
use scale_mesh_base3d, only: MeshBase3D
Expand Down
2 changes: 1 addition & 1 deletion FElib/src/file/scale_file_monitor_meshfield.F90
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
!! @par Description
!! A module for monitoring model statistics
!!
!! @author Team SCALE
!! @author Yuta Kawai, Team SCALE
!!
!<
!-------------------------------------------------------------------------------
Expand Down
Loading

0 comments on commit 0b85239

Please sign in to comment.