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.

Sign up for GitHub

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

share, mksrfdata, mkinidata, main/HYDRO, main/DA and postprocess code… #241

Merged
merged 9 commits into from
Jan 29, 2024
Merged

share, mksrfdata, mkinidata, main/HYDRO, main/DA and postprocess code… #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
317a4f2
share, mksrfdata, mkinidata, main/HYDRO, main/DA and postprocess code…
zhangsp8 Jan 24, 2024
496fdcb
Merge branch 'CoLM-SYSU:master' into master
zhangsp8 Jan 25, 2024
e18322b
elseif check and modification
zhangsp8 Jan 25, 2024
0d6da08
Merge branch 'master' of github.com:zhangsp8/CoLM202X
zhangsp8 Jan 25, 2024
05c8705
mksrfdata, mkinidata, share, main/HYDRO, main/DA, postprocess code mo…
zhangsp8 Jan 26, 2024
ee688fe
Merge branch 'CoLM-SYSU:master' into master
zhangsp8 Jan 26, 2024
cc329f8
Merge branch 'CoLM-SYSU:master' into master
zhangsp8 Jan 26, 2024
a301dae
bug fixed in mod_namelist.f90
zhangsp8 Jan 26, 2024
4e14ef5
Merge branch 'master' of github.com:zhangsp8/CoLM202X
zhangsp8 Jan 26, 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
154 changes: 77 additions & 77 deletions main/DA/MOD_DA_GRACE.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,45 +11,45 @@ MODULE MOD_DA_GRACE
PUBLIC :: do_DA_GRACE
PUBLIC :: final_DA_GRACE

REAL(r8), allocatable, PUBLIC :: fslp_k_mon (:,:) ! slope factor of runoff
REAL(r8), allocatable, PUBLIC :: fslp_k (:) ! slope factor of runoff
real(r8), allocatable, PUBLIC :: fslp_k_mon (:,:) ! slope factor of runoff
real(r8), allocatable, PUBLIC :: fslp_k (:) ! slope factor of runoff

PRIVATE

CHARACTER(len=256) :: file_grace
TYPE(grid_type) :: grid_grace
character(len=256) :: file_grace
type(grid_type) :: grid_grace

REAL(r8), allocatable :: longrace(:)
REAL(r8), allocatable :: latgrace(:)
real(r8), allocatable :: longrace(:)
real(r8), allocatable :: latgrace(:)

INTEGER :: nobstime
INTEGER, allocatable :: obsyear (:)
INTEGER, allocatable :: obsmonth (:)
integer :: nobstime
integer, allocatable :: obsyear (:)
integer, allocatable :: obsmonth (:)

type (mapping_grid2pset_type) :: mg2p_grace

REAL(r8), allocatable :: lwe_obs_this (:)
REAL(r8), allocatable :: err_obs_this (:)
real(r8), allocatable :: lwe_obs_this (:)
real(r8), allocatable :: err_obs_this (:)

REAL(r8), allocatable :: lwe_obs_prev (:)
REAL(r8), allocatable :: err_obs_prev (:)
real(r8), allocatable :: lwe_obs_prev (:)
real(r8), allocatable :: err_obs_prev (:)

REAL(r8), allocatable :: wat_prev_m (:)
REAL(r8), allocatable :: wat_this_m (:)
real(r8), allocatable :: wat_prev_m (:)
real(r8), allocatable :: wat_this_m (:)

REAL(r8), allocatable :: rnof_acc_prev_m (:)
REAL(r8), allocatable :: rnof_acc_this_m (:)
REAL(r8), allocatable :: zwt_acc_prev_m (:)
REAL(r8), allocatable :: zwt_acc_this_m (:)
real(r8), allocatable :: rnof_acc_prev_m (:)
real(r8), allocatable :: rnof_acc_this_m (:)
real(r8), allocatable :: zwt_acc_prev_m (:)
real(r8), allocatable :: zwt_acc_this_m (:)

REAL(r8), allocatable :: rnof_prev_m0 (:)
REAL(r8), allocatable :: rnof_prev_m1 (:)
REAL(r8), allocatable :: rnof_this_m (:)
real(r8), allocatable :: rnof_prev_m0 (:)
real(r8), allocatable :: rnof_prev_m1 (:)
real(r8), allocatable :: rnof_this_m (:)

