Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v0.8.0 #343

Merged
merged 100 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
89a7ac6
Fix a bug in procedure overriding of update subroutine in mod_user.F90
May 9, 2023
3188b80
Fix a bug in eigenvalues with numerical diffusion for tracer advection
May 9, 2023
20214c9
Merge pull request #284 from ywkawai/feature/fix_bug
ywkawai May 9, 2023
78381ed
Add a subroutine to calculate initial atmospheric data with a constan…
May 30, 2023
8c3b7fa
Update a strategy to install SSH key and transfer SCALE library
May 31, 2023
9429629
Merge pull request #286 from ywkawai/feature/construct_hydrostatic_state
ywkawai May 31, 2023
8cc601b
Add a function to evaluate numerical errors for 1D and 2D fields
May 31, 2023
a56176f
Use module scale_meshfield_analysis_numerror in a sample program of 1…
May 31, 2023
f37102d
Modify an argument
Jun 1, 2023
b82a4f6
Merge pull request #288 from ywkawai/feature/eval_numerror_2D
ywkawai Jun 1, 2023
feae7ed
Set surface area of 2D mesh
Jun 4, 2023
e76b64d
Merge pull request #289 from ywkawai/feature/fix_bug
ywkawai Jun 6, 2023
9aefe50
Modify the size of array X2D and Y2D
Jun 9, 2023
48facb0
Add comments
Jun 9, 2023
b1544aa
Merge pull request #292 from ywkawai/feature/fix_bug
ywkawai Jun 9, 2023
fecc8e4
Modify halo data of metric tensor with vertical coordinate transforma…
Jun 26, 2023
0b6446a
Modify halo data to specify no flux condition at top and bottom bound…
Jun 26, 2023
4fe8fd9
Refactor source codes for generating a topography data used in global…
Jun 26, 2023
2423d66
Available to specify a name of vertical coordinate variable in regrid…
Jun 26, 2023
c450ff7
Modify configuration files in a global baroclinic wave test
Jun 26, 2023
5b9e936
Add a script file for visualizing simulation results of global barocl…
Jun 26, 2023
75a2464
Merge pull request #297 from ywkawai/feature/gm_idealized_topography
ywkawai Jun 26, 2023
f840caf
Rename module name
Jun 27, 2023
a00d246
Add a module to provide subroutines for coordinate transformation bet…
Jun 27, 2023
134da3f
Modify a subroutine to provide coordinate conversion between cubed sp…
Jun 27, 2023
1356162
Rename some subroutines with cubed sphere coordinate
Jun 27, 2023
c3d2989
Interchange axes of array in arguments of subroutines
Jun 30, 2023
779e541
Add functions to provide coordinate transformation between cubed-sphe…
Jun 30, 2023
43d56e9
Update a unit test for 2D cubed-sphere coordinate
Jun 30, 2023
ba772fb
Remove the multiplication by cos(lat) according to modification of su…
Jun 30, 2023
9883498
Merge pull request #299 from ywkawai/feature/coord_cnv
ywkawai Jun 30, 2023
9315b6f
Change the strategy to apply a modal filter when using HEVI scheme
Jul 18, 2023
c7c62e6
Merge pull request #301 from ywkawai/feature/modal_filter_HEVI
ywkawai Jul 18, 2023
53439b7
Update depend file
Jul 18, 2023
2e600c2
Merge pull request #302 from ywkawai/feature/update_depend
ywkawai Jul 18, 2023
7df6f6f
Change an array shape of Gsqrt in 2D problems
Jul 21, 2023
994a1cc
Set exterior values of Gsqrt in 2D cubed sphere case
Jul 21, 2023
5c04595
Fix some bugs and add comments
Jul 21, 2023
12bdf38
Update configuration files of test cases for a global shallow water m…
Jul 21, 2023
60b52b6
Add configuration files for regrid tool
Jul 21, 2023
cfafb83
Merge pull request #307 from ywkawai/feature/fix_bug_2d
ywkawai Jul 21, 2023
0189630
Modify a description of Vmet in regrid tool
Jul 22, 2023
9cac576
Add a function to input a topography data file when generating initia…
Jul 22, 2023
2d01a15
Merge pull request #308 from ywkawai/feature/read_topo_data
ywkawai Jul 22, 2023
1a4d07e
Put global attributes with time information into output files from re…
Jul 22, 2023
1d60b36
Merge pull request #309 from ywkawai/feature/regrid_tool_time_attribute
ywkawai Jul 22, 2023
eba3fa6
Fix a bug with when the exterior values with vertical boundary condit…
Aug 3, 2023
7786094
Improve numerical stability of HEVI scheme when topography has a stee…
Aug 3, 2023
e6c021f
Merge pull request #311 from ywkawai/feature/improve_hevi
ywkawai Aug 4, 2023
7998b28
Remove extra codes in GMRES
Aug 22, 2023
d93c052
Support to communicate halo data of 2d tensor in 3d cubed sphere mesh
Aug 22, 2023
dee6c59
Add an argument in subroutines to create communicator
Aug 22, 2023
b1069d8
Modify a parameter to determine the convergence of iteration
Aug 22, 2023
69f4198
Refactor source codes with turbulent model
Aug 22, 2023
d2700ce
Add a module to provide a turbulent model for global domain
Aug 22, 2023
40e4b83
Modify source code to support surface flux calculations in cubed sphe…
Aug 24, 2023
bd89a16
Consider to use wind vector with local orthogonal basis when calling …
Aug 30, 2023
1163f44
Modify source codes according to recent refatoring
Aug 30, 2023
9e0cd94
Merge pull request #315 from ywkawai/feature/tb_GM
ywkawai Aug 30, 2023
528d1c7
Support to remove shallow layer approximation in global domain
Sep 3, 2023
9816ae2
Modify source codes according to change in interfaces
Sep 3, 2023
19ed902
Enable to specify deep atmosphere calculation in global model
Sep 3, 2023
c042d4c
Fix a bug with memory allocation
Sep 3, 2023
a68e45a
Modify regrid tool to treat deep atmopshere configurations
Sep 4, 2023
57c756c
Merge pull request #316 from ywkawai/feature/relax_shallow_atm_approx
ywkawai Sep 4, 2023
777ab63
Set default values for a factor r/a
Sep 19, 2023
ecbd7b4
Modify sample programs
Sep 20, 2023
4b0f52b
Modification to treat a vertical axis for the case of positive down
Sep 21, 2023
6d3421e
Update Makedef for FUGAKU
Sep 21, 2023
d489688
Merge pull request #320 from ywkawai/feature/bug_fix
ywkawai Sep 21, 2023
ac50db5
Improve round off errors in horizontal gradient of hydrostatic pressure
Oct 6, 2023
f5f1a32
Merge pull request #321 from ywkawai/feature/improve_roundoff_error
ywkawai Oct 6, 2023
1cee170
Fix a bug with a private variable for OpenMP
Oct 17, 2023
a20a14f
Modify a bug with imcomplet reafctoring with turbulent model
Oct 17, 2023
7fe2c71
Modify an index for a reference pressure variable to avoid the input …
Oct 17, 2023
2ba5b65
Update variable information in output data
Oct 17, 2023
b5330f7
Modification
Oct 17, 2023
feb6330
Merge pull request #323 from ywkawai/feature/bug_fix
ywkawai Oct 17, 2023
d966732
Add Makdef file for Odyssey
Nov 5, 2023
a62ba3d
Add comments and update source codes according to recent refactors
Nov 5, 2023
b7d7532
Update an installation document
Nov 5, 2023
937562e
Merge pull request #325 from ywkawai/feature/refactor
ywkawai Nov 5, 2023
0ac9275
Modify the method for determining the most adjacent node
Nov 6, 2023
76883cb
Merge pull request #327 from ywkawai/feature/fix_build_interior_map
ywkawai Nov 6, 2023
9ebbabd
Ues SCALE library v5.5.x
Apr 2, 2024
ac07694
Remove ifdef SCALE_DEVELOP in driver module
Apr 2, 2024
da2679b
Remove ifdef SCALE_DEVELOP in lancher module
Apr 2, 2024
73d1d40
Merge pull request #329 from ywkawai/feature/scalelib_build
ywkawai Apr 2, 2024
5f07bb3
Correct size of temporary array
Apr 4, 2024
17b2257
Merge pull request #331 from ywkawai/feature/bug_fix
ywkawai Apr 4, 2024
06af9d4
Add a user interface to set tendencies before update subroutines in c…
Apr 9, 2024
b5f67d7
Merge pull request #333 from ywkawai/feature/mod_user
ywkawai Apr 9, 2024
1e08773
Enable to specify postfix and FFLAG for test case
Apr 14, 2024
6be43c1
Merge pull request #335 from ywkawai/feature/makefile_update
ywkawai Apr 14, 2024
d8bad45
Ues SCALE library v5.5.1 in Github Actions
Apr 16, 2024
3016dd7
Merge pull request #338 from ywkawai/feature/scalelib_build
ywkawai Apr 16, 2024
af7281f
Modify a bug with 2D data regrid
Apr 30, 2024
4a3492e
Merge pull request #339 from ywkawai/feature/fix_regrid_tool
ywkawai Apr 30, 2024
54abb38
Update documents to release v0.8.0
Apr 30, 2024
3e32349
Modify document
Apr 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions .github/workflows/FEProject_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,21 @@ jobs:
sudo apt-get install -y openssh-client

