From 38fedb565f643e2905c386a1f7c0002abd1937ed Mon Sep 17 00:00:00 2001 From: kvrigor Date: Tue, 18 Aug 2026 13:59:58 +0200 Subject: [PATCH 1/3] Special eCLM branch for soil moisture investigations --- src/TSMP2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TSMP2 b/src/TSMP2 index f0d9a21..e06bfab 160000 --- a/src/TSMP2 +++ b/src/TSMP2 @@ -1 +1 @@ -Subproject commit f0d9a21f23e147aca452f282dbbb66707b7ee42f +Subproject commit e06bfab56e2e92bfff9c4ae2fc969c107a83325f From 012cbc029dba31661d3f0a8dd96c14307a14c609 Mon Sep 17 00:00:00 2001 From: kvrigor Date: Tue, 18 Aug 2026 14:08:28 +0200 Subject: [PATCH 2/3] Use TSMP2 'dev-eclm-parflow-sm' branch --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index fb97e80..44e33be 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,7 +17,7 @@ [submodule "src/TSMP2"] path = src/TSMP2 url = https://github.com/HPSCTerrSys/TSMP2.git - branch = master + branch = dev-eclm-parflow-sm [submodule "dta/geo/icon"] path = dta/geo/icon url = https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/tsmp2-static-files/extpar_icon_cordex-eur-11u.git From 4392c9c4ca2376fd1f2fec7d5add77987a8e72ef Mon Sep 17 00:00:00 2001 From: kvrigor Date: Wed, 19 Aug 2026 16:11:43 +0200 Subject: [PATCH 3/3] Copied Stefan's ctl/* changes From /p/scratch/cslts/poll1/sim/testcases/wfe_eur-11_revsetup_eclm-pfl_lu --- ctl/expid.conf | 8 ++++++-- ctl/master.conf | 24 ++++++++++++------------ ctl/sim_ctl/sim_config.sh | 11 ++++++----- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/ctl/expid.conf b/ctl/expid.conf index d508320..bf2b26b 100644 --- a/ctl/expid.conf +++ b/ctl/expid.conf @@ -15,6 +15,7 @@ [sim_config_icon] icon_numioprocs=3 +icon_mapfile_lbc=map_file.lbc fname_dwdFG=dwdFG_R13B05_DOM01.nc fname_icondomain=europe011_DOM01.nc fname_iconextpar=external_parameter_icon_europe011_DOM01_tiles.nc @@ -23,14 +24,17 @@ fname_iconghgforc=bc_greenhouse_rcp45_1765-2500.nc [sim_config_clm] domainfile_clm=domain.lnd.ICON-11_ICON-11.230302_landlake_halo.nc surffile_clm=surfdata_ICON-11_hist_16pfts_Irrig_CMIP6_simyr2000_c230302_gcvurb-pfsoil_halo.nc -clmoutvar='TWS','H2OSOI','TSOI','TG','EFLX_LH_TOT','FSH','FSA','FSR','FIRA','Rnet','EFLX_SOIL_GRND' +clmoutvar='TWS','H2OSOI','TSOI','TG','EFLX_LH_TOT','FSA','FSR','FIRA','Rnet','EFLX_SOIL_GRND','FCTR','FCEV','FGEV','FSH','FSH_V','FSH_G','FGR','FSM','TSA','TV','Q2M','QFLX_RAIN_GRND','QFLX_SNOW_GRND','QFLX_EVAP_TOT','SOILLIQ','SOILICE','QIRRIG','QINFL','QPARFLOW' +clmoutfrq=-1 +clmoutmfilt=24 [sim_config_parflow] pfl_ngx=444 pfl_ngy=432 pfl_mask=PfbMask4SolidFile_eCLM.pfsol +pfloutfrq=1.0 pfloutmfilt=24 -pfltsfilerst=$((pfloutmfilt - 1)) +pfltsfilerst=0 [sim_config_oas] icon_ncg=189976 diff --git a/ctl/master.conf b/ctl/master.conf index b545b93..f1c992b 100644 --- a/ctl/master.conf +++ b/ctl/master.conf @@ -3,9 +3,9 @@ ###### # main settings -MODEL_ID=ICON-eCLM-ParFlow #ParFlow #ICON-eCLM #ICON-eCLM-ParFlow #ICON +MODEL_ID=eCLM-ParFlow #ParFlow #ICON-eCLM #ICON-eCLM-ParFlow #ICON EXP_ID="eur-12-iic" #"eur-11u" -CASE_ID="" # identifier for cases +CASE_ID="" #"VG" # identifier for cases conf_file="" # configure file for cases, also possible ${EXP_ID}.conf # main switches (PREprocessing, SIMulations, POSt-processing, VISualisation) @@ -17,9 +17,9 @@ lvis=( false false false ) # config, run, cleanup # time information cpltsp_atmsfc=900 # coupling time step, atm-sfc, eCLM timestep [sec] cpltsp_sfcss=900 # coupling time step, sfc-ss, ParFlow timestep [sec] -simlength="1 day" #"23 hours" -startdate="2017-07-01T00:00Z" # ISO norm 8601 -inidate=${startdate} # ISO norm 8601, fix for entire simulation +simlength="1 month" #"6 days" #"1 month" #"23 hours" +startdate="2018-07-01T00:00Z" # ISO norm 8601 +inidate="2018-07-01T00:00Z" #${startdate} # ISO norm 8601, fix for entire simulation numsimstep=1 # number of simulation steps, simulation period = numsimstep * simlength # mail notification for slurm jobs @@ -30,26 +30,26 @@ mailaddress="" prevjobid="" # previous job-id, default leave empty npnode="" # number of cores per node partition="" # compute partition -account="" # SET compute account. $BUDGET_ACCOUNTS / slts is used, if not set. +account="slts" # SET compute account. $BUDGET_ACCOUNTS / slts is used, if not set. # wallclock pre_wallclock=00:35:00 -sim_wallclock=00:25:00 # needs to be format hh:mm:ss +sim_wallclock=00:35:00 #00:19:00 # needs to be format hh:mm:ss pos_wallclock=00:05:00 vis_wallclock=00:05:00 # file/directory pathes tsmp2_dir=$TSMP2_DIR -tsmp2_install_dir="" # leave empty to use default +tsmp2_install_dir="" tsmp2_env="" # leave empty to use default # number of nodes per component (_node will be set to zero, if not indicated in MODEL_ID) -ico_node=3 -clm_node=1 -pfl_node=2 +ico_node=6 +clm_node=2 +pfl_node=4 # DebugMode: No job submission. Just config -debugmode=false +debugmode=true #true # log job status joblog=true diff --git a/ctl/sim_ctl/sim_config.sh b/ctl/sim_ctl/sim_config.sh index b87cc84..9b9052e 100755 --- a/ctl/sim_ctl/sim_config.sh +++ b/ctl/sim_ctl/sim_config.sh @@ -222,11 +222,11 @@ if [[ "${modelid}" == *parflow* ]]; then pfloutfrq=${pfloutfrq:-1.0} pfloutmfilt=${pfloutmfilt:-1} pfltsfilerst=${pfltsfilerst:-0} - pfllevaptrans=${pfllevaptrans:-false} # copy namelist [[ "$lreal" == "true" ]] && cp ${nml_dir}/parflow/ascii2pfb_slopes.tcl ascii2pfb_slopes.tcl [[ "$lreal" == "true" ]] && cp ${nml_dir}/parflow/ascii2pfb_SoilInd.tcl ascii2pfb_SoilInd.tcl + [[ "$lreal" == "true" ]] && cp ${nml_dir}/parflow/ascii2pfb_Porosity.tcl ascii2pfb_Porosity.tcl cp ${nml_dir}/parflow/coup_oas.tcl coup_oas.tcl ln -s ${fini_pfl} . @@ -235,10 +235,8 @@ if [[ "${modelid}" == *parflow* ]]; then [[ "$lreal" == "true" ]] && cp ${geo_dir}/parflow/static/${pfl_mask} ${pfl_mask} # copy evaptrans file - if [[ "${run_oasis}" == "false" ]] && [[ "${pfllevaptrans}" == "true" ]]; then - cp ${frc_dir}/parflow/evaptrans/evaptrans_$(date -u -d "${startdate}" +%Y%m).nc evaptrans.nc - sed -i "s#__UseEvapTrans__#True#" coup_oas.tcl - fi # if evaptrans + [[ "${run_oasis}" == "false" ]] && cp ${frc_dir}/parflow/evaptrans/evaptrans.nc evaptrans.nc + [[ "${run_oasis}" == "false" ]] && sed -i "s#__UseEvapTrans__#True#" coup_oas.tcl [[ "${run_oasis}" == "true" ]] && sed -i "s#__UseEvapTrans__#False#" coup_oas.tcl # PFL NML @@ -246,6 +244,8 @@ if [[ "${modelid}" == *parflow* ]]; then [[ "$lreal" == "true" ]] && sed -i "s/__nprocy_pfl_bldsva__/$pfl_procY/" ascii2pfb_slopes.tcl [[ "$lreal" == "true" ]] && sed -i "s/__nprocx_pfl_bldsva__/$pfl_procX/" ascii2pfb_SoilInd.tcl [[ "$lreal" == "true" ]] && sed -i "s/__nprocy_pfl_bldsva__/$pfl_procY/" ascii2pfb_SoilInd.tcl + [[ "$lreal" == "true" ]] && sed -i "s/__nprocx_pfl_bldsva__/$pfl_procX/" ascii2pfb_Porosity.tcl + [[ "$lreal" == "true" ]] && sed -i "s/__nprocy_pfl_bldsva__/$pfl_procY/" ascii2pfb_Porosity.tcl sed -i "s/__nprocx_pfl_bldsva__/$pfl_procX/" coup_oas.tcl sed -i "s/__nprocy_pfl_bldsva__/$pfl_procY/" coup_oas.tcl sed -i "s/__ngpflx_bldsva__/$pfl_ngx/" coup_oas.tcl @@ -265,6 +265,7 @@ if [[ "${modelid}" == *parflow* ]]; then export PARFLOW_DIR=${tsmp2_install_dir} [[ "$lreal" == "true" ]] && tclsh ascii2pfb_slopes.tcl [[ "$lreal" == "true" ]] && tclsh ascii2pfb_SoilInd.tcl + [[ "$lreal" == "true" ]] && tclsh ascii2pfb_Porosity.tcl fi # if modelid == parflow