logical, allocatable :: rnofmask (:)

LOGICAL :: has_prev_grace_obs
INTEGER :: nac_grace_this, nac_grace_prev
logical :: has_prev_grace_obs
integer :: nac_grace_this, nac_grace_prev

integer :: year_prev, month_prev

Expand All @@ -58,27 +58,27 @@ MODULE MOD_DA_GRACE
! ----------
SUBROUTINE init_DA_GRACE ()

USE MOD_Spmd_Task
USE MOD_Namelist, only : DEF_DA_obsdir
USE MOD_Grid
USE MOD_NetCDFSerial
USE MOD_Mesh, only : numelm
USE MOD_LandElm, only : landelm
USE MOD_LandPatch
USE MOD_Spmd_Task
USE MOD_Namelist, only : DEF_DA_obsdir
USE MOD_Grid
USE MOD_NetCDFSerial
USE MOD_Mesh, only : numelm
USE MOD_LandElm, only : landelm
USE MOD_LandPatch
#ifdef CROP
USE MOD_LandCrop
USE MOD_LandCrop
#endif
USE MOD_Pixelset
USE MOD_Mapping_Grid2pset
USE MOD_Vars_TimeInvariants, only : patchtype
USE MOD_Forcing, only : forcmask
USE MOD_RangeCheck
IMPLICIT NONE
! Local Variables
USE MOD_Pixelset
USE MOD_Mapping_Grid2pset
USE MOD_Vars_TimeInvariants, only : patchtype
USE MOD_Forcing, only : forcmask
USE MOD_RangeCheck
IMPLICIT NONE

! Local Variables

REAL(r8), allocatable :: time_real8(:)
INTEGER :: itime
real(r8), allocatable :: time_real8(:)
integer :: itime

file_grace = trim(DEF_DA_obsdir) &
// '/GRACE_JPL/GRCTellus.JPL.200204_202207.GLO.RL06M.MSCNv02CRI.nc'
Expand All @@ -105,7 +105,7 @@ SUBROUTINE init_DA_GRACE ()

CALL grid_grace%define_by_center (latgrace,longrace)

call mg2p_grace%build (grid_grace, landelm)
CALL mg2p_grace%build (grid_grace, landelm)

IF (p_is_worker) THEN
IF (numelm > 0) THEN
Expand Down Expand Up @@ -171,32 +171,32 @@ END SUBROUTINE init_DA_GRACE
! ----------
SUBROUTINE do_DA_GRACE (idate, deltim)

USE MOD_Spmd_task
USE MOD_TimeManager
USE MOD_NetCDFBlock
USE MOD_Mesh
USE MOD_LandElm
USE MOD_LandPatch
USE MOD_Vars_1DFluxes, only : rnof, rsur
USE MOD_Vars_TimeVariables, only : wat, wa, wdsrf, zwt
USE MOD_RangeCheck
IMPLICIT NONE
INTEGER, INTENT(in) :: idate(3)
REAL(r8), INTENT(in) :: deltim
USE MOD_Spmd_task
USE MOD_TimeManager
USE MOD_NetCDFBlock
USE MOD_Mesh
USE MOD_LandElm
USE MOD_LandPatch
USE MOD_Vars_1DFluxes, only : rnof, rsur
USE MOD_Vars_TimeVariables, only : wat, wa, wdsrf, zwt
USE MOD_RangeCheck
IMPLICIT NONE

integer, intent(in) :: idate(3)
real(r8), intent(in) :: deltim

! Local Variables
LOGICAL :: is_obs_time
INTEGER :: month, mday, itime, ielm, istt, iend, nextmonth
! Local Variables
logical :: is_obs_time
integer :: month, mday, itime, ielm, istt, iend, nextmonth

real(r8) :: sumpct
REAL(r8) :: w1, w0, r1, r0, var_o, var_m, dw_f, dw_o, dw_a, rr, zwt_ave
REAL(r8) :: fscal, fprev, fthis
real(r8) :: sumpct
real(r8) :: w1, w0, r1, r0, var_o, var_m, dw_f, dw_o, dw_a, rr, zwt_ave
real(r8) :: fscal, fprev, fthis

