History conflicts between CICE-Consortium and emc/develop #84
Comments
|
Any commits in the EMC/fork not in Consortium should be pushed first. Namely: |
This was referenced Aug 9, 2024
apcraig
pushed a commit
to CICE-Consortium/CICE
that referenced
this issue
Aug 16, 2024
…e cpl_scalar field when created for UFS (#969) These are two commits cherry-picked from as in UFS and needed to close NOAA-EMC#84. This PR adds the ability for CICE to write restart files at the end of the run (independent of other settings) and controlled via the CMEPS configuration option write_restart_at_endofrun. Setting this configuration option to True creates a restart file in the same way for CMEPS, MOM6, and CICE. This PR also initializes the scalar field value for the index for NTile (implemented for FV3) not used or set in CICE. In certain cases, the scalar field value for this index has been found to be non-zero (NaN in debug compiles). This is the cause of the failure reported in ufs-community/ufs-weather-model#2338. * Add end of run functionality to CICE (#77) * initialize cpl_scalar field when created (#83) --------- Co-authored-by: Daniel Sarmiento <[email protected]> Co-authored-by: Denise Worthen <[email protected]>
apcraig
pushed a commit
to CICE-Consortium/CICE
that referenced
this issue
Aug 22, 2024
Prescribed ice CICE was enclosed by #ifdef CESMCOUPLED in CMEPS driver. This allows use of prescribed ice CICE in ufs-weather-model with CDEPS calls to input (sea ice concentration) from file. Starting as cherry-picked as in UFS but dependency on CDEPS likely needs to be optional at compile time. This is needed for History conflicts between CICE-Consortium and emc/develop NOAA-EMC#84 * Enable prescribed ice for UFS (#80) * Remove #ifdef CESMCOUPLED from cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90 * Remove #ifdef CESMCOUPLED from cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 * Testing changing stream_taxmode from cycle to extend * Change include mpif.h to use mpi in ice_prescribed_mod.F90 * Call dshr_pio_init from ice_prescribed_init * Call ice_prescribed_run after ice_prescribed_init * Incorporate ice_prescribed_nml in ice_prescribed_mod.F90 * write stream_taxmode to log. typo in ice_prescribed_mod.F90. * Remove CESMCOUPLED so models initialize ice_prescribed at end of ice_prescribed_init * Change indent for #ifndef for gnu debug * Only call ice_prescribed_run in ice_prescribed_init #ifndef CESMCOUPLED * Note CDEPS dependency in cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 * Remove stub prescribed ice code
14 tasks
NickSzapiro-NOAA
added a commit
that referenced
this issue
Sep 25, 2024
…e cpl_scalar field when created for UFS (CICE-Consortium#969) These are two commits cherry-picked from as in UFS and needed to close #84. This PR adds the ability for CICE to write restart files at the end of the run (independent of other settings) and controlled via the CMEPS configuration option write_restart_at_endofrun. Setting this configuration option to True creates a restart file in the same way for CMEPS, MOM6, and CICE. This PR also initializes the scalar field value for the index for NTile (implemented for FV3) not used or set in CICE. In certain cases, the scalar field value for this index has been found to be non-zero (NaN in debug compiles). This is the cause of the failure reported in ufs-community/ufs-weather-model#2338. * Add end of run functionality to CICE (#77) * initialize cpl_scalar field when created (#83) --------- Co-authored-by: Daniel Sarmiento <[email protected]> Co-authored-by: Denise Worthen <[email protected]>
NickSzapiro-NOAA
added a commit
that referenced
this issue
Sep 25, 2024
Prescribed ice CICE was enclosed by #ifdef CESMCOUPLED in CMEPS driver. This allows use of prescribed ice CICE in ufs-weather-model with CDEPS calls to input (sea ice concentration) from file. Starting as cherry-picked as in UFS but dependency on CDEPS likely needs to be optional at compile time. This is needed for History conflicts between CICE-Consortium and emc/develop #84 * Enable prescribed ice for UFS (#80) * Remove #ifdef CESMCOUPLED from cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90 * Remove #ifdef CESMCOUPLED from cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 * Testing changing stream_taxmode from cycle to extend * Change include mpif.h to use mpi in ice_prescribed_mod.F90 * Call dshr_pio_init from ice_prescribed_init * Call ice_prescribed_run after ice_prescribed_init * Incorporate ice_prescribed_nml in ice_prescribed_mod.F90 * write stream_taxmode to log. typo in ice_prescribed_mod.F90. * Remove CESMCOUPLED so models initialize ice_prescribed at end of ice_prescribed_init * Change indent for #ifndef for gnu debug * Only call ice_prescribed_run in ice_prescribed_init #ifndef CESMCOUPLED * Note CDEPS dependency in cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 * Remove stub prescribed ice code
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
While comparison of the authoritative CICE-Consortium with EMC fork shows ~O(100) different commits:
code content has not diverged. These "git" differences are largely historical (changing the base branch from ESCOMP to CICE-Consortium, a period with an EMC fork of Icepack, etc.) and complicate merging developments between forks.
Several merging or rebasing strategies could improve consistency between forks. However, any strategy that changes branch history can impact downstream branches, particularly ufs-community/ufs-weather-model tags and their development history. Issuing a new branch from CICE-Consortium/main would synchronize with the authoritative repository and maintain history for dependent tags/branches.
The text was updated successfully, but these errors were encountered: