Skip to content

Commit

Permalink
Merge branch 'CoLM-SYSU:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
sliuclimate authored Jan 23, 2024
2 parents 84d8551 + 6be881a commit b6a431d
Show file tree
Hide file tree
Showing 194 changed files with 22,168 additions and 15,042 deletions.
88 changes: 88 additions & 0 deletions .github/workflows/TestCaseLists
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
GRID_PFT_URBANON_CAMBELL_CAMAON_BGCON_CROPON GRID LULC_IGBP_PFT URBANON Campbell CaMaON BGCON CROPON
GRID_PFT_URBANON_CAMBELL_CAMAOFF_BGCON_CROPON GRID LULC_IGBP_PFT URBANON Campbell CaMaOFF BGCON CROPON
GRID_PFT_URBANON_vanGen_CAMAON_BGCON_CROPON GRID LULC_IGBP_PFT URBANON vanGenu CaMaON BGCON CROPON
GRID_PFT_URBANON_vanGen_CAMAOFF_BGCON_CROPON GRID LULC_IGBP_PFT URBANON vanGenu CaMaOFF BGCON CROPON
GRID_PFT_URBANOFF_CAMBELL_CAMAON_BGCON_CROPON GRID LULC_IGBP_PFT URBANOFF Campbell CaMaON BGCON CROPON
GRID_PFT_URBANOFF_CAMBELL_CAMAOFF_BGCON_CROPON GRID LULC_IGBP_PFT URBANOFF Campbell CaMaOFF BGCON CROPON
GRID_PFT_URBANOFF_vanGen_CAMAON_BGCON_CROPON GRID LULC_IGBP_PFT URBANOFF vanGenu CaMaON BGCON CROPON
GRID_PFT_URBANOFF_vanGen_CAMAOFF_BGCON_CROPON GRID LULC_IGBP_PFT URBANOFF vanGenu CaMaOFF BGCON CROPON
GRID_PFT_URBANON_CAMBELL_CAMAON_BGCON_CROPOFF GRID LULC_IGBP_PFT URBANON Campbell CaMaON BGCON CROPOFF
GRID_PFT_URBANON_CAMBELL_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP_PFT URBANON Campbell CaMaOFF BGCON CROPOFF
GRID_PFT_URBANON_vanGen_CAMAON_BGCON_CROPOFF GRID LULC_IGBP_PFT URBANON vanGenu CaMaON BGCON CROPOFF
GRID_PFT_URBANON_vanGen_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP_PFT URBANON vanGenu CaMaOFF BGCON CROPOFF
GRID_PFT_URBANOFF_CAMBELL_CAMAON_BGCON_CROPOFF GRID LULC_IGBP_PFT URBANOFF Campbell CaMaON BGCON CROPOFF
GRID_PFT_URBANOFF_CAMBELL_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP_PFT URBANOFF Campbell CaMaOFF BGCON CROPOFF
GRID_PFT_URBANOFF_vanGen_CAMAON_BGCON_CROPOFF GRID LULC_IGBP_PFT URBANOFF vanGenu CaMaON BGCON CROPOFF
GRID_PFT_URBANOFF_vanGen_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP_PFT URBANOFF vanGenu CaMaOFF BGCON CROPOFF
GRID_PFT_URBANON_CAMBELL_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP_PFT URBANON Campbell CaMaON BGCOFF CROPOFF
GRID_PFT_URBANON_CAMBELL_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP_PFT URBANON Campbell CaMaOFF BGCOFF CROPOFF
GRID_PFT_URBANON_vanGen_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP_PFT URBANON vanGenu CaMaON BGCOFF CROPOFF
GRID_PFT_URBANON_vanGen_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP_PFT URBANON vanGenu CaMaOFF BGCOFF CROPOFF
GRID_PFT_URBANOFF_CAMBELL_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP_PFT URBANOFF Campbell CaMaON BGCOFF CROPOFF
GRID_PFT_URBANOFF_CAMBELL_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP_PFT URBANOFF Campbell CaMaOFF BGCOFF CROPOFF
GRID_PFT_URBANOFF_vanGen_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP_PFT URBANOFF vanGenu CaMaON BGCOFF CROPOFF
GRID_PFT_URBANOFF_vanGen_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP_PFT URBANOFF vanGenu CaMaOFF BGCOFF CROPOFF
GRID_PC_URBANON_CAMBELL_CAMAON_BGCON_CROPON GRID LULC_IGBP_PC URBANON Campbell CaMaON BGCON CROPON
GRID_PC_URBANON_CAMBELL_CAMAOFF_BGCON_CROPON GRID LULC_IGBP_PC URBANON Campbell CaMaOFF BGCON CROPON
GRID_PC_URBANON_vanGen_CAMAON_BGCON_CROPON GRID LULC_IGBP_PC URBANON vanGenu CaMaON BGCON CROPON
GRID_PC_URBANON_vanGen_CAMAOFF_BGCON_CROPON GRID LULC_IGBP_PC URBANON vanGenu CaMaOFF BGCON CROPON
GRID_PC_URBANOFF_CAMBELL_CAMAON_BGCON_CROPON GRID LULC_IGBP_PC URBANOFF Campbell CaMaON BGCON CROPON
GRID_PC_URBANOFF_CAMBELL_CAMAOFF_BGCON_CROPON GRID LULC_IGBP_PC URBANOFF Campbell CaMaOFF BGCON CROPON
GRID_PC_URBANOFF_vanGen_CAMAON_BGCON_CROPON GRID LULC_IGBP_PC URBANOFF vanGenu CaMaON BGCON CROPON
GRID_PC_URBANOFF_vanGen_CAMAOFF_BGCON_CROPON GRID LULC_IGBP_PC URBANOFF vanGenu CaMaOFF BGCON CROPON
GRID_PC_URBANON_CAMBELL_CAMAON_BGCOFF_CROPON GRID LULC_IGBP_PC URBANON Campbell CaMaON BGCOFF CROPON
GRID_PC_URBANON_CAMBELL_CAMAOFF_BGCOFF_CROPON GRID LULC_IGBP_PC URBANON Campbell CaMaOFF BGCOFF CROPON
GRID_PC_URBANON_vanGen_CAMAON_BGCOFF_CROPON GRID LULC_IGBP_PC URBANON vanGenu CaMaON BGCOFF CROPON
GRID_PC_URBANON_vanGen_CAMAOFF_BGCOFF_CROPON GRID LULC_IGBP_PC URBANON vanGenu CaMaOFF BGCOFF CROPON
GRID_PC_URBANOFF_CAMBELL_CAMAON_BGCOFF_CROPON GRID LULC_IGBP_PC URBANOFF Campbell CaMaON BGCOFF CROPON
GRID_PC_URBANOFF_CAMBELL_CAMAOFF_BGCOFF_CROPON GRID LULC_IGBP_PC URBANOFF Campbell CaMaOFF BGCOFF CROPON
GRID_PC_URBANOFF_vanGen_CAMAON_BGCOFF_CROPON GRID LULC_IGBP_PC URBANOFF vanGenu CaMaON BGCOFF CROPON
GRID_PC_URBANOFF_vanGen_CAMAOFF_BGCOFF_CROPON GRID LULC_IGBP_PC URBANOFF vanGenu CaMaOFF BGCOFF CROPON
GRID_PC_URBANON_CAMBELL_CAMAON_BGCON_CROPOFF GRID LULC_IGBP_PC URBANON Campbell CaMaON BGCON CROPOFF
GRID_PC_URBANON_CAMBELL_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP_PC URBANON Campbell CaMaOFF BGCON CROPOFF
GRID_PC_URBANON_vanGen_CAMAON_BGCON_CROPOFF GRID LULC_IGBP_PC URBANON vanGenu CaMaON BGCON CROPOFF
GRID_PC_URBANON_vanGen_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP_PC URBANON vanGenu CaMaOFF BGCON CROPOFF
GRID_PC_URBANOFF_CAMBELL_CAMAON_BGCON_CROPOFF GRID LULC_IGBP_PC URBANOFF Campbell CaMaON BGCON CROPOFF
GRID_PC_URBANOFF_CAMBELL_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP_PC URBANOFF Campbell CaMaOFF BGCON CROPOFF
GRID_PC_URBANOFF_vanGen_CAMAON_BGCON_CROPOFF GRID LULC_IGBP_PC URBANOFF vanGenu CaMaON BGCON CROPOFF
GRID_PC_URBANOFF_vanGen_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP_PC URBANOFF vanGenu CaMaOFF BGCON CROPOFF
GRID_PC_URBANON_CAMBELL_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP_PC URBANON Campbell CaMaON BGCOFF CROPOFF
GRID_PC_URBANON_CAMBELL_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP_PC URBANON Campbell CaMaOFF BGCOFF CROPOFF
GRID_PC_URBANON_vanGen_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP_PC URBANON vanGenu CaMaON BGCOFF CROPOFF
GRID_PC_URBANON_vanGen_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP_PC URBANON vanGenu CaMaOFF BGCOFF CROPOFF
GRID_PC_URBANOFF_CAMBELL_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP_PC URBANOFF Campbell CaMaON BGCOFF CROPOFF
GRID_PC_URBANOFF_CAMBELL_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP_PC URBANOFF Campbell CaMaOFF BGCOFF CROPOFF
GRID_PC_URBANOFF_vanGen_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP_PC URBANOFF vanGenu CaMaON BGCOFF CROPOFF
GRID_PC_URBANOFF_vanGen_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP_PC URBANOFF vanGenu CaMaOFF BGCOFF CROPOFF
GRID_IGBP_URBANON_CAMBELL_CAMAON_BGCON_CROPOFF GRID LULC_IGBP URBANON Campbell CaMaON BGCON CROPOFF
GRID_IGBP_URBANON_CAMBELL_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP URBANON Campbell CaMaOFF BGCON CROPOFF
GRID_IGBP_URBANON_vanGen_CAMAON_BGCON_CROPOFF GRID LULC_IGBP URBANON vanGenu CaMaON BGCON CROPOFF
GRID_IGBP_URBANON_vanGen_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP URBANON vanGenu CaMaOFF BGCON CROPOFF
GRID_IGBP_URBANOFF_CAMBELL_CAMAON_BGCON_CROPOFF GRID LULC_IGBP URBANOFF Campbell CaMaON BGCON CROPOFF
GRID_IGBP_URBANOFF_CAMBELL_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP URBANOFF Campbell CaMaOFF BGCON CROPOFF
GRID_IGBP_URBANOFF_vanGen_CAMAON_BGCON_CROPOFF GRID LULC_IGBP URBANOFF vanGenu CaMaON BGCON CROPOFF
GRID_IGBP_URBANOFF_vanGen_CAMAOFF_BGCON_CROPOFF GRID LULC_IGBP URBANOFF vanGenu CaMaOFF BGCON CROPOFF
GRID_IGBP_URBANON_CAMBELL_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP URBANON Campbell CaMaON BGCOFF CROPOFF
GRID_IGBP_URBANON_CAMBELL_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP URBANON Campbell CaMaOFF BGCOFF CROPOFF
GRID_IGBP_URBANON_vanGen_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP URBANON vanGenu CaMaON BGCOFF CROPOFF
GRID_IGBP_URBANON_vanGen_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP URBANON vanGenu CaMaOFF BGCOFF CROPOFF
GRID_IGBP_URBANOFF_CAMBELL_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP URBANOFF Campbell CaMaON BGCOFF CROPOFF
GRID_IGBP_URBANOFF_CAMBELL_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP URBANOFF Campbell CaMaOFF BGCOFF CROPOFF
GRID_IGBP_URBANOFF_vanGen_CAMAON_BGCOFF_CROPOFF GRID LULC_IGBP URBANOFF vanGenu CaMaON BGCOFF CROPOFF
GRID_IGBP_URBANOFF_vanGen_CAMAOFF_BGCOFF_CROPOFF GRID LULC_IGBP URBANOFF vanGenu CaMaOFF BGCOFF CROPOFF
GRID_USGS_URBANON_CAMBELL_CAMAON_BGCON_CROPOFF GRID LULC_USGS URBANON Campbell CaMaON BGCON CROPOFF
GRID_USGS_URBANON_CAMBELL_CAMAOFF_BGCON_CROPOFF GRID LULC_USGS URBANON Campbell CaMaOFF BGCON CROPOFF
GRID_USGS_URBANON_vanGen_CAMAON_BGCON_CROPOFF GRID LULC_USGS URBANON vanGenu CaMaON BGCON CROPOFF
GRID_USGS_URBANON_vanGen_CAMAOFF_BGCON_CROPOFF GRID LULC_USGS URBANON vanGenu CaMaOFF BGCON CROPOFF
GRID_USGS_URBANOFF_CAMBELL_CAMAON_BGCON_CROPOFF GRID LULC_USGS URBANOFF Campbell CaMaON BGCON CROPOFF
GRID_USGS_URBANOFF_CAMBELL_CAMAOFF_BGCON_CROPOFF GRID LULC_USGS URBANOFF Campbell CaMaOFF BGCON CROPOFF
GRID_USGS_URBANOFF_vanGen_CAMAON_BGCON_CROPOFF GRID LULC_USGS URBANOFF vanGenu CaMaON BGCON CROPOFF
GRID_USGS_URBANOFF_vanGen_CAMAOFF_BGCON_CROPOFF GRID LULC_USGS URBANOFF vanGenu CaMaOFF BGCON CROPOFF
GRID_USGS_URBANON_CAMBELL_CAMAON_BGCOFF_CROPOFF GRID LULC_USGS URBANON Campbell CaMaON BGCOFF CROPOFF
GRID_USGS_URBANON_CAMBELL_CAMAOFF_BGCOFF_CROPOFF GRID LULC_USGS URBANON Campbell CaMaOFF BGCOFF CROPOFF
GRID_USGS_URBANON_vanGen_CAMAON_BGCOFF_CROPOFF GRID LULC_USGS URBANON vanGenu CaMaON BGCOFF CROPOFF
GRID_USGS_URBANON_vanGen_CAMAOFF_BGCOFF_CROPOFF GRID LULC_USGS URBANON vanGenu CaMaOFF BGCOFF CROPOFF
GRID_USGS_URBANOFF_CAMBELL_CAMAON_BGCOFF_CROPOFF GRID LULC_USGS URBANOFF Campbell CaMaON BGCOFF CROPOFF
GRID_USGS_URBANOFF_CAMBELL_CAMAOFF_BGCOFF_CROPOFF GRID LULC_USGS URBANOFF Campbell CaMaOFF BGCOFF CROPOFF
GRID_USGS_URBANOFF_vanGen_CAMAON_BGCOFF_CROPOFF GRID LULC_USGS URBANOFF vanGenu CaMaON BGCOFF CROPOFF
GRID_USGS_URBANOFF_vanGen_CAMAOFF_BGCOFF_CROPOFF GRID LULC_USGS URBANOFF vanGenu CaMaOFF BGCOFF CROPOFF
87 changes: 87 additions & 0 deletions .github/workflows/build_CoLM_gnu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: Build_CoLM202X_gnu
on:
pull_request:
branches:
- master
paths-ignore:
- 'postprocess/**'
- 'preprocess/**'
- 'run/**'
- 'README.md'
- '.gitignore'
- '**/**.sh'
push:
branches:
- master

