Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhongwangwei
zhongwangwei committed Jan 25, 2024
1 parent 5164992 commit 580a696
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 68 deletions.
106 changes: 53 additions & 53 deletions CaMa/src/cmf_ctrl_output_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,92 +451,92 @@ SUBROUTINE CMF_OUTPUT_WRITE
DO JF=1,NVARSOUT
SELECT CASE (VAROUT(JF)%CVNAME)
CASE ('rivsto')
D2COPY=P2RIVSTO !! convert Double to Single precision when using SinglePrecisionMode
D2VEC => D2COPY !! (Storage variables are kept as Float64 in SinglePrecisionMode)
D2COPY=P2RIVSTO !! convert Double to Single precision when using SinglePrecisionMode
D2VEC => D2COPY !! (Storage variables are kept as Float64 in SinglePrecisionMode)
CASE ('fldsto')
D2COPY=P2FLDSTO
D2VEC => D2COPY
D2COPY=P2FLDSTO
D2VEC => D2COPY
CASE ('rivout')
D2VEC => D2RIVOUT_AVG
D2VEC => D2RIVOUT_AVG
CASE ('rivdph')
D2VEC => D2RIVDPH
D2VEC => D2RIVDPH
CASE ('rivvel')
D2VEC => D2RIVVEL_AVG
D2VEC => D2RIVVEL_AVG
CASE ('fldout')
D2VEC => D2FLDOUT_AVG
D2VEC => D2FLDOUT_AVG
CASE ('flddph')
D2VEC => D2FLDDPH
D2VEC => D2FLDDPH
CASE ('fldfrc')
D2VEC => D2FLDFRC
D2VEC => D2FLDFRC
CASE ('fldare')
D2VEC => D2FLDARE
D2VEC => D2FLDARE
CASE ('sfcelv')
D2VEC => D2SFCELV
D2VEC => D2SFCELV
CASE ('totout')
D2VEC => D2OUTFLW_AVG
D2VEC => D2OUTFLW_AVG
CASE ('outflw') !! compatibility for previous file name
D2VEC => D2OUTFLW_AVG
D2VEC => D2OUTFLW_AVG
CASE ('totsto')
D2VEC => D2STORGE
D2VEC => D2STORGE
CASE ('storge') !! compatibility for previous file name
D2VEC => D2STORGE
D2VEC => D2STORGE
CASE ('pthout')
IF( .not. LPTHOUT ) CYCLE
D2VEC => D2PTHOUT_AVG
IF( .not. LPTHOUT ) CYCLE
D2VEC => D2PTHOUT_AVG
CASE ('pthflw')
IF( .not. LPTHOUT ) CYCLE
IF( .not. LPTHOUT ) CYCLE
CASE ('maxflw')
D2VEC => D2OUTFLW_MAX
D2VEC => D2OUTFLW_MAX
CASE ('maxdph')
D2VEC => D2RIVDPH_MAX
D2VEC => D2RIVDPH_MAX
CASE ('maxsto')
D2VEC => D2STORGE_MAX
D2VEC => D2STORGE_MAX
CASE ('outins')
IF( .not. LOUTINS ) CYCLE
D2VEC => D2OUTINS
IF( .not. LOUTINS ) CYCLE
D2VEC => D2OUTINS
CASE ('gwsto')
IF( .not. LGDWDLY ) CYCLE
D2COPY=P2GDWSTO
D2VEC => D2COPY
IF( .not. LGDWDLY ) CYCLE
D2COPY=P2GDWSTO
D2VEC => D2COPY
CASE ('gdwsto')
IF( .not. LGDWDLY ) CYCLE
D2COPY=P2GDWSTO
D2VEC => D2COPY
IF( .not. LGDWDLY ) CYCLE
D2COPY=P2GDWSTO
D2VEC => D2COPY
CASE ('gwout')
IF( .not. LGDWDLY ) CYCLE
D2VEC => D2GDWRTN_AVG
IF( .not. LGDWDLY ) CYCLE
D2VEC => D2GDWRTN_AVG
CASE ('gdwrtn')
IF( .not. LGDWDLY ) CYCLE
D2VEC => D2GDWRTN_AVG
CASE ('runoff') !! compatibility for previous file name
D2VEC => D2RUNOFF_AVG
D2VEC => D2GDWRTN_AVG
CASE ('runoff') !! compatibility for previous file name
D2VEC => D2RUNOFF_AVG
CASE ('runoffsub') !! compatibility for previous file name
IF( .not. LROSPLIT ) CYCLE
D2VEC => D2ROFSUB_AVG
IF( .not. LROSPLIT ) CYCLE
D2VEC => D2ROFSUB_AVG
CASE ('rofsfc')
D2VEC => D2RUNOFF_AVG
D2VEC => D2RUNOFF_AVG
CASE ('rofsub')
D2VEC => D2ROFSUB_AVG
D2VEC => D2ROFSUB_AVG
CASE ('wevap')
IF( .not. LWEVAP ) CYCLE
D2VEC => D2WEVAPEX_AVG
IF( .not. LWEVAP ) CYCLE
D2VEC => D2WEVAPEX_AVG
CASE ('winfilt')
IF( .not. LWINFILT ) CYCLE
D2VEC => D2WINFILTEX_AVG
IF( .not. LWINFILT ) CYCLE
D2VEC => D2WINFILTEX_AVG
CASE ('damsto') !!! added
IF( .not. LDAMOUT ) CYCLE
D2COPY=P2DAMSTO
D2VEC => D2COPY
D2COPY=P2DAMSTO
D2VEC => D2COPY
CASE ('daminf') !!! added
IF( .not. LDAMOUT ) CYCLE
D2VEC => d2daminf_avg
IF( .not. LDAMOUT ) CYCLE
2VEC => d2daminf_avg
CASE ('levsto') !!! added
IF( .not. LLEVEE ) CYCLE
D2COPY=P2LEVSTO
D2VEC => D2COPY
IF( .not. LLEVEE ) CYCLE
D2COPY=P2LEVSTO
D2VEC => D2COPY
CASE ('levdph') !!! added
IF( .not. LLEVEE ) CYCLE
D2VEC => D2LEVDPH
IF( .not. LLEVEE ) CYCLE
D2VEC => D2LEVDPH
CASE DEFAULT
END SELECT !! variable name select

