Merge branch 'develop'

.github/workflows/FEProject_build.yml

@@ -18,6 +18,8 @@ jobs:
 
     - name: Install Fortran compiler & NetCDF  & OpenMPI & lapack & openssh
       run: |
+        sudo apt-get update
+
         echo "Update information of package list.."
         sudo apt-get update
 

.github/workflows/scalelib_build.yml

@@ -13,6 +13,8 @@ jobs:
 
     - name: Install Fortran compiler & NetCDF & OpenMPI & openssh
       run: |
+        sudo apt-get update
+
         echo "Install Fortran compiler .."
         sudo apt-get install -y gfortran
         
@@ -38,8 +40,8 @@ jobs:
         mkdir -p ${SCALE_INST_DIR} && cd ${SCALE_INST_DIR}
 
         echo "Download SCALE library .."
-        wget -q https://scale.riken.jp/archives/scale-5.4.4.tar.gz
-        tar xzf scale-5.4.4.tar.gz --strip-components 1
+        wget -q https://scale.riken.jp/archives/scale-5.4.5.tar.gz
+        tar xzf scale-5.4.5.tar.gz --strip-components 1
 
         echo "Build SCALE library .."
         export SCALE_SYS=Linux64-gnu-ompi

.gitignore

@@ -33,20 +33,28 @@ init_*.pe*.nc
 #
 scale-dg
 LOG.pe*
+init_LOG.pe*
+monitor.pe*
 history.pe*.nc
 restart_*.pe*.nc
 *.dat
 
 #
 interp_LOG.pe*
+cs2lonlat_LOG.pe*
+regrid_LOG.pe*
+regrid_LOG_topo.pe*
 
 #
 job_init.sh
 job_run.sh
+job_regrid.sh
 *.out
 *.err
 *.stats
 STDOUT.*
+stdout.*
+stderr.*
 
 #
 model/atm_nonhydro3d/test/case/**/*.nc

COPYRIGHT

@@ -1,4 +1,4 @@
-Copyright (C) 2019--2021 FE-project Group. All rights reserved.
+Copyright (C) 2019--2022 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
@@ -21,7 +21,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 -------------- Japanese Version start here --------------------------
 
-Copyright (C) 2019--2021 FE-project Group. All rights reserved.
+Copyright (C) 2019--2022 FE-project Group. All rights reserved.
 
 以下に定める条件に従い、本ソフトウェアおよび関連文書のファイル（以下「ソ
 フトウェア」）の複製を取得するすべての人に対し、ソフトウェアを無制限に扱

FElib/src/Makefile

@@ -18,6 +18,7 @@ VPATH = \
 	file:             \
 	fluid_dyn_solver: \
 	turbulence:       \
+	microphysics:     \
 	model_framework:
 
 LIBVERSION = $(shell git rev-parse --short HEAD 2> /dev/null)
@@ -108,11 +109,15 @@ OBJS_NAME_FLUID_DYN_SOLVER = \
 	scale_atm_dyn_dgm_nonhydro3d_hevi_gmres.o        \
 	scale_atm_dyn_dgm_globalnonhydro3d_heve.o        \
 	scale_atm_dyn_dgm_globalnonhydro3d_hevi.o        \
-	scale_atm_dyn_dgm_globalsw.o
+	scale_atm_dyn_dgm_globalsw.o                     \
+	scale_atm_dyn_dgm_trcadvect3d_heve.o	
 
 OBJS_NAME_TURBULENCE = \
 	scale_atm_phy_tb_dgm_smg.o
 
+OBJS_NAME_MICROPHYS = \
+	scale_atm_phy_mp_dgm_common.o
+
 OBJS_NAME_MODEL_FRAMEWORK = \
 	scale_model_mesh_manager.o   \
 	scale_model_component.o      \
@@ -127,6 +132,7 @@ OBJS_NAME = \
 	$(OBJS_NAME_FILE)             \
 	$(OBJS_NAME_FLUID_DYN_SOLVER) \
 	$(OBJS_NAME_TURBULENCE)       \
+	$(OBJS_NAME_MICROPHYS)        \
 	$(OBJS_NAME_MODEL_FRAMEWORK)
 
 

FElib/src/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

FElib/src/common/scale_cubedsphere_cnv.F90

@@ -242,9 +242,9 @@ subroutine CubedSphereCnv_CS2LonLatVec( &
         Y = tan( beta (p) )
         del2 = 1.0_RP + X**2 + Y**2
 
-        VecLon(p) = (- Y * ( 1.0 + X**2 ) * VecAlpha(p) + X * ( 1.0_RP + Y**2 ) * VecBeta(p) ) &
+        VecLon(p) = (- Y * ( 1.0_RP + X**2 ) * VecAlpha(p) + X * ( 1.0_RP + Y**2 ) * VecBeta(p) ) &
                   * s / ( X**2 + Y**2 + EPS )
-        VecLat(p) = (- X * ( 1.0 + X**2 ) * VecAlpha(p) - Y * ( 1.0_RP + Y**2 ) * VecBeta(p) ) &
+        VecLat(p) = (- X * ( 1.0_RP + X**2 ) * VecAlpha(p) - Y * ( 1.0_RP + Y**2 ) * VecBeta(p) ) &
                   * s / ( del2 * sqrt( X**2 + Y**2 ) + EPS )
       end do
     end select