workflow_dispatch:

jobs:
Build-CoLM-gnu:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, ubuntu-20.04]
mpi: ['mpich', 'openmpi', 'intelmpi']
toolchain:
- {compiler: gcc, version: 13}
- {compiler: gcc, version: 12}
- {compiler: gcc, version: 11}
- {compiler: gcc, version: 10}
- {compiler: gcc, version: 9}
# include:
# - os: ubuntu-latest
# toolchain: {compiler: gcc, version: 12}
exclude:
- os: ubuntu-20.04
toolchain: {compiler: gcc, version: 12}
- os: ubuntu-latest
toolchain: {compiler: gcc, version: 9}

steps:
- uses: actions/checkout@v4
- uses: mpi4py/setup-mpi@v1
with:
mpi: ${{ matrix.mpi }}
- uses: fortran-lang/setup-fortran@v1
id: setup-fortran
with:
compiler: ${{ matrix.toolchain.compiler }}
version: ${{ matrix.toolchain.version }}
- name: Install netcdf-fortran library
shell: bash -l {0}
run: sudo apt update && sudo apt install -y netcdf-bin libnetcdf-dev libnetcdff-dev
- name: Test mpi
#run: mpif90 -v
run: which mpif90
#- name: Test netcdf
# run: nc-config --all
- name: Build CoLM202X
# run: make clean && make all
run: |
cd ${{ github.workspace }}
TestList=./.github/workflows/TestCaseLists
for CaseName in `awk '{print $1}' $TestList`
do
echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
echo "Create test cases"
echo $CaseName
echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
echo defineh `cat $TestList |grep $CaseName |awk '{print $2,$3,$4,$5,$6,$7,$8}'`
./.github/workflows/create_defineh.bash `cat $TestList |grep $CaseName |awk '{print $2,$3,$4,$5,$6,$7,$8}'`

