Code

A new driver/coupler for GEOS-ESM#959

Code

Draft

zhaobin74 wants to merge 89 commits intoCICE-Consortium:mainCICE-Consortium/CICE:mainfrom GEOS-ESM:geos-ready-for-consortiumGEOS-ESM/CICE:geos-ready-for-consortiumCopy head branch name to clipboard

+4,356-15

Commits

Commits on Mar 3, 2022

• added customized machine files for discover

  zhaobin74

  committed
  4666242

  Copy full SHA for 4666242

Commits on Mar 4, 2022

• added discover machine in batch and launch

  zhaobin74

  committed
  d2410e8

  Copy full SHA for d2410e8

• tweak include and lib options for discover

  zhaobin74

  committed
  7fd4046

  Copy full SHA for 7fd4046

Commits on Mar 7, 2022

• fix the input data directory

  zhaobin74

  committed
  b85f95a

  Copy full SHA for b85f95a

• fix mpirun command

  zhaobin74

  committed
  e7f3995

  Copy full SHA for e7f3995

Commits on Mar 10, 2022

• added mapl geos driver

  zhaobin74

  committed
  1e95998

  Copy full SHA for 1e95998

Commits on Mar 11, 2022

• added mpi comm to init arguments

  zhaobin74

  committed
  50701db

  Copy full SHA for 50701db

Commits on Mar 21, 2022

• added run module

  zhaobin74

  committed
  9a9d512

  Copy full SHA for 9a9d512

Commits on Mar 25, 2022

• added a new module

  zhaobin74

  committed
  0a19d70

  Copy full SHA for 0a19d70

Commits on Apr 2, 2022

• added import_export module

  zhaobin74

  committed
  b0ccb02

  Copy full SHA for b0ccb02

Commits on Apr 21, 2022

• work on importing

  zhaobin74

  committed
  28acfe0

  Copy full SHA for 28acfe0

Commits on Apr 25, 2022

• finishing import_thermo1 and related moddule changes

  zhaobin74

  committed
  477fffc

  Copy full SHA for 477fffc

Commits on Jul 21, 2022

• continue importing/exporting stuff

  zhaobin74

  committed
  1af7127

  Copy full SHA for 1af7127

Commits on Aug 16, 2022

• finishing export_thermo1

  zhaobin74

  committed
  1525271

  Copy full SHA for 1525271

Commits on Oct 25, 2022

• added ifdef to protect additional arguments

  zhaobin74

  committed
  98e3f4b

  Copy full SHA for 98e3f4b

• remove icepack from submodule

  zhaobin74

  committed
  0f4e7ea

  Copy full SHA for 0f4e7ea

Commits on Nov 8, 2022

• add additional exchange fields

  zhaobin74

  committed
  aa3a6b0

  Copy full SHA for aa3a6b0

Commits on Dec 1, 2022

• fixed compilation errors

  zhaobin74

  committed
  5da104d

  Copy full SHA for 5da104d

Commits on Dec 13, 2022

• change init/init_calendar interface to take in coupled model's date/time

  zhaobin74

  committed
  807c7dc

  Copy full SHA for 807c7dc

Commits on Dec 15, 2022

• receive layout information from coupler

  zhaobin74

  committed
  dc16b5f

  Copy full SHA for dc16b5f

Commits on Dec 20, 2022

• add radiation call in fast_physics

  zhaobin74

  committed
  eaeebd8

  Copy full SHA for eaeebd8

• prevent cice from stopping or dumping restart when coupled to geos

  zhaobin74

  committed
  ec0923f

  Copy full SHA for ec0923f

Commits on Dec 22, 2022

• allow a new type of grid which resets tmask

  zhaobin74

  committed
  bc05d19

  Copy full SHA for bc05d19

Commits on Dec 23, 2022

• allow albedo and thermo done on non-ocean points (tmask == 0); to be tested

  zhaobin74

  committed
  25b92fc

  Copy full SHA for 25b92fc

Commits on Jan 5, 2023

• export albedos to geos

  zhaobin74

  committed
  52cbbf7

  Copy full SHA for 52cbbf7

Commits on Jan 12, 2023

• import sst and sss from surfstate

  zhaobin74

  committed
  7c736ee

  Copy full SHA for 7c736ee

• fixed a bug; feed frzmlt from coupler

  zhaobin74

  committed
  ff6180f

  Copy full SHA for ff6180f

• resolved inconsistent value of MAPL_TICE and Tffresh

  zhaobin74

  committed
  9ad8624

  Copy full SHA for 9ad8624

• reset some icepack parameters using MAPL values

  zhaobin74

  committed
  f1d6fea

  Copy full SHA for f1d6fea

Commits on Jan 13, 2023

• disable some ice_debug calls to focus on thermo only

  zhaobin74

  committed
  03656df

  Copy full SHA for 03656df

• pass task, i, j, and iblk to icepack for aiding debugging

  zhaobin74

  committed
  415cc3d

  Copy full SHA for 415cc3d