- name: Install SSH key
uses: shimataro/ssh-key-action@v1
uses: shimataro/ssh-key-action@v2
with:
private-key: ${{ secrets.SSH_KEY }}
public-key: ${{ secrets.SSH_KEY_PUBLIC }}
key: ${{ secrets.SSH_KEY }}
name: id_rsa

known_hosts: ${{ secrets.KNOWN_HOSTS }}
config: |
Host scalelib_host
HostName ${{ secrets.SCALELIB_SERVER_HOST }}
User ${{ secrets.SCALELIB_SERVER_USER }}
IdentityFile ~/.ssh/id_rsa

- name: Install SCALE library
run: |
sed -i -e "s#\\\\n#\n#g" ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
ssh-keyscan -H www.gfd-dennou.org >> ~/.ssh/known_hosts
cd ${GITHUB_WORKSPACE}/..
scp [email protected]:FE-Project_GitActions/scalelib_ubuntu_latest.zip .
scp scalelib_host:FE-Project_GitActions/scalelib_ubuntu_latest.zip .
unzip scalelib_ubuntu_latest.zip && mv scalelib_ubuntu_latest scale

- name: Build FElib
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/scalelib_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,25 @@ jobs:
sudo apt-get install -y openssh-client rsync

- name: Install SSH key
uses: shimataro/ssh-key-action@v1
uses: shimataro/ssh-key-action@v2
with:
private-key: ${{ secrets.SSH_KEY }}
public-key: ${{ secrets.SSH_KEY_PUBLIC }}
key: ${{ secrets.SSH_KEY }}
name: id_rsa
known_hosts: ${{ secrets.KNOWN_HOSTS }}
config: |
Host scalelib_host
HostName ${{ secrets.SCALELIB_SERVER_HOST }}
User ${{ secrets.SCALELIB_SERVER_USER }}
IdentityFile ~/.ssh/id_rsa