echo "Create test case $CaseName Complete!"
cat ./include/define.h

echo "...................................................................."
echo "Start Compilation $CaseName"
echo "...................................................................."

make clean && make all
done

echo "----------------------------------------------------------------------"
echo "All test cases are compiled successfully! "
echo "----------------------------------------------------------------------"
200 changes: 200 additions & 0 deletions .github/workflows/create_defineh.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
#!/bin/bash
#./create_defineh.bash GRID LULC_IGBP_PFT URBANON CaMaON BGCON
echo $1 $2 $3 $4 $5 $6 $7

if [ $1 = "GRID" ];then
GRIDBASE="#define GRIDBASED"
CATCHMENT="#undef CATCHMENT"
UNSTRUCTU="#undef UNSTRUCTURED"
SINGLEPOI="#undef SinglePoint"
else
if [ $1 = "CATCHMENT" ];then
GRIDBASE="#undef GRIDBASED"
CATCHMENT="#define CATCHMENT"
UNSTRUCTU="#undef UNSTRUCTURED"
SINGLEPOI="#undef SinglePoint"
else
if [ $1 = "UNSTRUCTURED" ];then
GRIDBASE="#undef GRIDBASED"
CATCHMENT="#undef CATCHMENT"
UNSTRUCTU="#define UNSTRUCTURED"
SINGLEPOI="#undef SinglePoint"
else
if [ $1 = "SinglePoint" ];then
GRIDBASE="#undef GRIDBASED"
CATCHMENT="#undef CATCHMENT"
UNSTRUCTU="#undef UNSTRUCTURED"
SINGLEPOI="#define SinglePoint"
else
echo "Error in argument 1, try (GRID, CATCHMENT, UNSTRUCTURED, SinglePoint)"
exit
fi
fi
fi
fi
#echo $GRIDBASE
#echo $CATCHMENT
#echo $UNSTRUCTU
#echo $SINGLEPOI
if [ $2 = "LULC_USGS" ];then
LULC_USGS="#define LULC_USGS"
LULC_IGBP="#undef LULC_IGBP"
LULC_IGBP_PFT="#undef LULC_IGBP_PFT"
LULC_IGBP_PC="#undef LULC_IGBP_PC"
else
if [ $2 = "LULC_IGBP" ];then
LULC_USGS="#undef LULC_USGS"
LULC_IGBP="#define LULC_IGBP"
LULC_IGBP_PFT="#undef LULC_IGBP_PFT"
LULC_IGBP_PC="#undef LULC_IGBP_PC"
else
if [ $2 = "LULC_IGBP_PFT" ];then
LULC_USGS="#undef LULC_USGS"
LULC_IGBP="#undef LULC_IGBP"
LULC_IGBP_PFT="#define LULC_IGBP_PFT"
LULC_IGBP_PC="#undef LULC_IGBP_PC"
else
if [ $2 = "LULC_IGBP_PC" ];then
LULC_USGS="#undef LULC_USGS"
LULC_IGBP="#undef LULC_IGBP"
LULC_IGBP_PFT="#undef LULC_IGBP_PFT"
LULC_IGBP_PC="#define LULC_IGBP_PC"
else
echo "Error in argument 2, try (LULC_USGS, LULC_IGBP, LULC_IGBP_PFT, LULC_IGBP_PC)"
exit
fi
fi
fi
fi

