New URL for NEMO forge!
http://forge.nemo-ocean.eu
Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 14072 – NEMO
Search:
Login
Preferences
Help/Guide
About Trac
Forgot your password?
Wiki
Timeline
Roadmap
Browse Source
View Tickets
Search
Tags
Discussion
Versions
Context Navigation
←
Previous Changeset
Next Changeset
→
Changeset 14072
Timestamp:
2020-12-04T08:48:38+01:00 (
4 years
ago)
Author:
laurent
Message:
Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket
#2369
Location:
NEMO/trunk
Files:
15 deleted
140 edited
32 copied
.
(modified)
(
view diffs
)
cfgs
(modified)
(
view diffs
)
cfgs/SHARED
(modified)
(
view diffs
)
cfgs/SHARED/axis_def_nemo.xml
(modified)
(
view diffs
)
cfgs/SHARED/domain_def_nemo.xml
(modified)
(
view diffs
)
cfgs/SHARED/field_def_nemo-ice.xml
(modified)
(
view diffs
)
cfgs/SHARED/field_def_nemo-innerttrc.xml
(modified)
(
view diffs
)
cfgs/SHARED/field_def_nemo-oce.xml
(modified)
(
view diffs
)
cfgs/SHARED/field_def_nemo-pisces.xml
(modified)
(
view diffs
)
cfgs/SHARED/grid_def_nemo.xml
(modified)
(
view diffs
)
cfgs/SHARED/namelist_ref
(modified)
(
view diffs
)
cfgs/ref_cfgs.txt
(modified)
(
view diffs
)
doc
(modified)
(
view diffs
)
src
(modified)
(
view diffs
)
src/ABL/ablmod.F90
(modified)
(
view diffs
)
src/ABL/sbcabl.F90
(modified)
(
view diffs
)
src/ICE/ice.F90
(modified)
(
view diffs
)
src/ICE/icectl.F90
(modified)
(
view diffs
)
src/ICE/icedia.F90
(modified)
(
view diffs
)
src/ICE/icedyn.F90
(modified)
(
view diffs
)
src/ICE/icedyn_adv_pra.F90
(modified)
(
view diffs
)
src/ICE/icedyn_adv_umx.F90
(modified)
(
view diffs
)
src/ICE/icedyn_rdgrft.F90
(modified)
(
view diffs
)
src/ICE/icedyn_rhg.F90
(modified)
(
view diffs
)
src/ICE/icedyn_rhg_eap.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/ICE/icedyn_rhg_eap.F90
)
(
view diffs
)
src/ICE/icedyn_rhg_evp.F90
(modified)
(
view diffs
)
src/ICE/icedyn_rhg_vp.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/ICE/icedyn_rhg_vp.F90
)
(
view diffs
)
src/ICE/iceistate.F90
(modified)
(
view diffs
)
src/ICE/iceitd.F90
(modified)
(
view diffs
)
src/ICE/icerst.F90
(modified)
(
view diffs
)
src/ICE/icesbc.F90
(modified)
(
view diffs
)
src/ICE/icestp.F90
(modified)
(
view diffs
)
src/ICE/icetab.F90
(modified)
(
view diffs
)
src/ICE/icethd.F90
(modified)
(
view diffs
)
src/ICE/icethd_dh.F90
(modified)
(
view diffs
)
src/ICE/icethd_pnd.F90
(modified)
(
view diffs
)
src/ICE/icethd_zdf_bl99.F90
(modified)
(
view diffs
)
src/ICE/iceupdate.F90
(modified)
(
view diffs
)
src/ICE/icevar.F90
(modified)
(
view diffs
)
src/ICE/icewri.F90
(modified)
(
view diffs
)
src/OCE/ASM/asminc.F90
(modified)
(
view diffs
)
src/OCE/BDY/bdytra.F90
(modified)
(
view diffs
)
src/OCE/C1D/step_c1d.F90
(modified)
(
view diffs
)
src/OCE/DIA/diaar5.F90
(modified)
(
view diffs
)
src/OCE/DIA/diahsb.F90
(modified)
(
view diffs
)
src/OCE/DIA/diaptr.F90
(modified)
(
view diffs
)
src/OCE/DIU/diu_coolskin.F90
(modified)
(
view diffs
)
src/OCE/DOM/daymod.F90
(modified)
(
view diffs
)
src/OCE/DOM/dom_oce.F90
(modified)
(
view diffs
)
src/OCE/DOM/domain.F90
(modified)
(
view diffs
)
src/OCE/DOM/domutl.F90
(modified)
(
view diffs
)
src/OCE/DOM/domvvl.F90
(modified)
(
view diffs
)
src/OCE/DOM/dtatsd.F90
(modified)
(
view diffs
)
src/OCE/DOM/phycst.F90
(modified)
(
view diffs
)
src/OCE/DYN/dynatf.F90
(modified)
(
view diffs
)
src/OCE/DYN/dynspg.F90
(modified)
(
view diffs
)
src/OCE/DYN/dynvor.F90
(modified)
(
view diffs
)
src/OCE/DYN/dynzad.F90
(modified)
(
view diffs
)
src/OCE/IOM/in_out_manager.F90
(modified)
(
view diffs
)
src/OCE/IOM/iom.F90
(modified)
(
view diffs
)
src/OCE/IOM/iom_def.F90
(modified)
(
view diffs
)
src/OCE/IOM/iom_nf90.F90
(modified)
(
view diffs
)
src/OCE/IOM/prtctl.F90
(modified)
(
view diffs
)
src/OCE/IOM/restart.F90
(modified)
(
view diffs
)
src/OCE/ISF/isfcav.F90
(modified)
(
view diffs
)
src/OCE/ISF/isfcpl.F90
(modified)
(
view diffs
)
src/OCE/ISF/isfrst.F90
(modified)
(
view diffs
)
src/OCE/LBC/lbc_lnk_nc_generic.h90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/LBC/lbc_lnk_nc_generic.h90
)
(
view diffs
)
src/OCE/LBC/lbclnk.F90
(modified)
(
view diffs
)
src/OCE/LBC/lib_mpp.F90
(modified)
(
view diffs
)
src/OCE/LBC/mpp_lnk_generic.h90
(modified)
(
view diffs
)
src/OCE/LBC/mpp_nc_generic.h90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/LBC/mpp_nc_generic.h90
)
(
view diffs
)
src/OCE/LBC/mppini.F90
(modified)
(
view diffs
)
src/OCE/LDF/ldfc1d_c2d.F90
(modified)
(
view diffs
)
src/OCE/LDF/ldftra.F90
(modified)
(
view diffs
)
src/OCE/SBC/cpl_oasis3.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbc_ice.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbc_oce.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbc_phy.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/SBC/sbc_phy.F90
)
(
view diffs
)
src/OCE/SBC/sbcapr.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcblk.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcblk_algo_andreas.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/SBC/sbcblk_algo_andreas.F90
)
(
view diffs
)
src/OCE/SBC/sbcblk_algo_coare3p0.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcblk_algo_coare3p6.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcblk_algo_ecmwf.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcblk_algo_ice_an05.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/SBC/sbcblk_algo_ice_an05.F90
)
(
view diffs
)
src/OCE/SBC/sbcblk_algo_ice_cdn.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/SBC/sbcblk_algo_ice_cdn.F90
)
(
view diffs
)
src/OCE/SBC/sbcblk_algo_ice_lg15.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/SBC/sbcblk_algo_ice_lg15.F90
)
(
view diffs
)
src/OCE/SBC/sbcblk_algo_ice_lu12.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/SBC/sbcblk_algo_ice_lu12.F90
)
(
view diffs
)
src/OCE/SBC/sbcblk_algo_ncar.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcblk_phy.F90
(deleted)
src/OCE/SBC/sbcblk_skin_coare.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcblk_skin_ecmwf.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbccpl.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcflx.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcmod.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcrnf.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcssm.F90
(modified)
(
view diffs
)
src/OCE/SBC/sbcwave.F90
(modified)
(
view diffs
)
src/OCE/TRA/eosbn2.F90
(modified)
(
view diffs
)
src/OCE/TRA/traadv.F90
(modified)
(
view diffs
)
src/OCE/TRA/traadv_cen.F90
(modified)
(
view diffs
)
src/OCE/TRA/traadv_fct.F90
(modified)
(
view diffs
)
src/OCE/TRA/traadv_fct_lf.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/TRA/traadv_fct_lf.F90
)
(
view diffs
)
src/OCE/TRA/traadv_mus.F90
(modified)
(
view diffs
)
src/OCE/TRA/traadv_mus_lf.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/TRA/traadv_mus_lf.F90
)
(
view diffs
)
src/OCE/TRA/traadv_qck.F90
(modified)
(
view diffs
)
src/OCE/TRA/traadv_ubs.F90
(modified)
(
view diffs
)
src/OCE/TRA/traatf.F90
(modified)
(
view diffs
)
src/OCE/TRA/traatf_qco.F90
(modified)
(
view diffs
)
src/OCE/TRA/trabbc.F90
(modified)
(
view diffs
)
src/OCE/TRA/trabbl.F90
(modified)
(
view diffs
)
src/OCE/TRA/tradmp.F90
(modified)
(
view diffs
)
src/OCE/TRA/traisf.F90
(modified)
(
view diffs
)
src/OCE/TRA/traldf.F90
(modified)
(
view diffs
)
src/OCE/TRA/traldf_iso.F90
(modified)
(
view diffs
)
src/OCE/TRA/traldf_lap_blp.F90
(modified)
(
view diffs
)
src/OCE/TRA/traldf_triad.F90
(modified)
(
view diffs
)
src/OCE/TRA/tranpc.F90
(modified)
(
view diffs
)
src/OCE/TRA/traqsr.F90
(modified)
(
view diffs
)
src/OCE/TRA/trasbc.F90
(modified)
(
view diffs
)
src/OCE/TRA/trazdf.F90
(modified)
(
view diffs
)
src/OCE/TRA/zpshde.F90
(modified)
(
view diffs
)
src/OCE/TRD/trdini.F90
(modified)
(
view diffs
)
src/OCE/USR/usrdef_nam.F90
(modified)
(
view diffs
)
src/OCE/ZDF/zdf_oce.F90
(modified)
(
view diffs
)
src/OCE/ZDF/zdfgls.F90
(modified)
(
view diffs
)
src/OCE/ZDF/zdfmfc.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/src/OCE/ZDF/zdfmfc.F90
)
(
view diffs
)
src/OCE/ZDF/zdfosm.F90
(modified)
(
view diffs
)
src/OCE/ZDF/zdfphy.F90
(modified)
(
view diffs
)
src/OCE/ZDF/zdfric.F90
(modified)
(
view diffs
)
src/OCE/ZDF/zdfsh2.F90
(modified)
(
view diffs
)
src/OCE/ZDF/zdftke.F90
(modified)
(
view diffs
)
src/OCE/do_loop_substitute.h90
(modified)
(
view diffs
)
src/OCE/nemogcm.F90
(modified)
(
view diffs
)
src/OCE/par_oce.F90
(modified)
(
view diffs
)
src/OCE/step.F90
(modified)
(
view diffs
)
src/OCE/step_oce.F90
(modified)
(
view diffs
)
src/OCE/timing.F90
(modified)
(
view diffs
)
src/SAS/sbcssm.F90
(modified)
(
view diffs
)
tests
(modified)
(
view diffs
)
tests/C1D_ASICS
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/C1D_ASICS
)
(
view diffs
)
tests/ICE_ADV1D/MY_SRC/usrdef_sbc.F90
(modified)
(
view diffs
)
tests/ICE_AGRIF/MY_SRC/usrdef_sbc.F90
(modified)
(
view diffs
)
tests/ICE_RHEO
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/ICE_RHEO
)
(
view diffs
)
tests/STATION_ASF/EXPREF/ERA5
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/ERA5
)
(
view diffs
)
tests/STATION_ASF/EXPREF/PAPA
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/PAPA
)
(
view diffs
)
tests/STATION_ASF/EXPREF/analyze_output.py
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/analyze_output.py
)
(
view diffs
)
tests/STATION_ASF/EXPREF/context_nemo.xml
(deleted)
tests/STATION_ASF/EXPREF/context_nemo_OCE+ICE.xml
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/context_nemo_OCE+ICE.xml
)
(
view diffs
)
tests/STATION_ASF/EXPREF/context_nemo_OCE.xml
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/context_nemo_OCE.xml
)
(
view diffs
)
tests/STATION_ASF/EXPREF/domain_def_nemo.xml
(deleted)
tests/STATION_ASF/EXPREF/field_def_nemo-oce.xml
(deleted)
tests/STATION_ASF/EXPREF/file_def_nemo-ice.xml
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/file_def_nemo-ice.xml
)
(
view diffs
)
tests/STATION_ASF/EXPREF/file_def_nemo-oce.xml
(modified)
(
view diffs
)
tests/STATION_ASF/EXPREF/grid_def_nemo.xml
(deleted)
tests/STATION_ASF/EXPREF/launch_sasf.sh
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/launch_sasf.sh
)
(
view diffs
)
tests/STATION_ASF/EXPREF/namelist_cfg
(deleted)
tests/STATION_ASF/EXPREF/namelist_coare3p6-noskin_cfg
(deleted)
tests/STATION_ASF/EXPREF/namelist_coare3p6_cfg
(deleted)
tests/STATION_ASF/EXPREF/namelist_ecmwf-noskin_cfg
(deleted)
tests/STATION_ASF/EXPREF/namelist_ecmwf_cfg
(deleted)
tests/STATION_ASF/EXPREF/namelist_ice_cfg
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/namelist_ice_cfg
)
(
view diffs
)
tests/STATION_ASF/EXPREF/namelist_ncar_cfg
(deleted)
tests/STATION_ASF/EXPREF/namelist_ref
(deleted)
tests/STATION_ASF/EXPREF/plot_station_asf.py
(deleted)
tests/STATION_ASF/EXPREF/plot_station_asf_ICE.py
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/plot_station_asf_ICE.py
)
(
view diffs
)
tests/STATION_ASF/EXPREF/plot_station_asf_OCE.py
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/EXPREF/plot_station_asf_OCE.py
)
(
view diffs
)
tests/STATION_ASF/MY_SRC/README.md
(deleted)
tests/STATION_ASF/MY_SRC/diawri.F90
(modified)
(
view diffs
)
tests/STATION_ASF/MY_SRC/icesbc.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/MY_SRC/icesbc.F90
)
(
view diffs
)
tests/STATION_ASF/MY_SRC/icestp.F90
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/MY_SRC/icestp.F90
)
(
view diffs
)
tests/STATION_ASF/MY_SRC/nemogcm.F90
(modified)
(
view diffs
)
tests/STATION_ASF/MY_SRC/sbcssm.F90
(modified)
(
view diffs
)
tests/STATION_ASF/MY_SRC/step_c1d.F90
(modified)
(
view diffs
)
tests/STATION_ASF/MY_SRC/stpctl.F90
(modified)
(
view diffs
)
tests/STATION_ASF/MY_SRC/usrdef_hgr.F90
(modified)
(
view diffs
)
tests/STATION_ASF/MY_SRC/usrdef_nam.F90
(modified)
(
view diffs
)
tests/STATION_ASF/MY_SRC/usrdef_zgr.F90
(modified)
(
view diffs
)
tests/STATION_ASF/README.md
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/README.md
)
(
view diffs
)
tests/STATION_ASF/SANITY_CHECK
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/SANITY_CHECK
)
(
view diffs
)
tests/STATION_ASF/cpp_STATION_ASF.fcm
(modified)
(
view diffs
)
tests/STATION_ASF/input_data/ERA5_NorthGreenland_surface_84N_-36E_1h_y2018.nc
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/input_data/ERA5_NorthGreenland_surface_84N_-36E_1h_y2018.nc
)
(
view diffs
)
tests/STATION_ASF/input_data/ERA5_arctic_surface_81N_36p75E_1h_y2018.nc
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/input_data/ERA5_arctic_surface_81N_36p75E_1h_y2018.nc
)
(
view diffs
)
tests/STATION_ASF/input_data/Station_ERA5_85p5N_54W_ice_hourly_y2018.nc
(deleted)
tests/STATION_ASF/input_data/input_output_VALIDATION_IDEALIZED.nc
(copied)
(copied from
NEMO/branches/2020/dev_r13648_ASINTER-04_laurent_bulk_ice/tests/STATION_ASF/input_data/input_output_VALIDATION_IDEALIZED.nc
)
(
view diffs
)
tests/demo_cfgs.txt
(modified)
(
view diffs
)
Note:
See
TracChangeset
for help on using the changeset viewer.
Download in other formats:
Unified Diff
Zip Archive