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

Jump to bottom

fix aero forcing for HIST in echam.yaml #1152

Open
wants to merge 4 commits into
base: release
Choose a base branch
from
Open

fix aero forcing for HIST in echam.yaml #1152

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52274c8
smoe clean up
ackerlar Mar 27, 2024
60a26ee
cleanup pism comp yaml
ackerlar Mar 28, 2024
fbba085
fix aerosol path in echam.yaml for years after 1864
ackerlar Mar 28, 2024
2495f3a
some clean up
ackerlar Apr 18, 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
18 changes: 6 additions & 12 deletions configs/components/echam/echam.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,20 +411,14 @@ choose_scenario:
dataset: r0008
greenhouse_dir: "${input_dir}"
forcing_files:
# aerocoarse: piaerocoarse
# aerofarir: piaerofarir
# aerofin: histaerofin
#aerocoarse: histaerocoarse
#aerofarir: histaerofarir
#aerofin: histaerofin
Comment on lines +414 to +416
Copy link
Contributor

Choose a reason for hiding this comment

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

Can these lines be removed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, these lines can be removed

aerocoarse: piaerocoarse
aerofarir: piaerofarir
aerofin: piaerofin
sst: amipsst
sic: amipsic
aerocoarse_1849: piaerocoarse
aerocoarse_1850: piaerocoarse
aerocoarse_1851: piaerocoarse
aerofarir_1849: piaerofarir
aerofarir_1850: piaerofarir
aerofarir_1851: piaerofarir
aerofin_1849: piaerofin
aerofin_1850: piaerofin
aerofin_1851: piaerofin
ozone: ozone_hist_scenario
greenhouse: greenhouse_hist_scenario
volcir: histvolcir
Expand Down
8 changes: 4 additions & 4 deletions configs/components/pism/pism.compiletime_env_changes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ choose_computer.name:
levante:
environment_changes:
add_export_vars:
- "UDUNITS2_ROOT=/sw/spack-levante/udunits-2.2.28-da6pla/ #/sw/rhel6-x64/util/udunits-2.2.26-gcc64"
- "FFTW_ROOT=/sw/spack-levante/fftw-3.3.10-lnogal/ #/sw/rhel6-x64/numerics/fftw-3.3.7-openmp-gcc64"
- "PROJ_ROOT=/sw/spack-levante/proj-5.2.0-w7auht/ #/sw/rhel6-x64/graphics/proj4-4.9.3-gcc48"
- "PETSC_DIR=/sw/spack-levante/petsc-3.16.2-oorrxp/ #/sw/rhel6-x64/numerics/PETSc-3.12.2-impi2018-intel18/"
- "UDUNITS2_ROOT=/sw/spack-levante/udunits-2.2.28-da6pla/" #/sw/rhel6-x64/util/udunits-2.2.26-gcc64"
- "FFTW_ROOT=/sw/spack-levante/fftw-3.3.10-lnogal/" #/sw/rhel6-x64/numerics/fftw-3.3.7-openmp-gcc64"
- "PROJ_ROOT=/sw/spack-levante/proj-5.2.0-w7auht/" #/sw/rhel6-x64/graphics/proj4-4.9.3-gcc48"
- "PETSC_DIR=/sw/spack-levante/petsc-3.16.2-oorrxp/" #/sw/rhel6-x64/numerics/PETSc-3.12.2-impi2018-intel18/"
- "HDF5_ROOT=$HDF5ROOT"
- "LD_LIBRARY_PATH=/sw/spack-levante/gsl-2.7-5ou4yk/lib:$LD_LIBRARY_PATH"
#- "UDUNITS2_ROOT=/home/a/a270124/model_codes/dependencies/udunits-2.2.28-6havf7"
Expand Down
32 changes: 0 additions & 32 deletions couplings/fesom/coupling_ice2fesom.functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,41 +230,9 @@ function iterative_coupling_pism_ocean_prepare_ocean_icebergmodel_forcing {
cdo -s -timmean -selname,tendency_of_ice_amount_due_to_discharge \
-setgrid,${COUPLE_DIR}/ice.griddes ${pism_discharge_file} ${COUPLE_DIR}/latest_discharge.nc

#module unload python
#if [ "$MACHINE" == "ollie" ]; then
# module load python3/3.7.7_intel2020u2
#elif [ "$MACHINE" == "mistral" ]; then
# module load anaconda3/bleeding_edge
#fi
#if [ -f ${COUPLE_DIR}/num_non_melted_icb_file ]; then
# rm ${COUPLE_DIR}/num_non_melted_icb_file
#fi

#if [[ "xMESH_ROTATED_fesom"=="x1" ]]; then
# if [[ ! -f ${COUPLE_DIR}/nod2d.out.rot ]]; then
# python ${FUNCTION_PATH}/../utils/rotate_mesh.py ${MESH_DIR_fesom} ${COUPLE_DIR}
# cp ${MESH_DIR_fesom}/elem2d.out ${COUPLE_DIR}/elem2d.out
# fi
# python ${FUNCTION_PATH}/../utils/icb_apply_distribution.py ${COUPLE_DIR}/latest_discharge.nc ${COUPLE_DIR} ${COUPLE_DIR} ${BASIN_FILE}
#else
# python ${FUNCTION_PATH}/../utils/icb_apply_distribution.py ${COUPLE_DIR}/latest_discharge.nc ${MESH_DIR_fesom} ${COUPLE_DIR} ${BASIN_FILE}
#fi

#echo; echo " * Finished iceberg generation"
#if [ -f ${COUPLE_DIR}/../restart/fesom/iceberg.restart.ISM ]; then
# wc -l ${COUPLE_DIR}/../restart/fesom/iceberg.restart.ISM | awk '{ print $1 }' > ${COUPLE_DIR}/num_non_melted_icb_file
#fi
use_icesheet_coupling=1
}