#echo $LULC_USGS
#echo $LULC_IGBP
#echo $LULC_IGBP_PFT
#echo $LULC_IGBP_PC

if [ $3 = "URBANON" ];then
URBAN="#define URBAN_MODEL"
else
if [ $3 = "URBANOFF" ];then
URBAN="#undef URBAN_MODEL"
else
echo "Error in argument 3, try (URBANON, URBANOFF)"
exit
fi
fi
#echo $URBAN

if [ $4 = "Campbell" ];then
CAMPBELL="#define Campbell_SOIL_MODEL"
VENGENU="#undef vanGenuchten_Mualem_SOIL_MODEL"
else
if [ $4 = "vanGenu" ];then
CAMPBELL="#undef Campbell_SOIL_MODEL"
VENGENU="#define vanGenuchten_Mualem_SOIL_MODEL"
else
echo "Error in argument 4, try (Campbell, vanGenu)"
exit
fi
fi

#echo $CAMPBELL
#echo $VENGENU

if [ $5 = "CaMaON" ];then
CaMa="#define CaMa_Flood"
else
if [ $5 = "CaMaOFF" ];then
CaMa="#undef CaMa_Flood"
else
echo "Error in argument 5, try (CaMaON, CaMaOFF)"
exit
fi
fi
#echo $CaMa

