From 893684147526787f50d75f171873214288266b17 Mon Sep 17 00:00:00 2001 From: Yuta Kawai Date: Sun, 6 Oct 2024 09:25:18 +0900 Subject: [PATCH 1/2] Add comments and refactoring --- FElib/src/common/scale_coriolis_param.F90 | 2 +- .../common/scale_cubedsphere_coord_cnv.F90 | 2 +- .../src/common/scale_geographic_coord_cnv.F90 | 2 +- FElib/src/common/scale_gmres.F90 | 2 +- FElib/src/common/scale_linalgebra.F90 | 2 +- FElib/src/common/scale_linkedlist.F90 | 2 +- FElib/src/common/scale_polygon.F90 | 9 +++++ FElib/src/common/scale_polynominal.F90 | 2 +- FElib/src/common/scale_quicksort.F90 | 2 +- FElib/src/common/scale_quicksort.F90.erb | 2 +- FElib/src/common/scale_sparsemat.F90 | 9 +++++ FElib/src/common/scale_time_manager.F90 | 9 +++++ FElib/src/common/scale_timeint_rk.F90 | 2 +- FElib/src/common/scale_timeint_rk.F90.erb | 2 +- FElib/src/data/scale_localmeshfield_base.F90 | 2 +- .../scale_meshfield_analysis_numerror.F90 | 4 +- ...scale_meshfield_analysis_numerror_base.F90 | 4 +- FElib/src/data/scale_meshfield_base.F90 | 10 ++++- FElib/src/data/scale_meshfield_statistics.F90 | 8 ++++ FElib/src/data/scale_meshfieldcomm_1d.F90 | 2 +- FElib/src/data/scale_meshfieldcomm_base.F90 | 2 +- .../data/scale_meshfieldcomm_cubedom3d.F90 | 2 +- .../scale_meshfieldcomm_cubedspheredom2d.F90 | 4 +- .../scale_meshfieldcomm_cubedspheredom3d.F90 | 2 +- FElib/src/data/scale_variableinfo.F90 | 8 ++++ FElib/src/element/scale_element_base.F90 | 4 +- .../src/element/scale_element_hexahedral.F90 | 2 +- FElib/src/element/scale_element_line.F90 | 2 +- .../src/element/scale_element_modalfilter.F90 | 2 +- .../element/scale_element_quadrilateral.F90 | 4 +- FElib/src/file/scale_file_base_meshfield.F90 | 4 +- .../src/file/scale_file_common_meshfield.F90 | 2 +- .../src/file/scale_file_history_meshfield.F90 | 5 ++- .../src/file/scale_file_monitor_meshfield.F90 | 2 +- .../src/file/scale_file_restart_meshfield.F90 | 4 +- .../scale_atm_dyn_dgm_bnd.F90 | 10 ++--- .../scale_atm_dyn_dgm_driver_base.F90 | 2 +- .../scale_atm_dyn_dgm_driver_nonhydro3d.F90 | 6 +-- .../scale_atm_dyn_dgm_driver_trcadv3d.F90 | 2 +- ...atm_dyn_dgm_globalnonhydro3d_etot_heve.F90 | 2 +- ...atm_dyn_dgm_globalnonhydro3d_etot_hevi.F90 | 2 +- ...atm_dyn_dgm_globalnonhydro3d_rhot_heve.F90 | 2 +- ...atm_dyn_dgm_globalnonhydro3d_rhot_hevi.F90 | 2 +- .../scale_atm_dyn_dgm_globalsw.F90 | 2 +- .../scale_atm_dyn_dgm_hydrostatic.F90 | 14 +++---- .../scale_atm_dyn_dgm_modalfilter.F90 | 2 +- .../scale_atm_dyn_dgm_nonhydro2d.F90 | 2 +- .../scale_atm_dyn_dgm_nonhydro3d_common.F90 | 2 +- ...scale_atm_dyn_dgm_nonhydro3d_etot_heve.F90 | 2 +- ...m_dyn_dgm_nonhydro3d_etot_heve_numflux.F90 | 2 +- ...scale_atm_dyn_dgm_nonhydro3d_etot_hevi.F90 | 2 +- ...tm_dyn_dgm_nonhydro3d_etot_hevi_common.F90 | 16 ++++---- ...m_dyn_dgm_nonhydro3d_etot_hevi_numflux.F90 | 2 +- ...cale_atm_dyn_dgm_nonhydro3d_hevi_gmres.F90 | 38 ++++++++++++------- .../scale_atm_dyn_dgm_nonhydro3d_numdiff.F90 | 14 +++---- ...scale_atm_dyn_dgm_nonhydro3d_rhot_heve.F90 | 2 +- ...m_dyn_dgm_nonhydro3d_rhot_heve_numflux.F90 | 2 +- ...dyn_dgm_nonhydro3d_rhot_heve_splitform.F90 | 2 +- ...scale_atm_dyn_dgm_nonhydro3d_rhot_hevi.F90 | 2 +- ...tm_dyn_dgm_nonhydro3d_rhot_hevi_common.F90 | 16 ++++---- ...m_dyn_dgm_nonhydro3d_rhot_hevi_numflux.F90 | 2 +- ...dyn_dgm_nonhydro3d_rhot_hevi_splitform.F90 | 2 +- .../scale_atm_dyn_dgm_spongelayer.F90 | 2 +- .../scale_atm_dyn_dgm_trcadvect3d_heve.F90 | 2 +- .../scale_atm_phy_mp_dgm_common.F90 | 2 +- .../model_framework/scale_model_component.F90 | 2 +- .../scale_model_component_proc.F90 | 2 +- .../scale_model_mesh_manager.F90 | 2 +- .../scale_model_meshbase_manager.F90 | 2 +- .../scale_model_var_manager.F90 | 2 +- .../scale_atm_phy_tb_dgm_common.F90 | 2 +- .../turbulence/scale_atm_phy_tb_dgm_dns.F90 | 8 ++-- .../scale_atm_phy_tb_dgm_driver.F90 | 20 ++++------ .../scale_atm_phy_tb_dgm_globalsmg.F90 | 27 +++++++------ .../turbulence/scale_atm_phy_tb_dgm_smg.F90 | 8 ++-- model/atm_nonhydro2d/src/atm_nonhydro2d.F90 | 2 +- .../src/atmos/mod_atmos_component.F90 | 2 +- .../src/atmos/mod_atmos_dyn.F90 | 4 +- .../src/atmos/mod_atmos_dyn_vars.F90 | 4 +- .../src/atmos/mod_atmos_mesh.F90 | 9 +++++ .../src/atmos/mod_atmos_mesh_gm.F90 | 9 +++++ .../src/atmos/mod_atmos_mesh_rm.F90 | 9 +++++ .../src/atmos/mod_atmos_phy_mp.F90 | 3 +- .../src/atmos/mod_atmos_phy_mp_vars.F90 | 4 +- .../src/atmos/mod_atmos_phy_sfc.F90 | 1 + .../src/atmos/mod_atmos_phy_sfc_vars.F90 | 9 +++++ .../src/atmos/mod_atmos_phy_tb.F90 | 1 + .../src/atmos/mod_atmos_phy_tb_vars.F90 | 4 +- .../src/atmos/mod_atmos_vars.F90 | 2 +- .../src/preprocess/mod_mkinit.F90 | 2 +- .../src/preprocess/mod_mkinit_util.F90 | 2 +- .../src/preprocess/mod_mktopo.F90 | 2 +- .../src/preprocess/mod_mktopo_util.F90 | 2 +- model/atm_nonhydro3d/src/scale-dg.F90 | 2 +- model/atm_nonhydro3d/src/scale-dg_pp.F90 | 2 +- model/atm_nonhydro3d/src/user/mod_user.F90 | 2 +- .../atm_nonhydro3d/src/user/mod_user_base.F90 | 2 +- 97 files changed, 268 insertions(+), 174 deletions(-) diff --git a/FElib/src/common/scale_coriolis_param.F90 b/FElib/src/common/scale_coriolis_param.F90 index b97a0d32..aeefacda 100644 --- a/FElib/src/common/scale_coriolis_param.F90 +++ b/FElib/src/common/scale_coriolis_param.F90 @@ -7,7 +7,7 @@ !! !! @par Reference !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! #include "scaleFElib.h" module scale_coriolis_param diff --git a/FElib/src/common/scale_cubedsphere_coord_cnv.F90 b/FElib/src/common/scale_cubedsphere_coord_cnv.F90 index 74b289e8..04730c38 100644 --- a/FElib/src/common/scale_cubedsphere_coord_cnv.F90 +++ b/FElib/src/common/scale_cubedsphere_coord_cnv.F90 @@ -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 diff --git a/FElib/src/common/scale_geographic_coord_cnv.F90 b/FElib/src/common/scale_geographic_coord_cnv.F90 index fb71262b..82375910 100644 --- a/FElib/src/common/scale_geographic_coord_cnv.F90 +++ b/FElib/src/common/scale_geographic_coord_cnv.F90 @@ -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 diff --git a/FElib/src/common/scale_gmres.F90 b/FElib/src/common/scale_gmres.F90 index 957fede4..c133a3de 100644 --- a/FElib/src/common/scale_gmres.F90 +++ b/FElib/src/common/scale_gmres.F90 @@ -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 diff --git a/FElib/src/common/scale_linalgebra.F90 b/FElib/src/common/scale_linalgebra.F90 index 535f3b1a..65706c7a 100644 --- a/FElib/src/common/scale_linalgebra.F90 +++ b/FElib/src/common/scale_linalgebra.F90 @@ -5,7 +5,7 @@ !! !! @par Reference !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! #include "scaleFElib.h" module scale_linalgebra diff --git a/FElib/src/common/scale_linkedlist.F90 b/FElib/src/common/scale_linkedlist.F90 index e91e8c48..0b37f2af 100644 --- a/FElib/src/common/scale_linkedlist.F90 +++ b/FElib/src/common/scale_linkedlist.F90 @@ -5,7 +5,7 @@ !! !! @par Reference !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! #include "scaleFElib.h" module scale_linkedlist diff --git a/FElib/src/common/scale_polygon.F90 b/FElib/src/common/scale_polygon.F90 index 2fb25b46..327e9e1b 100644 --- a/FElib/src/common/scale_polygon.F90 +++ b/FElib/src/common/scale_polygon.F90 @@ -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 !----------------------------------------------------------------------------- diff --git a/FElib/src/common/scale_polynominal.F90 b/FElib/src/common/scale_polynominal.F90 index 8abdffaa..d6a4565f 100644 --- a/FElib/src/common/scale_polynominal.F90 +++ b/FElib/src/common/scale_polynominal.F90 @@ -5,7 +5,7 @@ !! !! @par Reference !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! #include "scaleFElib.h" module scale_polynominal diff --git a/FElib/src/common/scale_quicksort.F90 b/FElib/src/common/scale_quicksort.F90 index 4d903e37..be1d3706 100644 --- a/FElib/src/common/scale_quicksort.F90 +++ b/FElib/src/common/scale_quicksort.F90 @@ -9,7 +9,7 @@ !! !! @par Reference !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! #include "scaleFElib.h" module scale_quicksort diff --git a/FElib/src/common/scale_quicksort.F90.erb b/FElib/src/common/scale_quicksort.F90.erb index e940657c..d09c64e7 100644 --- a/FElib/src/common/scale_quicksort.F90.erb +++ b/FElib/src/common/scale_quicksort.F90.erb @@ -9,7 +9,7 @@ !! !! @par Reference !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! #include "scaleFElib.h" module scale_quicksort diff --git a/FElib/src/common/scale_sparsemat.F90 b/FElib/src/common/scale_sparsemat.F90 index 0d66eee0..0d5b9539 100644 --- a/FElib/src/common/scale_sparsemat.F90 +++ b/FElib/src/common/scale_sparsemat.F90 @@ -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 !----------------------------------------------------------------------------- diff --git a/FElib/src/common/scale_time_manager.F90 b/FElib/src/common/scale_time_manager.F90 index d0f45580..726e879b 100644 --- a/FElib/src/common/scale_time_manager.F90 +++ b/FElib/src/common/scale_time_manager.F90 @@ -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 !----------------------------------------------------------------------------- diff --git a/FElib/src/common/scale_timeint_rk.F90 b/FElib/src/common/scale_timeint_rk.F90 index e825be36..8d6c7c5b 100644 --- a/FElib/src/common/scale_timeint_rk.F90 +++ b/FElib/src/common/scale_timeint_rk.F90 @@ -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 diff --git a/FElib/src/common/scale_timeint_rk.F90.erb b/FElib/src/common/scale_timeint_rk.F90.erb index 50a6f355..32a4431a 100644 --- a/FElib/src/common/scale_timeint_rk.F90.erb +++ b/FElib/src/common/scale_timeint_rk.F90.erb @@ -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 diff --git a/FElib/src/data/scale_localmeshfield_base.F90 b/FElib/src/data/scale_localmeshfield_base.F90 index 094039ef..4639956d 100644 --- a/FElib/src/data/scale_localmeshfield_base.F90 +++ b/FElib/src/data/scale_localmeshfield_base.F90 @@ -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 !! diff --git a/FElib/src/data/scale_meshfield_analysis_numerror.F90 b/FElib/src/data/scale_meshfield_analysis_numerror.F90 index 13457dea..4ed1441a 100644 --- a/FElib/src/data/scale_meshfield_analysis_numerror.F90 +++ b/FElib/src/data/scale_meshfield_analysis_numerror.F90 @@ -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 !! !< !------------------------------------------------------------------------------- diff --git a/FElib/src/data/scale_meshfield_analysis_numerror_base.F90 b/FElib/src/data/scale_meshfield_analysis_numerror_base.F90 index d624ed7c..b4c41204 100644 --- a/FElib/src/data/scale_meshfield_analysis_numerror_base.F90 +++ b/FElib/src/data/scale_meshfield_analysis_numerror_base.F90 @@ -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 !! !< !------------------------------------------------------------------------------- diff --git a/FElib/src/data/scale_meshfield_base.F90 b/FElib/src/data/scale_meshfield_base.F90 index d9ff878c..abcc40ab 100644 --- a/FElib/src/data/scale_meshfield_base.F90 +++ b/FElib/src/data/scale_meshfield_base.F90 @@ -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 @@ -21,7 +29,7 @@ module scale_meshfield_base LocalMeshField1D, LocalMeshField2D, LocalMeshField3D use scale_element_base, only: & - elementbase1D, elementbase2D, elementbase3D + ElementBase1D, ElementBase2D, ElementBase3D !----------------------------------------------------------------------------- diff --git a/FElib/src/data/scale_meshfield_statistics.F90 b/FElib/src/data/scale_meshfield_statistics.F90 index a4347ec6..6fc5591b 100644 --- a/FElib/src/data/scale_meshfield_statistics.F90 +++ b/FElib/src/data/scale_meshfield_statistics.F90 @@ -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 diff --git a/FElib/src/data/scale_meshfieldcomm_1d.F90 b/FElib/src/data/scale_meshfieldcomm_1d.F90 index d4eafba7..f1d5dfc9 100644 --- a/FElib/src/data/scale_meshfieldcomm_1d.F90 +++ b/FElib/src/data/scale_meshfieldcomm_1d.F90 @@ -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: & diff --git a/FElib/src/data/scale_meshfieldcomm_base.F90 b/FElib/src/data/scale_meshfieldcomm_base.F90 index 2dff9397..e713a462 100644 --- a/FElib/src/data/scale_meshfieldcomm_base.F90 +++ b/FElib/src/data/scale_meshfieldcomm_base.F90 @@ -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 diff --git a/FElib/src/data/scale_meshfieldcomm_cubedom3d.F90 b/FElib/src/data/scale_meshfieldcomm_cubedom3d.F90 index 2acbcebf..8bdbb280 100644 --- a/FElib/src/data/scale_meshfieldcomm_cubedom3d.F90 +++ b/FElib/src/data/scale_meshfieldcomm_cubedom3d.F90 @@ -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: & diff --git a/FElib/src/data/scale_meshfieldcomm_cubedspheredom2d.F90 b/FElib/src/data/scale_meshfieldcomm_cubedspheredom2d.F90 index 89414774..5427b995 100644 --- a/FElib/src/data/scale_meshfieldcomm_cubedspheredom2d.F90 +++ b/FElib/src/data/scale_meshfieldcomm_cubedspheredom2d.F90 @@ -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: & @@ -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) diff --git a/FElib/src/data/scale_meshfieldcomm_cubedspheredom3d.F90 b/FElib/src/data/scale_meshfieldcomm_cubedspheredom3d.F90 index 148bdc8c..8b921925 100644 --- a/FElib/src/data/scale_meshfieldcomm_cubedspheredom3d.F90 +++ b/FElib/src/data/scale_meshfieldcomm_cubedspheredom3d.F90 @@ -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: & diff --git a/FElib/src/data/scale_variableinfo.F90 b/FElib/src/data/scale_variableinfo.F90 index 5ec881e0..e14ee3c4 100644 --- a/FElib/src/data/scale_variableinfo.F90 +++ b/FElib/src/data/scale_variableinfo.F90 @@ -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 !----------------------------------------------------------------------------- diff --git a/FElib/src/element/scale_element_base.F90 b/FElib/src/element/scale_element_base.F90 index f17686f0..f541fe4b 100644 --- a/FElib/src/element/scale_element_base.F90 +++ b/FElib/src/element/scale_element_base.F90 @@ -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 !! !< !------------------------------------------------------------------------------- diff --git a/FElib/src/element/scale_element_hexahedral.F90 b/FElib/src/element/scale_element_hexahedral.F90 index 50be9312..741ba754 100644 --- a/FElib/src/element/scale_element_hexahedral.F90 +++ b/FElib/src/element/scale_element_hexahedral.F90 @@ -3,7 +3,7 @@ !! @par Description !! A module for a hexahedral finite element !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< #include "scaleFElib.h" diff --git a/FElib/src/element/scale_element_line.F90 b/FElib/src/element/scale_element_line.F90 index d5415ddc..4cdef86d 100644 --- a/FElib/src/element/scale_element_line.F90 +++ b/FElib/src/element/scale_element_line.F90 @@ -3,7 +3,7 @@ !! @par Description !! A module for a line finite element !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< #include "scaleFElib.h" diff --git a/FElib/src/element/scale_element_modalfilter.F90 b/FElib/src/element/scale_element_modalfilter.F90 index 80522807..b0595480 100644 --- a/FElib/src/element/scale_element_modalfilter.F90 +++ b/FElib/src/element/scale_element_modalfilter.F90 @@ -4,7 +4,7 @@ !! @par Description !! Modal filter !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/element/scale_element_quadrilateral.F90 b/FElib/src/element/scale_element_quadrilateral.F90 index 344ace10..9f5421cf 100644 --- a/FElib/src/element/scale_element_quadrilateral.F90 +++ b/FElib/src/element/scale_element_quadrilateral.F90 @@ -3,7 +3,7 @@ !! @par Description !! A module for a quadrilateral finite element !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< #include "scaleFElib.h" @@ -16,7 +16,7 @@ module scale_element_quadrilateral use scale_precision use scale_element_base, only: & - elementbase2D, & + ElementBase2D, & ElementBase2D_Init, ElementBase2D_Final !----------------------------------------------------------------------------- diff --git a/FElib/src/file/scale_file_base_meshfield.F90 b/FElib/src/file/scale_file_base_meshfield.F90 index 3e0374df..7a09263f 100644 --- a/FElib/src/file/scale_file_base_meshfield.F90 +++ b/FElib/src/file/scale_file_base_meshfield.F90 @@ -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" @@ -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 diff --git a/FElib/src/file/scale_file_common_meshfield.F90 b/FElib/src/file/scale_file_common_meshfield.F90 index 589ed864..a0868993 100644 --- a/FElib/src/file/scale_file_common_meshfield.F90 +++ b/FElib/src/file/scale_file_common_meshfield.F90 @@ -3,7 +3,7 @@ !! @par Description !! A common module for outputing field data !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/FElib/src/file/scale_file_history_meshfield.F90 b/FElib/src/file/scale_file_history_meshfield.F90 index c1ad4a43..ddf76fc3 100644 --- a/FElib/src/file/scale_file_history_meshfield.F90 +++ b/FElib/src/file/scale_file_history_meshfield.F90 @@ -3,7 +3,8 @@ !! !! @par Description !! A module for managing file history -!! @author Team SCALE +!! +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" @@ -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 diff --git a/FElib/src/file/scale_file_monitor_meshfield.F90 b/FElib/src/file/scale_file_monitor_meshfield.F90 index eeee72a7..bb7eb4ca 100644 --- a/FElib/src/file/scale_file_monitor_meshfield.F90 +++ b/FElib/src/file/scale_file_monitor_meshfield.F90 @@ -4,7 +4,7 @@ !! @par Description !! A module for monitoring model statistics !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/FElib/src/file/scale_file_restart_meshfield.F90 b/FElib/src/file/scale_file_restart_meshfield.F90 index ec38acff..e775a56f 100644 --- a/FElib/src/file/scale_file_restart_meshfield.F90 +++ b/FElib/src/file/scale_file_restart_meshfield.F90 @@ -4,7 +4,7 @@ !! @par Description !! A module for outputing data to restart simulations !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- @@ -24,7 +24,7 @@ module scale_file_restart_meshfield use scale_file_common_meshfield, only: & FILE_common_meshfield_diminfo - 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 diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_bnd.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_bnd.F90 index e66cd420..2efcf9fa 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_bnd.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_bnd.F90 @@ -4,7 +4,7 @@ !! @par Description !! A module for setting halo data based on boundary conditions. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" @@ -346,7 +346,7 @@ subroutine ATMOS_dyn_bnd_applyBC_numdiff_odd_lc( this, & ! (in) class(AtmDynBnd), intent(in) :: this class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(inout) :: GxVar(elem%Np*lmesh%NeA) real(RP), intent(inout) :: GyVar(elem%Np*lmesh%NeA) real(RP), intent(inout) :: GzVar(elem%Np*lmesh%NeA) @@ -420,7 +420,7 @@ subroutine ATMOS_dyn_bnd_applyBC_numdiff_even_lc( this, & ! (in) class(AtmDynBnd), intent(in) :: this class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(inout) :: Var(elem%Np*lmesh%NeA) logical, intent(out) :: is_bound(elem%NfpTot*lmesh%Ne) integer, intent(in) :: VarID @@ -718,7 +718,7 @@ subroutine ATMOS_dyn_bnd_inquire_bound_flag( this, & ! (in) class(AtmDynBnd), intent(in) :: this class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem logical, intent(out) :: is_bound(elem%NfpTot*lmesh%Ne) integer, intent(in) :: domID integer, intent(in) :: vmapM(elem%NfpTot*lmesh%Ne) @@ -766,7 +766,7 @@ subroutine bnd_Init_lc( & real(RP), intent(in) :: thermal_fixval(DOM_BND_NUM) class(MeshBase), intent(in) :: mesh class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem integer, intent(in) :: vmapB(:) integer :: tileID diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_base.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_base.F90 index a85b6ecb..5fd089d6 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_base.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_base.F90 @@ -4,7 +4,7 @@ !! @par Description !! Driver module for dynamical core based on DGM !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_nonhydro3d.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_nonhydro3d.F90 index 1bd7b631..7ca3f94f 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_nonhydro3d.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_nonhydro3d.F90 @@ -4,7 +4,7 @@ !! @par Description !! Driver module for dynamical core based on DGM !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" @@ -140,7 +140,7 @@ subroutine atm_dyn_nonhydro3d_cal_tend_ex( & import LocalMesh3D import ElementBase3D import LocalMesh2D - import elementbase2D + import ElementBase2D import SparseMat implicit none @@ -863,7 +863,7 @@ subroutine add_phy_tend( this, & ! (in) class(AtmDynDGMDriver_nonhydro3d), intent(inout) :: this class(LocalMesh3D), intent(in) :: lcmesh - class(elementbase3D), intent(in) :: elem3D + class(ElementBase3D), intent(in) :: elem3D real(RP), intent(inout) :: dyn_tends(elem3D%Np,lcmesh%NeA,PRGVAR_NUM) real(RP), intent(in) :: DENS_tp(elem3D%Np,lcmesh%NeA) real(RP), intent(in) :: MOMX_tp(elem3D%Np,lcmesh%NeA) diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_trcadv3d.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_trcadv3d.F90 index 30d2dca2..7fbb2e38 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_trcadv3d.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_driver_trcadv3d.F90 @@ -4,7 +4,7 @@ !! @par Description !! Driver module for tracer advection based on DGM !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_etot_heve.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_etot_heve.F90 index 3b02b8ce..db777c54 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_etot_heve.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_etot_heve.F90 @@ -6,7 +6,7 @@ !! The governing equations is a fully compressibile nonhydrostic equations, !! which consist of mass, momentum, and thermodynamics (total energy conservation) equations. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_etot_hevi.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_etot_hevi.F90 index cd50e4e0..64197ce9 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_etot_hevi.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_etot_hevi.F90 @@ -6,7 +6,7 @@ !! The governing equations is a fully compressibile nonhydrostic equations, !! which consist of mass, momentum, and thermodynamics (total energy conservation) equations. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_rhot_heve.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_rhot_heve.F90 index 2a894bef..66b152bd 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_rhot_heve.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_rhot_heve.F90 @@ -6,7 +6,7 @@ !! The governing equations is a fully compressibile nonhydrostic equations, !! which consist of mass, momentum, and thermodynamics (density * potential temperature conservation) equations. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_rhot_hevi.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_rhot_hevi.F90 index 4462ab92..406244e2 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_rhot_hevi.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalnonhydro3d_rhot_hevi.F90 @@ -6,7 +6,7 @@ !! The governing equations is a fully compressibile nonhydrostic equations, !! which consist of mass, momentum, and thermodynamics (density * potential temperature conservation) equations. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalsw.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalsw.F90 index a1582488..906c43c1 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalsw.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_globalsw.F90 @@ -4,7 +4,7 @@ !! @par Description !! DGM scheme for Atmospheric dynamical process. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_hydrostatic.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_hydrostatic.F90 index c066c171..e2137148 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_hydrostatic.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_hydrostatic.F90 @@ -4,7 +4,7 @@ !! @par Description !! Construct hydrostatic state for Atmospheric dynamical process. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" @@ -557,7 +557,7 @@ subroutine GMRES_hydro_core( gmres_hydro, x, wj, is_converged, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem integer, intent(in) :: N integer, intent(in) :: m @@ -701,7 +701,7 @@ subroutine eval_Ax( Ax, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: Ax(elem%Np,lmesh%NeZ) real(RP), intent(in) :: DDENS (elem%Np,lmesh%NeZ) @@ -769,7 +769,7 @@ subroutine cal_del_flux( del_flux, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%NeZ) real(RP), intent(in) :: DDENS_(elem%Np*lmesh%NeZ) real(RP), intent(in) :: POT_(elem%Np*lmesh%NeZ) @@ -838,7 +838,7 @@ subroutine eval_Ax_lin( Ax, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: Ax(elem%Np,lmesh%NeZ) real(RP), intent(in) :: DDENS (elem%Np,lmesh%NeZ) @@ -901,7 +901,7 @@ subroutine cal_del_flux_lin( del_flux, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%NeZ) real(RP), intent(in) :: DDENS_(elem%Np*lmesh%NeZ) real(RP), intent(in) :: DDENS0_(elem%Np*lmesh%NeZ) @@ -979,7 +979,7 @@ subroutine construct_pmatInv( PmatDlu, PmatDlu_ipiv, PmatL, PmatU, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: PmatDlu(elem%Np,elem%Np,lmesh%NeZ) integer, intent(out) :: PmatDlu_ipiv(elem%Np,lmesh%NeZ) real(RP), intent(out) :: PmatL(elem%Np,elem%Np,lmesh%NeZ) diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_modalfilter.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_modalfilter.F90 index 6f158c98..cdb41761 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_modalfilter.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_modalfilter.F90 @@ -5,7 +5,7 @@ !! Modal filter for Atmospheric dynamical process. !! The modal filter surpresses the numerical instability due to the aliasing errors. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro2d.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro2d.F90 index 7a152395..784d6af1 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro2d.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro2d.F90 @@ -6,7 +6,7 @@ !! The governing equations is a fully compressibile nonhydrostic equations, !! which consist of mass, momentum, and thermodynamics equations. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_common.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_common.F90 index 2cb0e7be..bb9bdb41 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_common.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_common.F90 @@ -4,7 +4,7 @@ !! @par Description !! A coomon model for atmospheric nonhydrostatic dynamical core !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_heve.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_heve.F90 index e84f5af6..582b1981 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_heve.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_heve.F90 @@ -6,7 +6,7 @@ !! The governing equations is a fully compressibile nonhydrostic equations, !! which consist of mass, momentum, and thermodynamics (total energy conservation) equations. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_heve_numflux.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_heve_numflux.F90 index 3e6f1e44..280adce7 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_heve_numflux.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_heve_numflux.F90 @@ -4,7 +4,7 @@ !! @par Description !! HEVE DGM scheme for Atmospheric dynamical process. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi.F90 index 0c3e7ce3..6132b575 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi.F90 @@ -6,7 +6,7 @@ !! The governing equations is a fully compressibile nonhydrostic equations, !! which consist of mass, momentum, and thermodynamics (total energy conservation) equations. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi_common.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi_common.F90 index 2bf0af8a..5348cb0a 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi_common.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi_common.F90 @@ -5,7 +5,7 @@ !! HEVI DGM scheme for Atmospheric dynamical process !! As the thermodynamics equation, a total energy equation is used. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" @@ -81,7 +81,7 @@ subroutine atm_dyn_dgm_nonhydro3d_etot_hevi_common_gen_vmap( & lmesh, elem ) ! (in) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem integer, intent(out) :: vmapM(elem%NfpTot,lmesh%NeZ) integer, intent(out) :: vmapP(elem%NfpTot,lmesh%NeZ) @@ -141,7 +141,7 @@ subroutine atm_dyn_dgm_nonhydro3d_etot_hevi_common_eval_Ax( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: DENS_t(elem%Np,lmesh%NeA) real(RP), intent(out) :: MOMZ_t(elem%Np,lmesh%NeA) real(RP), intent(out) :: ETOT_t(elem%Np,lmesh%NeA) @@ -317,7 +317,7 @@ subroutine atm_dyn_dgm_nonhydro3d_etot_hevi_common_eval_Ax_uv( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: MOMX_t(elem%Np,lmesh%NeA) real(RP), intent(out) :: MOMY_t(elem%Np,lmesh%NeA) real(RP), intent(out) :: alph(elem%NfpTot,lmesh%NeZ,lmesh%NeX*lmesh%NeY) @@ -461,7 +461,7 @@ subroutine atm_dyn_dgm_nonhydro3d_etot_hevi_common_construct_matbnd( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem integer, intent(in) :: kl, ku, nz_1D real(RP), intent(out) :: PmatBnd(2*kl+ku+1,3,elem%Nnode_v,lmesh%NeZ,elem%Nnode_h1D**2) real(RP), intent(in) :: PROG_VARS0(elem%Np,lmesh%NeZ,PRGVAR_NUM) @@ -748,7 +748,7 @@ subroutine atm_dyn_dgm_nonhydro3d_etot_hevi_common_construct_matbnd_uv( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem integer, intent(in) :: kl_uv, ku_uv, nz_1D_uv real(RP), intent(out) :: PmatBnd_uv(2*kl_uv+ku_uv+1,elem%Nnode_v,1,lmesh%NeZ,elem%Nnode_h1D**2) real(RP), intent(in) :: PROG_VARS0(elem%Np,lmesh%NeZ,PRGVAR_NUM) @@ -912,7 +912,7 @@ subroutine vi_cal_del_flux_dyn( del_flux, & ! (out) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%NeZ,lmesh%NeX*lmesh%NeY,PRGVAR_NUM) real(RP), intent(in) :: alph(elem%NfpTot*lmesh%NeZ,lmesh%NeX*lmesh%NeY) real(RP), intent(in) :: PVARS_ (elem%Np*lmesh%NeZ,PRGVAR_NUM,lmesh%NeX*lmesh%NeY) @@ -1010,7 +1010,7 @@ subroutine vi_cal_del_flux_dyn_uv( del_flux, alph, & ! (out) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%NeZ,lmesh%NeX*lmesh%NeY,PRGVAR_NUM) real(RP), intent(out) :: alph(elem%NfpTot*lmesh%NeZ,lmesh%NeX*lmesh%NeY) real(RP), intent(in) :: PVARS_ (elem%Np*lmesh%NeZ,PRGVAR_NUM,lmesh%NeX*lmesh%NeY) diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi_numflux.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi_numflux.F90 index 0ae4c849..752a385a 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi_numflux.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_etot_hevi_numflux.F90 @@ -4,7 +4,7 @@ !! @par Description !! HEVE DGM scheme for Atmospheric dynamical process. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_hevi_gmres.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_hevi_gmres.F90 index 584527c7..fb5d68ed 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_hevi_gmres.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_hevi_gmres.F90 @@ -1,4 +1,14 @@ !------------------------------------------------------------------------------- +!> module FElib / Fluid dyn solver / Atmosphere / Regional nonhydrostatic model / HEVI +!! +!! @par Description +!! HEVI DGM scheme for Atmospheric dynamical process in which GMRES is used for implicit solver. +!! The governing equations is a fully compressibile nonhydrostic equations, +!! which consist of mass, momentum, and thermodynamics (density * potential temperature conservation) equations. +!! +!! @author Yuta Kawai, Team SCALE +!< +!------------------------------------------------------------------------------- #include "scaleFElib.h" module scale_atm_dyn_dgm_nonhydro3d_hevi_gmres !----------------------------------------------------------------------------- @@ -126,9 +136,9 @@ subroutine atm_dyn_dgm_nonhydro3d_hevi_cal_tend( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem class(LocalMesh2D), intent(in) :: lmesh2D - class(elementbase2D), intent(in) :: elem2D + class(ElementBase2D), intent(in) :: elem2D type(SparseMat), intent(in) :: Dx, Dy, Dz, Sx, Sy, Sz, Lift real(RP), intent(out) :: DENS_dt(elem%Np,lmesh%NeA) real(RP), intent(out) :: MOMX_dt(elem%Np,lmesh%NeA) @@ -285,7 +295,7 @@ subroutine cal_del_flux_dyn( del_flux, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%Ne,PROG_VARS_NUM) real(RP), intent(in) :: DDENS_(elem%Np*lmesh%NeA) real(RP), intent(in) :: MOMX_(elem%Np*lmesh%NeA) @@ -446,7 +456,7 @@ subroutine cal_del_flux_dyn_AUSMup( del_flux, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%Ne,PROG_VARS_NUM) real(RP), intent(in) :: DDENS_(elem%Np*lmesh%NeA) real(RP), intent(in) :: MOMX_(elem%Np*lmesh%NeA) @@ -627,7 +637,7 @@ subroutine atm_dyn_dgm_nonhydro3d_hevi_cal_grad_diffVars( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem type(SparseMat), intent(in) :: Dx, Dy, Dz, Lift real(RP), intent(out) :: GxU_(elem%Np,lmesh%NeA) real(RP), intent(out) :: GyU_(elem%Np,lmesh%NeA) @@ -741,7 +751,7 @@ subroutine cal_del_gradDiffVar( del_flux, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%Ne,AUX_DIFFVARS_NUM) real(RP), intent(in) :: DDENS_(elem%Np*lmesh%NeA) real(RP), intent(in) :: MOMX_(elem%Np*lmesh%NeA) @@ -813,9 +823,9 @@ subroutine atm_dyn_dgm_nonhydro3d_hevi_cal_vi( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem class(LocalMesh2D), intent(in) :: lmesh2D - class(elementbase2D), intent(in) :: elem2D + class(ElementBase2D), intent(in) :: elem2D real(RP), intent(out) :: DENS_dt(elem%Np,lmesh%NeA) real(RP), intent(out) :: MOMX_dt(elem%Np,lmesh%NeA) real(RP), intent(out) :: MOMY_dt(elem%Np,lmesh%NeA) @@ -1018,7 +1028,7 @@ subroutine vi_GMRES_core( gmres_hevi, x, wj, is_converged, & ! (inout) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem integer, intent(in) :: N integer, intent(in) :: m @@ -1245,7 +1255,7 @@ subroutine vi_eval_Ax( Ax, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: Ax(elem%Np,PROG_VARS_NUM,lmesh%NeZ) real(RP), intent(in) :: PROG_VARS(elem%Np,PROG_VARS_NUM,lmesh%NeZ) real(RP), intent(in) :: PROG_VARS0(elem%Np,PROG_VARS_NUM,lmesh%NeZ) @@ -1333,7 +1343,7 @@ subroutine vi_cal_del_flux_dyn( del_flux, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%NeZ,PROG_VARS_NUM) real(RP), intent(in) :: DDENS_(elem%Np*lmesh%NeZ) real(RP), intent(in) :: MOMX_(elem%Np*lmesh%NeZ) @@ -1434,7 +1444,7 @@ subroutine vi_eval_Ax_lin( Ax, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: Ax(elem%Np,PROG_VARS_NUM,lmesh%NeZ) real(RP), intent(in) :: PROG_VARS(elem%Np,PROG_VARS_NUM,lmesh%NeZ) real(RP), intent(in) :: PROG_VARS0(elem%Np,PROG_VARS_NUM,lmesh%NeZ) @@ -1533,7 +1543,7 @@ subroutine vi_cal_del_flux_dyn_lin( del_flux, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%NeZ,PROG_VARS_NUM) real(RP), intent(in) :: DDENS_(elem%Np*lmesh%NeZ) real(RP), intent(in) :: MOMX_(elem%Np*lmesh%NeZ) @@ -1640,7 +1650,7 @@ subroutine vi_construct_pmatInv( PmatDlu, PmatDlu_ipiv, PmatL, PmatU, & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: PmatDlu(elem%Np*PROG_VARS_NUM,elem%Np*PROG_VARS_NUM,lmesh%NeZ) integer, intent(out) :: PmatDlu_ipiv(elem%Np*PROG_VARS_NUM,lmesh%NeZ) real(RP), intent(out) :: PmatL(elem%Np,elem%Np,PROG_VARS_NUM,PROG_VARS_NUM,lmesh%NeZ) diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_numdiff.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_numdiff.F90 index f52cf4cd..1c6758b5 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_numdiff.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_numdiff.F90 @@ -5,7 +5,7 @@ !! Explicit numerical diffusion for Atmospheric dynamical process. !! For the discretization, the local DGM (e.g., Cockburn and Shu, 1998) is used. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" @@ -388,7 +388,7 @@ subroutine numdiff_tend( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem type(SparseMat), intent(in) :: Dx, Dy, Dz, Lift real(RP), intent(inout) :: tend_(elem%Np,lmesh%NeA) real(RP), intent(in) :: GxV_(elem%Np,lmesh%NeA) @@ -452,7 +452,7 @@ subroutine cal_del_flux_lap_with_coef( del_flux, & ! (out) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%Ne) real(RP), intent(in) :: GxV_(elem%Np*lmesh%NeA) real(RP), intent(in) :: GyV_(elem%Np*lmesh%NeA) @@ -513,7 +513,7 @@ subroutine numdiff_cal_laplacian( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem type(SparseMat), intent(in) :: Dx, Dy, Dz, Lift real(RP), intent(out) :: lapla_h(elem%Np,lmesh%NeA) real(RP), intent(out) :: lapla_v(elem%Np,lmesh%NeA) @@ -568,7 +568,7 @@ subroutine cal_del_flux_lap( del_flux_h, del_flux_v, & ! (out) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux_h(elem%NfpTot*lmesh%Ne) real(RP), intent(out) :: del_flux_v(elem%NfpTot*lmesh%Ne) real(RP), intent(in) :: GxV_(elem%Np*lmesh%NeA) @@ -614,7 +614,7 @@ subroutine numdiff_cal_flx( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem type(SparseMat), intent(in) :: Dx, Dy, Dz, Lift real(RP), intent(out) :: GxV_(elem%Np,lmesh%NeA) real(RP), intent(out) :: GyV_(elem%Np,lmesh%NeA) @@ -676,7 +676,7 @@ subroutine cal_del_gradDiffVar( del_flux, & ! (out) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%Ne,3) real(RP), intent(in) :: Varh_(elem%Np*lmesh%NeA) real(RP), intent(in) :: Varv_(elem%Np*lmesh%NeA) diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve.F90 index 3c61919a..9c15c1cb 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve.F90 @@ -6,7 +6,7 @@ !! The governing equations is a fully compressibile nonhydrostic equations, !! which consist of mass, momentum, and thermodynamics (density * potential temperature conservation) equations. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve_numflux.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve_numflux.F90 index 861942da..1cf69e03 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve_numflux.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve_numflux.F90 @@ -4,7 +4,7 @@ !! @par Description !! HEVE DGM scheme for Atmospheric dynamical process. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve_splitform.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve_splitform.F90 index b1c113f9..a3e7f9de 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve_splitform.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_heve_splitform.F90 @@ -6,7 +6,7 @@ !! To improve the numerical instability due to the aliasing errors, !! the split form based on Gassner et al. (2016, JCP) is used for advection terms. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi.F90 index 2e8386b3..73e5fb06 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi.F90 @@ -6,7 +6,7 @@ !! The governing equations is a fully compressibile nonhydrostic equations, !! which consist of mass, momentum, and thermodynamics (density * potential temperature conservation) equations. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_common.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_common.F90 index 029a8804..e3566b1a 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_common.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_common.F90 @@ -5,7 +5,7 @@ !! HEVI DGM scheme for Atmospheric dynamical process !! As the thermodynamics equation, a density * potential temperature equation is used. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" @@ -78,7 +78,7 @@ subroutine atm_dyn_dgm_nonhydro3d_rhot_hevi_common_gen_vmap( & lmesh, elem ) ! (in) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem integer, intent(out) :: vmapM(elem%NfpTot,lmesh%NeZ) integer, intent(out) :: vmapP(elem%NfpTot,lmesh%NeZ) @@ -138,7 +138,7 @@ subroutine atm_dyn_dgm_nonhydro3d_rhot_hevi_common_eval_Ax( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: DENS_t(elem%Np,lmesh%NeA) real(RP), intent(out) :: MOMZ_t(elem%Np,lmesh%NeA) real(RP), intent(out) :: RHOT_t(elem%Np,lmesh%NeA) @@ -322,7 +322,7 @@ subroutine atm_dyn_dgm_nonhydro3d_rhot_hevi_common_eval_Ax_uv( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: MOMX_t(elem%Np,lmesh%NeA) real(RP), intent(out) :: MOMY_t(elem%Np,lmesh%NeA) real(RP), intent(out) :: alph(elem%NfpTot,lmesh%NeZ,lmesh%NeX*lmesh%NeY) @@ -462,7 +462,7 @@ subroutine atm_dyn_dgm_nonhydro3d_rhot_hevi_common_construct_matbnd( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem integer, intent(in) :: kl, ku, nz_1D real(RP), intent(out) :: PmatBnd(2*kl+ku+1,3,elem%Nnode_v,lmesh%NeZ,elem%Nnode_h1D**2) real(RP), intent(in) :: PROG_VARS0(elem%Np,lmesh%NeZ,PRGVAR_NUM) @@ -738,7 +738,7 @@ subroutine atm_dyn_dgm_nonhydro3d_rhot_hevi_common_construct_matbnd_uv( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem integer, intent(in) :: kl_uv, ku_uv, nz_1D_uv real(RP), intent(out) :: PmatBnd_uv(2*kl_uv+ku_uv+1,elem%Nnode_v,1,lmesh%NeZ,elem%Nnode_h1D**2) real(RP), intent(in) :: PROG_VARS0(elem%Np,lmesh%NeZ,PRGVAR_NUM) @@ -896,7 +896,7 @@ subroutine vi_cal_del_flux_dyn_uv( del_flux, alph, & ! (out) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%NeZ,lmesh%NeX*lmesh%NeY,PRGVAR_NUM) real(RP), intent(out) :: alph(elem%NfpTot*lmesh%NeZ,lmesh%NeX*lmesh%NeY) real(RP), intent(in) :: PVARS_ (elem%Np*lmesh%NeZ,PRGVAR_NUM,lmesh%NeX*lmesh%NeY) @@ -981,7 +981,7 @@ subroutine vi_cal_del_flux_dyn( del_flux, alph, & ! (out) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%NeZ,lmesh%NeX*lmesh%NeY,PRGVAR_NUM) real(RP), intent(in) :: alph(elem%NfpTot*lmesh%NeZ,lmesh%NeX*lmesh%NeY) real(RP), intent(in) :: PVARS_ (elem%Np*lmesh%NeZ,PRGVAR_NUM,lmesh%NeX*lmesh%NeY) diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_numflux.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_numflux.F90 index f840eb1a..ccefc907 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_numflux.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_numflux.F90 @@ -4,7 +4,7 @@ !! @par Description !! HEVE DGM scheme for Atmospheric dynamical process. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_splitform.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_splitform.F90 index 1c5e2253..850ae057 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_splitform.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_nonhydro3d_rhot_hevi_splitform.F90 @@ -6,7 +6,7 @@ !! To improve the numerical instability due to the aliasing errors, !! the split form based on Gassner et al. (2016, JCP) is used for advection terms. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_spongelayer.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_spongelayer.F90 index 6cdf4c89..8957ae60 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_spongelayer.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_spongelayer.F90 @@ -4,7 +4,7 @@ !! @par Description !! Sponge layer for Atmospheric dynamical process. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_trcadvect3d_heve.F90 b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_trcadvect3d_heve.F90 index 062531a9..0d65339a 100644 --- a/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_trcadvect3d_heve.F90 +++ b/FElib/src/fluid_dyn_solver/scale_atm_dyn_dgm_trcadvect3d_heve.F90 @@ -12,7 +12,7 @@ !! Preserving Nonnegativity in Discontinuous Galerkin Approximations to Scalar Transport via Truncation and Mass Aware Rescaling (TMAR). !! Monthly Weather Review, 144(12), 4771–4786. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/microphysics/scale_atm_phy_mp_dgm_common.F90 b/FElib/src/microphysics/scale_atm_phy_mp_dgm_common.F90 index b56bef75..1f9a3667 100644 --- a/FElib/src/microphysics/scale_atm_phy_mp_dgm_common.F90 +++ b/FElib/src/microphysics/scale_atm_phy_mp_dgm_common.F90 @@ -12,7 +12,7 @@ !! Preserving Nonnegativity in Discontinuous Galerkin Approximations to Scalar Transport via Truncation and Mass Aware Rescaling (TMAR). !! Monthly Weather Review, 144(12), 4771–4786. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/model_framework/scale_model_component.F90 b/FElib/src/model_framework/scale_model_component.F90 index b84c3fa7..a64b344a 100644 --- a/FElib/src/model_framework/scale_model_component.F90 +++ b/FElib/src/model_framework/scale_model_component.F90 @@ -4,7 +4,7 @@ !! @par Description !! A module for managing model components !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/FElib/src/model_framework/scale_model_component_proc.F90 b/FElib/src/model_framework/scale_model_component_proc.F90 index 93cc850b..d49f189b 100644 --- a/FElib/src/model_framework/scale_model_component_proc.F90 +++ b/FElib/src/model_framework/scale_model_component_proc.F90 @@ -4,7 +4,7 @@ !! @par Description !! A module for managing processes in model component !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< #include "scaleFElib.h" diff --git a/FElib/src/model_framework/scale_model_mesh_manager.F90 b/FElib/src/model_framework/scale_model_mesh_manager.F90 index c7d96d1d..aae24137 100644 --- a/FElib/src/model_framework/scale_model_mesh_manager.F90 +++ b/FElib/src/model_framework/scale_model_mesh_manager.F90 @@ -4,7 +4,7 @@ !! @par Description !! A module for managing mesh used in models !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/FElib/src/model_framework/scale_model_meshbase_manager.F90 b/FElib/src/model_framework/scale_model_meshbase_manager.F90 index 82d204f3..24c55f83 100644 --- a/FElib/src/model_framework/scale_model_meshbase_manager.F90 +++ b/FElib/src/model_framework/scale_model_meshbase_manager.F90 @@ -4,7 +4,7 @@ !! @par Description !! A module for managing mesh used in models !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/FElib/src/model_framework/scale_model_var_manager.F90 b/FElib/src/model_framework/scale_model_var_manager.F90 index 2b64fb97..ec815f17 100644 --- a/FElib/src/model_framework/scale_model_var_manager.F90 +++ b/FElib/src/model_framework/scale_model_var_manager.F90 @@ -4,7 +4,7 @@ !! @par Description !! A module for managing data of variables used in models !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/FElib/src/turbulence/scale_atm_phy_tb_dgm_common.F90 b/FElib/src/turbulence/scale_atm_phy_tb_dgm_common.F90 index daf9337c..32c5ed39 100644 --- a/FElib/src/turbulence/scale_atm_phy_tb_dgm_common.F90 +++ b/FElib/src/turbulence/scale_atm_phy_tb_dgm_common.F90 @@ -4,7 +4,7 @@ !! @par Description !! A coomon modules for atmospheric turbulent parameterization !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" diff --git a/FElib/src/turbulence/scale_atm_phy_tb_dgm_dns.F90 b/FElib/src/turbulence/scale_atm_phy_tb_dgm_dns.F90 index 363d6e3f..491e3d4d 100644 --- a/FElib/src/turbulence/scale_atm_phy_tb_dgm_dns.F90 +++ b/FElib/src/turbulence/scale_atm_phy_tb_dgm_dns.F90 @@ -5,7 +5,7 @@ !! !! @author Team SCALE !! -!! @par Reference +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" @@ -121,9 +121,9 @@ subroutine atm_phy_tb_dgm_dns_cal_grad( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem class(LocalMesh2D), intent(in) :: lmesh2D - class(elementbase2D), intent(in) :: elem2D + class(ElementBase2D), intent(in) :: elem2D real(RP), intent(out) :: T11(elem%Np,lmesh%NeA) !< (1,1) component of stress tensor real(RP), intent(out) :: T12(elem%Np,lmesh%NeA) !< (1,2) component of stress tensor real(RP), intent(out) :: T13(elem%Np,lmesh%NeA) !< (1,3) component of stress tensor @@ -308,7 +308,7 @@ subroutine cal_del_flux_grad( del_flux_rho, del_flux_mom, del_flux_rhot, & ! (o implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux_rho(elem%NfpTot*lmesh%Ne,3) real(RP), intent(out) :: del_flux_mom(elem%NfpTot*lmesh%Ne,3,3) real(RP), intent(out) :: del_flux_rhot(elem%NfpTot*lmesh%Ne,3) diff --git a/FElib/src/turbulence/scale_atm_phy_tb_dgm_driver.F90 b/FElib/src/turbulence/scale_atm_phy_tb_dgm_driver.F90 index c143f3f5..a46083f8 100644 --- a/FElib/src/turbulence/scale_atm_phy_tb_dgm_driver.F90 +++ b/FElib/src/turbulence/scale_atm_phy_tb_dgm_driver.F90 @@ -4,7 +4,7 @@ !! @par Description !! Driver module for turbulent model based on DGM !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !< !------------------------------------------------------------------------------- #include "scaleFElib.h" @@ -162,9 +162,9 @@ subroutine atm_phy_tb_cal_grad_qtrc( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem class(LocalMesh2D), intent(in) :: lmesh2D - class(elementbase2D), intent(in) :: elem2D + class(ElementBase2D), intent(in) :: elem2D real(RP), intent(out) :: DFQ1(elem%Np,lmesh%NeA) real(RP), intent(out) :: DFQ2(elem%Np,lmesh%NeA) real(RP), intent(out) :: DFQ3(elem%Np,lmesh%NeA) @@ -270,20 +270,14 @@ end subroutine atm_phy_tb_cal_tend_qtrc end interface type, public :: AtmPhyTbDGMDriver - ! - integer :: TB_TYPEID + integer :: TB_TYPEID !< Index of the turbulent model + + !- Auxiliary variables with tracer - ! type(MeshField3D), allocatable :: auxtrcvars(:) type(ModelVarManager) :: auxtrcvars_manager integer :: auxtrcvars_commid - ! diagnostic variables - type(MeshField3D), allocatable :: AUX_TBVARS3D(:) - type(ModelVarManager) :: AUXTBVAR3D_manager - integer :: AUXTBVAR3D_commid - - ! type(MeshField3D) :: GRAD_DENS(3) procedure (atm_phy_tb_cal_grad), pointer, nopass :: tbsolver_cal_grad => null() @@ -395,7 +389,7 @@ subroutine AtmPhyTbDGMDriver_Init( this, & !- Initialize variables !- - if ( QA > 1 ) then + if ( QA > 0 ) then call this%auxtrcvars_manager%Init() allocate( this%auxtrcvars(ATMOS_PHY_TB_AUXTRC_NUM) ) diff --git a/FElib/src/turbulence/scale_atm_phy_tb_dgm_globalsmg.F90 b/FElib/src/turbulence/scale_atm_phy_tb_dgm_globalsmg.F90 index b6b6c00b..2cd7713c 100644 --- a/FElib/src/turbulence/scale_atm_phy_tb_dgm_globalsmg.F90 +++ b/FElib/src/turbulence/scale_atm_phy_tb_dgm_globalsmg.F90 @@ -3,9 +3,8 @@ !! @par Description !! Sub-grid scale turbulnce process for global domain !! Smagorinsky-type -!! The equations are discretized by local DGM. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !! @par Reference !! - Brown et al., 1994: @@ -187,9 +186,9 @@ subroutine atm_phy_tb_dgm_globalsmg_cal_grad( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem class(LocalMesh2D), intent(in) :: lmesh2D - class(elementbase2D), intent(in) :: elem2D + class(ElementBase2D), intent(in) :: elem2D real(RP), intent(out) :: T11(elem%Np,lmesh%NeA) !< (1,1) component of stress tensor real(RP), intent(out) :: T12(elem%Np,lmesh%NeA) !< (1,2) component of stress tensor real(RP), intent(out) :: T13(elem%Np,lmesh%NeA) !< (1,3) component of stress tensor @@ -538,9 +537,9 @@ subroutine atm_phy_tb_dgm_globalsmg_cal_grad_qtrc( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem class(LocalMesh2D), intent(in) :: lmesh2D - class(elementbase2D), intent(in) :: elem2D + class(ElementBase2D), intent(in) :: elem2D real(RP), intent(out) :: DFQ1(elem%Np,lmesh%NeA) !< Diffusive mass flux in x1 direction / density (Kh dq/dx1) real(RP), intent(out) :: DFQ2(elem%Np,lmesh%NeA) !< Diffusive mass flux in x2 direction / density (Kh dq/dx2) real(RP), intent(out) :: DFQ3(elem%Np,lmesh%NeA) !< Diffusive mass flux in x3 direction / density (Kh dq/dx3) @@ -642,7 +641,7 @@ subroutine cal_del_flux_grad( del_flux_rho, del_flux_mom, del_flux_rhot, & ! (o implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux_rho(elem%NfpTot*lmesh%Ne,3) real(RP), intent(out) :: del_flux_mom(elem%NfpTot*lmesh%Ne,3,3) real(RP), intent(out) :: del_flux_rhot(elem%NfpTot*lmesh%Ne,3) @@ -731,7 +730,7 @@ subroutine cal_del_flux_grad_qtrc( del_flux, del_flux_rho, & ! (out) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%Ne,3) real(RP), intent(out) :: del_flux_rho(elem%NfpTot*lmesh%Ne,3) real(RP), intent(in) :: QTRC_(elem%Np*lmesh%NeA) @@ -806,9 +805,9 @@ subroutine atm_phy_tb_dgm_globalsmg_cal_tend( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem class(LocalMesh2D), intent(in) :: lmesh2D - class(elementbase2D), intent(in) :: elem2D + class(ElementBase2D), intent(in) :: elem2D real(RP), intent(out) :: MOMX_t(elem%Np,lmesh%NeA) !< Tendency of momentum in x1 direction with turbulent model real(RP), intent(out) :: MOMY_t(elem%Np,lmesh%NeA) !< Tendency of momentum in x2 direction with turbulent model real(RP), intent(out) :: MOMZ_t(elem%Np,lmesh%NeA) !< Tendency of momentum in x3 direction with turbulent model @@ -955,9 +954,9 @@ subroutine atm_phy_tb_dgm_globalsmg_cal_tend_qtrc( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem class(LocalMesh2D), intent(in) :: lmesh2D - class(elementbase2D), intent(in) :: elem2D + class(ElementBase2D), intent(in) :: elem2D real(RP), intent(out) :: RHOQ_t(elem%Np,lmesh%NeA) !< Tendency of tracer mass fraction real(RP), intent(in) :: DFQ1(elem%Np,lmesh%NeA) !< Diffusive mass flux in x1 direction / density (Kh dq/dx1) real(RP), intent(in) :: DFQ2(elem%Np,lmesh%NeA) !< Diffusive mass flux in x2 direction / density (Kh dq/dx2) @@ -1016,7 +1015,7 @@ subroutine cal_del_flux( del_flux_mom, del_flux_rhot, & ! (out) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux_mom (elem%NfpTot*lmesh%Ne,3) real(RP), intent(out) :: del_flux_rhot(elem%NfpTot*lmesh%Ne) real(RP), intent(in) :: T11(elem%Np*lmesh%NeA), T12(elem%Np*lmesh%NeA), T13(elem%Np*lmesh%NeA) @@ -1107,7 +1106,7 @@ subroutine cal_del_flux_qtrc( del_flux, & ! (out) implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux(elem%NfpTot*lmesh%Ne) real(RP), intent(in) :: DFQ1(elem%Np*lmesh%NeA) real(RP), intent(in) :: DFQ2(elem%Np*lmesh%NeA) diff --git a/FElib/src/turbulence/scale_atm_phy_tb_dgm_smg.F90 b/FElib/src/turbulence/scale_atm_phy_tb_dgm_smg.F90 index f3b968fc..6d9f1c86 100644 --- a/FElib/src/turbulence/scale_atm_phy_tb_dgm_smg.F90 +++ b/FElib/src/turbulence/scale_atm_phy_tb_dgm_smg.F90 @@ -4,7 +4,7 @@ !! Sub-grid scale turbulnce process !! Smagorinsky-type !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !! @par Reference !! - Brown et al., 1994: @@ -165,9 +165,9 @@ subroutine atm_phy_tb_dgm_smg_cal_grad( & implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem class(LocalMesh2D), intent(in) :: lmesh2D - class(elementbase2D), intent(in) :: elem2D + class(ElementBase2D), intent(in) :: elem2D real(RP), intent(out) :: T11(elem%Np,lmesh%NeA) !< (1,1) component of stress tensor real(RP), intent(out) :: T12(elem%Np,lmesh%NeA) !< (1,2) component of stress tensor real(RP), intent(out) :: T13(elem%Np,lmesh%NeA) !< (1,3) component of stress tensor @@ -411,7 +411,7 @@ subroutine cal_del_flux_grad( del_flux_rho, del_flux_mom, del_flux_rhot, & ! (o implicit none class(LocalMesh3D), intent(in) :: lmesh - class(elementbase3D), intent(in) :: elem + class(ElementBase3D), intent(in) :: elem real(RP), intent(out) :: del_flux_rho(elem%NfpTot*lmesh%Ne,3) real(RP), intent(out) :: del_flux_mom(elem%NfpTot*lmesh%Ne,3,3) real(RP), intent(out) :: del_flux_rhot(elem%NfpTot*lmesh%Ne,3) diff --git a/model/atm_nonhydro2d/src/atm_nonhydro2d.F90 b/model/atm_nonhydro2d/src/atm_nonhydro2d.F90 index 5081fed9..cc389348 100644 --- a/model/atm_nonhydro2d/src/atm_nonhydro2d.F90 +++ b/model/atm_nonhydro2d/src/atm_nonhydro2d.F90 @@ -5,7 +5,7 @@ !! atm_nonhydro2d is a 2-dimensional nonhydrostatic atmospheric model !! whose dynamical process is discretized by a discontinuous galerkin method. !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_component.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_component.F90 index 1d51bbd8..70a09374 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_component.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_component.F90 @@ -4,7 +4,7 @@ !! @par Description !! Atmosphere component module !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_dyn.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_dyn.F90 index 226b0236..da24faa2 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_dyn.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_dyn.F90 @@ -1,10 +1,10 @@ !------------------------------------------------------------------------------- -!> module ATMOSPHERE dynamical process +!> module Atmosphere / Dynamics !! !! @par Description !! Module for atmosphere dynamical process !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_dyn_vars.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_dyn_vars.F90 index f5cbde53..37f12f13 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_dyn_vars.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_dyn_vars.F90 @@ -2,9 +2,9 @@ !> module Atmosphere / Dynamics !! !! @par Description -!! Container for mod_atmos_dyn +!! Container for variables with dynamics component !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh.F90 index dfb78386..49d83901 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh.F90 @@ -1,4 +1,13 @@ !------------------------------------------------------------------------------- +!> module Atmosphere / Mesh +!! +!! @par Description +!! Base module for mesh with atmospheric model +!! +!! @author Yuta kawai, Team SCALE +!! +!< +!------------------------------------------------------------------------------- #include "scaleFElib.h" module mod_atmos_mesh !----------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh_gm.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh_gm.F90 index 7fd93cdb..8e156f43 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh_gm.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh_gm.F90 @@ -1,4 +1,13 @@ !------------------------------------------------------------------------------- +!> module Atmosphere / Mesh +!! +!! @par Description +!! Module for mesh with atmospheric global model +!! +!! @author Yuta kawai, Team SCALE +!! +!< +!------------------------------------------------------------------------------- #include "scaleFElib.h" module mod_atmos_mesh_gm !----------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh_rm.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh_rm.F90 index f2d2b49a..fb30a763 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh_rm.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_mesh_rm.F90 @@ -1,4 +1,13 @@ !------------------------------------------------------------------------------- +!> module Atmosphere / Mesh +!! +!! @par Description +!! Module for mesh with atmospheric regional model +!! +!! @author Yuta kawai, Team SCALE +!! +!< +!------------------------------------------------------------------------------- #include "scaleFElib.h" module mod_atmos_mesh_rm !----------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_mp.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_mp.F90 index 93edc802..cdd7e5de 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_mp.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_mp.F90 @@ -1,9 +1,10 @@ +!------------------------------------------------------------------------------- !> module ATMOSPHERE phyics / cloud microphysics !! !! @par Description !! Module for cloud microphysics !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_mp_vars.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_mp_vars.F90 index 29948a92..0f1a12b2 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_mp_vars.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_mp_vars.F90 @@ -2,9 +2,9 @@ !> module Atmosphere / Physics Cloud Microphysics !! !! @par Description -!! Container for mod_atmos_phy_mp +!! Container for variables with cloud microphysics component !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_sfc.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_sfc.F90 index 4fdaa658..6facdaa3 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_sfc.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_sfc.F90 @@ -1,3 +1,4 @@ +!------------------------------------------------------------------------------- !> module ATMOSPHERE phyics / surface process !! !! @par Description diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_sfc_vars.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_sfc_vars.F90 index 0055b81d..d7198c28 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_sfc_vars.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_sfc_vars.F90 @@ -1,4 +1,13 @@ !------------------------------------------------------------------------------- +!> module ATMOSPHERE phyics / surface process +!! +!! @par Description +!! Container for variables with surface model +!! +!! @author Yuta Kawai, Team SCALE +!! +!< +!------------------------------------------------------------------------------- #include "scaleFElib.h" module mod_atmos_phy_sfc_vars !----------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_tb.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_tb.F90 index 3113d9e0..64805aa4 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_tb.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_tb.F90 @@ -1,3 +1,4 @@ +!------------------------------------------------------------------------------- !> module ATMOSPHERE phyics / turbulence process !! !! @par Description diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_tb_vars.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_tb_vars.F90 index beb6b212..2a5bb30e 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_tb_vars.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_phy_tb_vars.F90 @@ -2,9 +2,9 @@ !> module Atmosphere / Physics turbulence !! !! @par Description -!! Container for mod_atmos_phy_mp +!! Container for variables with turbulence model !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/atmos/mod_atmos_vars.F90 b/model/atm_nonhydro3d/src/atmos/mod_atmos_vars.F90 index 830ba1f2..cf04fe84 100644 --- a/model/atm_nonhydro3d/src/atmos/mod_atmos_vars.F90 +++ b/model/atm_nonhydro3d/src/atmos/mod_atmos_vars.F90 @@ -4,7 +4,7 @@ !! @par Description !! Container for atmospheric variables !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/preprocess/mod_mkinit.F90 b/model/atm_nonhydro3d/src/preprocess/mod_mkinit.F90 index 459d75eb..92b91a27 100644 --- a/model/atm_nonhydro3d/src/preprocess/mod_mkinit.F90 +++ b/model/atm_nonhydro3d/src/preprocess/mod_mkinit.F90 @@ -4,7 +4,7 @@ !! @par Description !! subroutines for preparing initial data !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/preprocess/mod_mkinit_util.F90 b/model/atm_nonhydro3d/src/preprocess/mod_mkinit_util.F90 index 9e5b26d8..c6953007 100644 --- a/model/atm_nonhydro3d/src/preprocess/mod_mkinit_util.F90 +++ b/model/atm_nonhydro3d/src/preprocess/mod_mkinit_util.F90 @@ -4,7 +4,7 @@ !! @par Description !! subroutines useful to prepare initial data !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/preprocess/mod_mktopo.F90 b/model/atm_nonhydro3d/src/preprocess/mod_mktopo.F90 index 28121999..1574fb69 100644 --- a/model/atm_nonhydro3d/src/preprocess/mod_mktopo.F90 +++ b/model/atm_nonhydro3d/src/preprocess/mod_mktopo.F90 @@ -4,7 +4,7 @@ !! @par Description !! A module for preparing topography data !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/preprocess/mod_mktopo_util.F90 b/model/atm_nonhydro3d/src/preprocess/mod_mktopo_util.F90 index 833ce448..b7874dbb 100644 --- a/model/atm_nonhydro3d/src/preprocess/mod_mktopo_util.F90 +++ b/model/atm_nonhydro3d/src/preprocess/mod_mktopo_util.F90 @@ -4,7 +4,7 @@ !! @par Description !! subroutines useful to prepare topography data !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/scale-dg.F90 b/model/atm_nonhydro3d/src/scale-dg.F90 index 5a9b5763..adaa23b5 100755 --- a/model/atm_nonhydro3d/src/scale-dg.F90 +++ b/model/atm_nonhydro3d/src/scale-dg.F90 @@ -5,7 +5,7 @@ !! SCALE: Scalable Computing by Advanced Library and Environment !! numerical model with DGM for regional weather, regional climate, and large-Eddy Simulation (LES) !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/scale-dg_pp.F90 b/model/atm_nonhydro3d/src/scale-dg_pp.F90 index 51db24bf..812bc7c5 100755 --- a/model/atm_nonhydro3d/src/scale-dg_pp.F90 +++ b/model/atm_nonhydro3d/src/scale-dg_pp.F90 @@ -5,7 +5,7 @@ !! SCALE: Scalable Computing by Advanced Library and Environment !! numerical model with DGM for regional weather, regional climate, and large-Eddy Simulation (LES) !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/user/mod_user.F90 b/model/atm_nonhydro3d/src/user/mod_user.F90 index 72686a10..61786f87 100644 --- a/model/atm_nonhydro3d/src/user/mod_user.F90 +++ b/model/atm_nonhydro3d/src/user/mod_user.F90 @@ -4,7 +4,7 @@ !! @par Description !! User defined module (dummy) !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- diff --git a/model/atm_nonhydro3d/src/user/mod_user_base.F90 b/model/atm_nonhydro3d/src/user/mod_user_base.F90 index 483a4202..de18b6de 100644 --- a/model/atm_nonhydro3d/src/user/mod_user_base.F90 +++ b/model/atm_nonhydro3d/src/user/mod_user_base.F90 @@ -4,7 +4,7 @@ !! @par Description !! User defined module (base class) !! -!! @author Team SCALE +!! @author Yuta Kawai, Team SCALE !! !< !------------------------------------------------------------------------------- From e49ea542c84440bcdc70f56091e84fc5909dd042 Mon Sep 17 00:00:00 2001 From: Yuta Kawai Date: Sun, 6 Oct 2024 09:32:43 +0900 Subject: [PATCH 2/2] Remove unnecessary file --- model/atm_nonhydro3d/src/run.conf | 84 ------------------------------- 1 file changed, 84 deletions(-) delete mode 100644 model/atm_nonhydro3d/src/run.conf diff --git a/model/atm_nonhydro3d/src/run.conf b/model/atm_nonhydro3d/src/run.conf deleted file mode 100644 index 4011ce1f..00000000 --- a/model/atm_nonhydro3d/src/run.conf +++ /dev/null @@ -1,84 +0,0 @@ -#--- Configuration file for a test case of density current in Straka et al. (1993) ------- -&PARAM_ATM_NONHYDRO2D - EXP_NAME = 'DensityCurrent', -/ -&PARAM_ATMOS - ACTIVATE_FLAG = .true., - ATMOS_DYN_DO = .true. -/ -&PARAM_ATMOS_MESH - dom_xmin = 0.0D3, - dom_xmax = 25.6D3, - isPeriodicX = .true., - dom_ymin = 0.0D3, - dom_ymax = 25.6D3, - isPeriodicY = .true., - dom_zmin = 0.0D0, - dom_zmax = 6.4D3, - NeGX = 20, - NeGY = 20, - NeGZ = 20, - PolyOrder_h = 3, - PolyOrder_v = 3, -/ -&PARAM_ATMOS_DYN - TINTEG_TYPE = 'RK_TVD_3', - DT_SEC = 0.04D0, - VISCCOEF_H = 75.0D0, - VISCCOEF_V = 75.0D0, - DIFFCOEF_H = 75.0D0, - DIFFCOEF_V = 75.0D0, - EXPFILTER_FLAG = .true., - EXPFILTER_ETAC = 0.6666D0, - EXPFILTER_ALPHA = 36.0D0, - EXPFILTER_ORDER = 16, -/ -&PARAM_ATMOS_DYN_BND - btm_vel_bc = 'SLIP', - top_vel_bc = 'SLIP', - north_vel_bc = 'SLIP', - south_vel_bc = 'SLIP', - east_vel_bc = 'SLIP', - west_vel_bc = 'SLIP', - btm_thermal_bc = 'ADIABATIC', - top_thermal_bc = 'ADIABATIC', - north_thermal_bc = 'ADIABATIC', - south_thermal_bc = 'ADIABATIC', - west_thermal_bc = 'ADIABATIC', - east_thermal_bc = 'ADIABATIC', -/ -&PARAM_EXP - THETA0 = 300.0D0, - DTHETA = -15.0D0, - x_c = 0.0D3, - z_c = 3.0D3, - r_x = 4.0D3, - r_z = 2.0D3, - InitCond_GalerkinProjFlag = .true., -/ -&PARAM_TIME - TIME_DURATION = 0.20D0, - TIME_DURATION_UNIT = 'SEC', - TIME_DT = 0.04D0, - TIME_DT_UNIT = 'SEC', -/ -&PARAM_FILE_HISTORY - FILE_HISTORY_DEFAULT_BASENAME = "history", - FILE_HISTORY_DEFAULT_TINTERVAL = 0.2D0, - FILE_HISTORY_DEFAULT_TUNIT = "SEC", - FILE_HISTORY_DEFAULT_TAVERAGE = .false., - FILE_HISTORY_DEFAULT_DATATYPE = "REAL4", - FILE_HISTORY_OUTPUT_STEP0 = .true., -/ -&HISTORY_ITEM name='DDENS' / -&HISTORY_ITEM name='MOMX' / -!!&HISTORY_ITEM name='MOMY' / -!&HISTORY_ITEM name='MOMZ' / -!&HISTORY_ITEM name='DRHOT' / -!&HISTORY_ITEM name='U' / -!&HISTORY_ITEM name='W' / -!&HISTORY_ITEM name='DPRES' / -&HISTORY_ITEM name='DENS_hyd' / -!&HISTORY_ITEM name='DTHETA' / - -