TYPE(block_data_real8_2d) :: f_grace_lwe ! unit: cm
TYPE(block_data_real8_2d) :: f_grace_err ! unit: cm
type(block_data_real8_2d) :: f_grace_lwe ! unit: cm
type(block_data_real8_2d) :: f_grace_err ! unit: cm

character(len=256) :: sid, logfile
character(len=256) :: sid, logfile

CALL julian2monthday (idate(1), idate(2), month, mday)

Expand Down Expand Up @@ -236,7 +236,7 @@ SUBROUTINE do_DA_GRACE (idate, deltim)

ENDIF

IF (is_obs_time .and. (isendofmonth(idate, deltim))) then
IF (is_obs_time .and. (isendofmonth(idate, deltim))) THEN

itime = findloc((obsyear == idate(1)) .and. (obsmonth == month), .true., dim=1)

Expand All @@ -259,9 +259,9 @@ SUBROUTINE do_DA_GRACE (idate, deltim)

zwt_acc_prev_m = zwt_acc_prev_m / nac_grace_prev

IF (has_prev_grace_obs) then
IF (has_prev_grace_obs) THEN
rnof_prev_m1 = rnof_prev_m1 / nac_grace_this
endif
ENDIF

IF (has_prev_grace_obs .and. &
(((idate(1) == year_prev) .and. (month_prev == month-1)) &
Expand Down Expand Up @@ -362,7 +362,7 @@ SUBROUTINE do_DA_GRACE (idate, deltim)

ENDIF

IF (isendofmonth(idate, deltim)) then
IF (isendofmonth(idate, deltim)) THEN
IF (p_is_worker .and. (numpatch > 0)) THEN
nextmonth = mod(month+1,12)+1
fslp_k = fslp_k_mon(nextmonth,:)
Expand All @@ -375,7 +375,7 @@ END SUBROUTINE do_DA_GRACE
! ---------
SUBROUTINE final_DA_GRACE ()

IMPLICIT NONE
IMPLICIT NONE

IF (allocated(lwe_obs_this)) deallocate(lwe_obs_this)
IF (allocated(err_obs_this)) deallocate(err_obs_this)
Expand All @@ -401,13 +401,13 @@ END SUBROUTINE final_DA_GRACE
! ---------
SUBROUTINE retrieve_yymm_from_days (days, yy, mm)

IMPLICIT NONE
REAL(r8), intent(in) :: days
INTEGER, intent(out) :: yy, mm
IMPLICIT NONE
real(r8), intent(in) :: days
integer, intent(out) :: yy, mm

! Local Variables
REAL(r8) :: resday
INTEGER :: mdays(12)
! Local Variables
real(r8) :: resday
integer :: mdays(12)

yy = 2002
mm = 1
Expand All @@ -422,7 +422,7 @@ SUBROUTINE retrieve_yymm_from_days (days, yy, mm)
IF (mm > 12) THEN
yy = yy + 1
mm = 1
IF( (mod(yy,4)==0 .AND. mod(yy,100)/=0) .OR. mod(yy,400)==0 ) THEN
IF( (mod(yy,4)==0 .and. mod(yy,100)/=0) .or. mod(yy,400)==0 ) THEN
mdays(2) = 29
ELSE
mdays(2) = 28
Expand Down
10 changes: 5 additions & 5 deletions main/DA/MOD_DataAssimilation.F90
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Add some descriptions of DA module?

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MODULE MOD_DataAssimilation
! ----------
SUBROUTINE init_DataAssimilation ()

IMPLICIT NONE
IMPLICIT NONE

CALL init_DA_GRACE ()

Expand All @@ -21,10 +21,10 @@ END SUBROUTINE init_DataAssimilation
! ----------
SUBROUTINE do_DataAssimilation (idate, deltim)

IMPLICIT NONE
IMPLICIT NONE

INTEGER, INTENT(in) :: idate(3)
REAL(r8), INTENT(in) :: deltim
integer, intent(in) :: idate(3)
real(r8), intent(in) :: deltim

CALL do_DA_GRACE (idate, deltim)

Expand All @@ -33,7 +33,7 @@ END SUBROUTINE do_DataAssimilation
! ---------
SUBROUTINE final_DataAssimilation ()

IMPLICIT NONE
IMPLICIT NONE

CALL final_DA_GRACE ()

Expand Down
Loading