if [ $6 = "BGCON" ];then
BGC="#define BGC"
else
if [ $6 = "BGCOFF" ];then
BGC="#undef BGC"
else
echo "Error in argument 6, try (BGCON, BGCOFF)"
exit
fi
fi
#echo $BGC

if [ $7 = "CROPON" ];then
CROP="#define CROP"
else
if [ $7 = "CROPOFF" ];then
CROP="#undef CROP"
else
echo "Error in argument 7, try (CROPON, CROPOFF)"
fi
fi

cat>include/define.h<<EOF
! 1. Spatial structure:
! Select one of the following options.
$GRIDBASE
$CATCHMENT
$UNSTRUCTU
$SINGLEPOI
! 2. Land TYPE classification :
! Select one of the following options.
$LULC_USGS
$LULC_IGBP
$LULC_IGBP_PFT
$LULC_IGBP_PC
! 2.1 Urban model setting (put it temporarily here):
$URBAN
#undef URBAN_LCZ
! 3. If defined, debug information is output.
#define CoLMDEBUG
! 3.1 If defined, range of variables is checked.
#define RangeCheck
! 3.2 If defined, surface data in vector is mapped to gridded data for checking.
#undef SrfdataDiag
! 4. If defined, MPI parallelization is enabled.
#define USEMPI
! Conflict: not used when defined SingPoint.
#if (defined SinglePoint)
#undef USEMPI
#endif
! 5. Hydrological process options.
! 5.1 Two soil hydraulic models can be used.
$CAMPBELL
$VENGENU
! 5.2 If defined, lateral flow is modeled.
#define LATERAL_FLOW
! Conflicts :
#ifndef CATCHMENT
#undef LATERAL_FLOW
#endif
! 6. If defined, CaMa-Flood model will be used.
$CaMa
! 7. If defined, BGC model is used.
$BGC
! Conflicts : only used when LULC_IGBP_PFT is defined.
#ifndef LULC_IGBP_PFT
#undef BGC
#endif
! 7.1 If defined, CROP model is used
$CROP
! Conflicts : only used when BGC is defined
#ifndef BGC
#undef CROP
#endif
! 8. If defined, open Land use and land cover change mode.
#undef LULCC
EOF
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ run/log_CaMa.txt
__pycache__
*.o
*.mod
.vscode
.bld
2 changes: 1 addition & 1 deletion CaMa/src/MOD_CaMa_Vars.F90
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ SUBROUTINE hist_out_cama (file_hist, itime_in_file)
D2RIVVEL_AVG, D2GDWRTN_AVG, D2RUNOFF_AVG, D2ROFSUB_AVG, &
D2OUTFLW_MAX, D2STORGE_MAX, D2RIVDPH_MAX, &
d2daminf_avg,D2WEVAPEX_AVG,D2WINFILTEX_AVG,D2LEVDPH !!! added
USE MOD_Vars_2DFluxes
! USE MOD_Vars_2DFluxes

IMPLICIT NONE

Expand Down
Loading

0 comments on commit b6a431d

Please sign in to comment.