- name: Build SCALE library & send it to a server
run: |
export SCALE_INST_DIR=${GITHUB_WORKSPACE}/../scale
mkdir -p ${SCALE_INST_DIR} && cd ${SCALE_INST_DIR}

echo "Download SCALE library .."
wget -q https://scale.riken.jp/archives/scale-5.4.5.tar.gz
tar xzf scale-5.4.5.tar.gz --strip-components 1
wget -q https://scale.riken.jp/archives/scale-5.5.1.tar.gz
tar xzf scale-5.5.1.tar.gz --strip-components 1

echo "Build SCALE library .."
export SCALE_SYS=Linux64-gnu-ompi
Expand All @@ -57,10 +62,7 @@ jobs:
cp -r scalelib/include/*.h ${tmp_dir}/scalelib/include/
zip -r ${tmp_dir}.zip ${tmp_dir}

sed -i -e "s#\\\\n#\n#g" ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
ssh-keyscan -H www.gfd-dennou.org >> ~/.ssh/known_hosts
rsync ${tmp_dir}.zip [email protected]:FE-Project_GitActions/
rsync ${tmp_dir}.zip scalelib_host:FE-Project_GitActions/



Expand Down
4 changes: 2 additions & 2 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2019--2023 FE-project Group. All rights reserved.
Copyright (C) 2019--2024 FE-project Group. All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand All @@ -21,7 +21,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-------------- Japanese Version start here --------------------------

Copyright (C) 2019--2023 FE-project Group. All rights reserved.
Copyright (C) 2019--2024 FE-project Group. All rights reserved.

以下に定める条件に従い、本ソフトウェアおよび関連文書のファイル(以下「ソ
フトウェア」)の複製を取得するすべての人に対し、ソフトウェアを無制限に扱
Expand Down
37 changes: 21 additions & 16 deletions FElib/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ OBJS_NAME_COMMON = \
scale_timeint_rk.o \
scale_linkedlist.o \
scale_gmres.o \
scale_cubedsphere_cnv.o \
scale_geographic_coord_cnv.o \
scale_cubedsphere_coord_cnv.o \
scale_coriolis_param.o

OBJS_NAME_ELEMENT = \
Expand All @@ -65,10 +66,10 @@ OBJS_NAME_MESH = \
scale_localmesh_1d.o \
scale_localmesh_2d.o \
scale_localmesh_3d.o \
scale_mesh_base.o \
scale_mesh_base1d.o \
scale_mesh_base2d.o \
scale_mesh_base3d.o \
scale_mesh_base.o \
scale_mesh_base1d.o \
scale_mesh_base2d.o \
scale_mesh_base3d.o \
scale_mesh_linedom1d.o \
scale_mesh_rectdom2d.o \
scale_mesh_cubedom3d.o \
Expand All @@ -77,16 +78,17 @@ OBJS_NAME_MESH = \
scale_mesh_topography.o

OBJS_NAME_DATA = \
scale_variableinfo.o \
scale_localmeshfield_base.o \
scale_meshfield_base.o \
scale_meshfieldcomm_base.o \
scale_meshfieldcomm_1d.o \
scale_meshfieldcomm_rectdom2d.o \
scale_meshfieldcomm_cubedspheredom2d.o \
scale_meshfieldcomm_cubedom3d.o \
scale_meshfieldcomm_cubedspheredom3d.o \
scale_meshfield_statistics.o \
scale_variableinfo.o \
scale_localmeshfield_base.o \
scale_meshfield_base.o \
scale_meshfieldcomm_base.o \
scale_meshfieldcomm_1d.o \
scale_meshfieldcomm_rectdom2d.o \
scale_meshfieldcomm_cubedspheredom2d.o \
scale_meshfieldcomm_cubedom3d.o \
scale_meshfieldcomm_cubedspheredom3d.o \
scale_meshfield_statistics.o \
scale_meshfield_analysis_numerror_base.o \
scale_meshfield_analysis_numerror.o

OBJS_NAME_FILE = \
Expand Down Expand Up @@ -128,7 +130,10 @@ OBJS_NAME_FLUID_DYN_SOLVER = \
scale_atm_dyn_dgm_trcadvect3d_heve.o

OBJS_NAME_TURBULENCE = \
scale_atm_phy_tb_dgm_smg.o
scale_atm_phy_tb_dgm_driver.o \
scale_atm_phy_tb_dgm_smg.o \
scale_atm_phy_tb_dgm_globalsmg.o \
scale_atm_phy_tb_dgm_common.o

OBJS_NAME_MICROPHYS = \
scale_atm_phy_mp_dgm_common.o
Expand Down
11 changes: 11 additions & 0 deletions FElib/src/common/scale_coriolis_param.F90
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
!-------------------------------------------------------------------------------
!> module common / Coriolis parameter
!!
!! @par Description
!! Setup coriolis parameter (for regional model)
!!
!!
!! @par Reference
!!
!! @author Team SCALE
!!
#include "scaleFElib.h"
module scale_coriolis_param
!-----------------------------------------------------------------------------
Expand Down
Loading