Commits on Jan 17, 2023

• refactor paasing addtional arguments to icepack

  zhaobin74

  committed
  9d4758e

  Copy full SHA for 9d4758e

Commits on Jan 24, 2023

• added import, export and routines used by prep_albedo callback

  zhaobin74

  committed
  d2c7110

  Copy full SHA for d2c7110

Commits on Jan 27, 2023

• add a step_radiation like subroutine without side effect

  zhaobin74

  committed
  df5613c

  Copy full SHA for df5613c

• add a mechanism to change CICE time step regardless of its value in ice_in

  zhaobin74

  committed
  d91baab

  Copy full SHA for d91baab

• allow extra penetrative sw flux to be computed by CICE

  zhaobin74

  committed
  4cc3d5e

  Copy full SHA for 4cc3d5e

Commits on Jan 30, 2023

• refactored code for obtaining addtional penetrative sw flux through ice into ocean

  zhaobin74

  committed
  9ae2594

  Copy full SHA for 9ae2594

Commits on Jan 31, 2023

• add back init_shortwave call

  zhaobin74

  committed
  eb323d1

  Copy full SHA for eb323d1

Commits on Feb 1, 2023

• switch back to using step_radiation by ignoring side effect

  zhaobin74

  committed
  4d2c147

  Copy full SHA for 4d2c147

Commits on Feb 2, 2023

• fix flux coupling to atmosphere; not finished

  zhaobin74

  committed
  aac9b8c

  Copy full SHA for aac9b8c

Commits on Feb 4, 2023

• finished coupling_atm subroutin; replace all aice with aice_init

  zhaobin74

  committed
  660166c

  Copy full SHA for 660166c

Commits on Feb 6, 2023

• added missing arguments of fswthru_*dr/df and opmask in scale_flux

  zhaobin74

  committed
  fec184a

  Copy full SHA for fec184a

• init fswthru_*dr/df to zero; allow scale_flux to run over orphan points

  zhaobin74

  committed
  1bc0b53

  Copy full SHA for 1bc0b53

Commits on Feb 7, 2023

• add exporting after the CICE complete one full time step

  zhaobin74

  committed
  4971c5b

  Copy full SHA for 4971c5b

Commits on Feb 8, 2023

• scale atm and ocn flux separately

  zhaobin74

  committed
  22dae37

  Copy full SHA for 22dae37

• add a checkpoint routine to dump restart during Finalize

  zhaobin74

  committed
  7eb2ccd

  Copy full SHA for 7eb2ccd

Commits on Feb 9, 2023

• fixed a string argument bug in restart routines

  zhaobin74

  committed
  85b12a5

  Copy full SHA for 85b12a5

• fixed a bug of zeroing out tracers over orphan points

  zhaobin74

  committed
  d9a3e9a

  Copy full SHA for d9a3e9a

Commits on Feb 10, 2023

• no need to scale radiation in GEOS

  zhaobin74

  committed
  f4d7d33

  Copy full SHA for f4d7d33

• add halo update for frocean; use puny instead of 0

  zhaobin74

  committed
  a1eef4f

  Copy full SHA for a1eef4f

• init some column arrays to zero; add opmask along with tmask in if statement

  zhaobin74

  committed
  b17cf9c

  Copy full SHA for b17cf9c

Commits on Feb 13, 2023

• rearrange init_flux_atm and init_flux_ocn; fixed the timer_step

  zhaobin74

  committed
  b14b986

  Copy full SHA for b14b986

Commits on Feb 14, 2023

• add two more fluxes in init_flux_atm

  zhaobin74

  committed
  9062bd1

  Copy full SHA for 9062bd1

• remove reset_*_flux and call init_flux_*

  zhaobin74

  committed
  c71d6be

  Copy full SHA for c71d6be

Commits on Feb 15, 2023

• remove Tsfc assignment in import_thermo1; use new Tsfcn_init to compute DTS in export_thermo1

  zhaobin74

  committed
  058582b

  Copy full SHA for 058582b

• created a new Tsfcn_init and save initial Tskin in it

  zhaobin74

  committed
  d226c61

  Copy full SHA for d226c61

Commits on Feb 22, 2023

• add accum_hist call at the end of init

  zhaobin74

  committed
  998643d

  Copy full SHA for 998643d

Commits on Feb 25, 2023

• fixed a bufg computing dTS; add exporting GHTSKIN

  zhaobin74

  committed
  a80f805

  Copy full SHA for a80f805

Commits on Mar 3, 2023

• add importing wind stress and rotating them

  zhaobin74

  committed
  44e5bd9

  Copy full SHA for 44e5bd9

Commits on Mar 7, 2023

• output more block extent information for debug_block

  zhaobin74

  committed
  69cdb1d

  Copy full SHA for 69cdb1d

Commits on Mar 8, 2023

• fixed length of string format

  zhaobin74

  committed
  a6d97a4

  Copy full SHA for a6d97a4