#function get_ib_num_after_ice_sheet_coupling {
# _a="$( wc -l icb/LON.dat | awk '{ print $1 }' )"
# _b="$( cat ../icb/num_non_melted_icb_file )"
#
# ib_num=$(( $_a + $_b ))
# general_replace_namelist_value namelist.config icebergs ib_num $ib_num
# general_replace_namelist_value namelist.config icebergs use_icesheet_coupling ".true."
#}
############################################################################
############################################################################

Expand Down
2 changes: 1 addition & 1 deletion couplings/fesom/env_fesom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def prepare_environment(config):
"EXP_ID": config["general"]["command_line_config"]["expid"],
"iter_coup_regrid_method_ice2oce": "INTERPOLATE",
"fesom_use_icebergs": config["fesom"].get("use_icebergs", ""),
"BASIN_FILE": config["fesom"].get("basin_file"),
#"BASIN_FILE": config["fesom"].get("basin_file"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Can this line be removed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, this line can be removed. I made some more clean up

"MACHINE": config["computer"]["name"],
"ICEBERG_DIR": config["fesom"].get("iceberg_dir", ""),

Expand Down
4 changes: 2 additions & 2 deletions couplings/pism/coupling_pism2atmosphere.functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ function pism_atmosphere_get_newest_output {

# Define list of variables selected from PISM output depending on whether icebergs are used or not
if [ "x${fesom_use_iceberg}" == "x1" ]; then
echo "LA DEBUG: 1"
echo " * use iceberg coupling and exclude iceberg discharge from mass balance"
CDO_SELECT_VAR_LIST="thk,climatic_mass_balance,topg,${OROG_VARNAME_pism},${GLACIAL_MASK_VARNAME_pism},tendency_of_ice_amount,tendency_of_ice_amount_due_to_conservation_error,tendency_of_ice_amount_due_to_surface_mass_flux,tendency_of_ice_amount_due_to_basal_mass_flux,tendency_of_ice_amount_due_to_discharge,tendency_of_ice_amount_due_to_flow"
else
echo "LA DEBUG: 2"
echo " * no iceberg coupling"
CDO_SELECT_VAR_LIST="thk,climatic_mass_balance,topg,${OROG_VARNAME_pism},${GLACIAL_MASK_VARNAME_pism},tendency_of_ice_amount"
fi

Expand Down
Loading