Expand Down Expand Up @@ -736,7 +736,7 @@ END SUBROUTINE WRTE_mapR2vecD
!================================================


END SUBROUTINE CMF_OUTPUT_END
END SUBROUTINE CMF_OUTPUT_END
!####################################################################


Expand Down
26 changes: 13 additions & 13 deletions CaMa/src/parkind1.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,33 @@ MODULE PARKIND1
SAVE
!================================================
!*** Integer Kinds
INTEGER, PARAMETER :: JPIT = SELECTED_INT_KIND(2)
INTEGER, PARAMETER :: JPIS = SELECTED_INT_KIND(4)
INTEGER, PARAMETER :: JPIM = SELECTED_INT_KIND(9)
INTEGER, PARAMETER :: JPIB = SELECTED_INT_KIND(12)
integer,parameter :: JPIT = SELECTED_INT_KIND(2)
integer,parameter :: JPIS = SELECTED_INT_KIND(4)
integer,parameter :: JPIM = SELECTED_INT_KIND(9)
integer,parameter :: JPIB = SELECTED_INT_KIND(12)
!Special integer type to be used for sensative adress calculations
!should be *8 for a machine with 8byte adressing for optimum performance
#ifdef ADDRESS64
INTEGER, PARAMETER :: JPIA = JPIB
integer,parameter :: JPIA = JPIB
#else
INTEGER, PARAMETER :: JPIA = JPIM
integer,parameter :: JPIA = JPIM
#endif
!================================================
!*** Real Kinds
INTEGER, PARAMETER :: JPRT = SELECTED_REAL_KIND(2,1)
INTEGER, PARAMETER :: JPRS = SELECTED_REAL_KIND(4,2)
INTEGER, PARAMETER :: JPRM = SELECTED_REAL_KIND(6,37)
integer,parameter :: JPRT = SELECTED_REAL_KIND(2,1)
integer,parameter :: JPRS = SELECTED_REAL_KIND(4,2)
integer,parameter :: JPRM = SELECTED_REAL_KIND(6,37)
#ifdef SinglePrec_CMF
INTEGER, PARAMETER :: JPRB = SELECTED_REAL_KIND(6,37)
integer,parameter :: JPRB = SELECTED_REAL_KIND(6,37)
#else
INTEGER, PARAMETER :: JPRB = SELECTED_REAL_KIND(13,300)
integer,parameter :: JPRB = SELECTED_REAL_KIND(13,300)
#endif
! Double real for C code and special places requiring
! higher precision.
INTEGER, PARAMETER :: JPRD = SELECTED_REAL_KIND(13,300)
integer,parameter :: JPRD = SELECTED_REAL_KIND(13,300)

!================================================
! Logical Kinds for RTTOV....
INTEGER, PARAMETER :: JPLM = JPIM !Standard logical type
integer,parameter :: JPLM = JPIM !Standard logical type

END MODULE PARKIND1
4 changes: 2 additions & 2 deletions CaMa/src/yos_cmf_diag.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ MODULE YOS_CMF_DIAG

!================================================
!*** dam variable
real(KIND=JPRB),POINTER :: D2DAMINF_AVG(:,:) !! average reservoir inflow [m3/s] !!!added
real(KIND=JPRB),pointer :: D2DAMINF_AVG(:,:) !! average reservoir inflow [m3/s] !!!added

!================================================
!!!*** levee variables
real(KIND=JPRB),POINTER :: D2LEVDPH(:,:) !! flood depth in protected side (water depth betwen river & levee)
real(KIND=JPRB),pointer :: D2LEVDPH(:,:) !! flood depth in protected side (water depth betwen river & levee)



Expand Down

0 comments on commit 580a696

Please sign in to comment.