Commits on Mar 9, 2023

• rename cicecore/cicedynB to cicecore/cicedyn; CICE6.4.1 made this rename so we do it now to pprepare for merge

  zhaobin74

  committed
  252700f

  Copy full SHA for 252700f

Commits on Mar 10, 2023

• import ssh and compute ss_tlt* terms

  zhaobin74

  committed
  0233286

  Copy full SHA for 0233286

Commits on Mar 14, 2023

• add importing currents and exporting ice-ocean stress and ice vel

  zhaobin74

  committed
  a2206d2

  Copy full SHA for a2206d2

Commits on Mar 20, 2023

• fix alncnt computation; do not use netsw condition for ccsm3 type albedo scheme

  zhaobin74

  committed
  201f5ba

  Copy full SHA for 201f5ba

Commits on Mar 22, 2023

• fixed a bug of fsurf not getting assigned values

  zhaobin74

  committed
  0bbc6a2

  Copy full SHA for 0bbc6a2

Commits on Apr 19, 2023

• merged with CICE6.4.1; conflicts resolved and to be tested

  zhaobin74

  committed
  7be0e36

  Copy full SHA for 7be0e36

Commits on Apr 20, 2023

• update comments to 6.4.1

  zhaobin74

  committed
  f812b40

  Copy full SHA for f812b40

Commits on Apr 25, 2023

• revert scale_flux back to original version; geos coupler does not use it explicitly

  zhaobin74

  committed
  53d3bca

  Copy full SHA for 53d3bca

Commits on Apr 28, 2023

• fixed regression issue by adding opmask in conitional if

  zhaobin74

  committed
  21d4f0a

  Copy full SHA for 21d4f0a

Commits on May 5, 2023

• changes to go with refactored icepack code

  zhaobin74

  committed
  4b083b2

  Copy full SHA for 4b083b2

Commits on May 16, 2023

• additions/changes to make test(suites) runs on discover

  zhaobin74

  committed
  5348ece

  Copy full SHA for 5348ece

Commits on May 17, 2023

• add GEOS macro to isolate extra arguments

  zhaobin74

  committed
  8061be3

  Copy full SHA for 8061be3

Commits on May 19, 2023

• correct halo_update for coupling to GEOS

  zhaobin74

  committed
  dabdd6b

  Copy full SHA for dabdd6b

Commits on Sep 21, 2023

• enable C-EVP by importing MOM6 C-grid currents (#2)

  Show description for 45e3382
  zhaobin74

  authored
  45e3382

  Copy full SHA for 45e3382

Commits on Oct 16, 2023

• make cice6 dump intermediate restart (#3)

  Show description for ae59cc0
  zhaobin74

  authored
  ae59cc0

  Copy full SHA for ae59cc0

Commits on Oct 19, 2023

• keep allland blocks when coupling to GEOS-ESM

  zhaobin74

  committed
  a5e75e6

  Copy full SHA for a5e75e6

• Merge pull request #4 from GEOS-ESM/feature/zhaobin74/stop-landblock-elimination

  Show description for 771d550
  zhaobin74

  authored
  771d550

  Copy full SHA for 771d550

Commits on Nov 14, 2023

• add support for rewinding thermo states (#5)

  Show description for b4caf80
  zhaobin74

  authored
  b4caf80

  Copy full SHA for b4caf80

Commits on Apr 23, 2024

• merged with CICE main post 650; to be built and tested

  zhaobin74

  committed
  e85361e

  Copy full SHA for e85361e

Commits on Apr 24, 2024

• remove deprecated vars and routines from geos driver

  zhaobin74

  committed
  e192827

  Copy full SHA for e192827

• more fixes for driver after merging post 650

  zhaobin74

  committed
  1fc530b

  Copy full SHA for 1fc530b

Commits on Apr 26, 2024

• fix halo update of u/vocn and sstlt terms based on B or C ice grid

  zhaobin74

  committed
  1b3015f

  Copy full SHA for 1b3015f

Commits on May 3, 2024

• Merge pull request #6 from GEOS-ESM/feature/zhaobin74/merge-main-post650

  Show description for d7b5971
  zhaobin74

  authored
  d7b5971

  Copy full SHA for d7b5971

Commits on Jun 5, 2024

• remove debugging facility code

  zhaobin74

  committed
  2af5ee5

  Copy full SHA for 2af5ee5

Commits on Jun 6, 2024

• restore .gitmodules file

  zhaobin74

  committed
  ebbbd3f

  Copy full SHA for ebbbd3f

Commits on Jun 12, 2024

• add missing comments on GEOS input fields

  zhaobin74

  committed
  16a6f29

  Copy full SHA for 16a6f29

• corrected comments on GEOS inputs

  zhaobin74

  committed
  65abb61

  Copy full SHA for 65abb61

Commits on Jun 18, 2024

• fill in fsw from coupler fields

  zhaobin74

  committed
  7eb5e71

  Copy full SHA for 7eb5e71