Skip to content

Sync develop into main - #1480

Merged
sdrabenh merged 66 commits into
mainfrom
develop
Jul 16, 2026
Merged

sdrabenh merged 66 commits into
mainfrom
develop

Conversation

@sdrabenh

Copy link
Copy Markdown
Collaborator

No description provided.

sinakhani and others added 30 commits May 29, 2026 16:21
Make consistency btw default values of SS_FOUND in OpenWater and SeaiceInterface
…kMITAquaRaster.F90 (#1446)

Co-authored-by: Atanas L.  Trayanov <atrayano@gs6101-bucy.gsfc.nasa.gov>
…ng_IDL_to_Python

Update Boundary Conditions plotting package
…ute_gnu_intel

Bugfix: stabilize GEOSldas offline route restart comparisons
mathomp4 and others added 19 commits July 10, 2026 10:18
* placeholder issm gridcomp, directory, cmakelists

* filling out basic gridcomp structure

* add call to child in landice

* update issm cmakelists, add comments

* more comments

* comments

* comment out alot to try hello-world child

* edit cmakelists

* trying to fix cmakelists

* shuffling cmakelists commands

* comments

* trying to rename issm gridcomp

* correct gridcomp name

* add mapl metacomp pointers

* debugging child run call

* comment

* uncomment actual issm calls

* comment  fix

* remove redundancy

* comment out just the run issm call

* also comment out issm finalize just in case

* try printing vm info

* trying to call issm initialize again

* shuffles calls around

* call get vm

* call issm finalize

* try gridcompcreate with issm mesh

* comment a comment...

* try gridcompset for issm mesh...

* try to call issm run

* see if adding vmbarrier fixes petsc error

* try buffering number of elements

* revert number of elements, remove sdim

* trying to run from initialize just to see...

* revert to correct run/initialize structure

* trying calling mapl_genericinitialize before issm

* print smb inputs, never give up

* smb all zeros is good, print sizes to make sure...

* try running again

* fix issm rootdir

* fix directory argv trunction

* minor comments

* remove vm print info

* duplicate vm comm for issm use

* child call according to run alarm

* add barriers and deallocates

* try mpi barrier

* don't forget allocations

* add suffix just in case

* add intrinsics and comments

* point to petsc debug version

* remove intrinsics, threw syntax error

* remove some comments

* add ISSM alarm test

* declare alarm

* remove some printing and alarm_off call

* change mesh coordsys to lat-lon, mv runchild call

* minor comments

* comment about lat/long

* add mesh-to-agrid regridding

* add locstream transform

* replace mktile

* fix typo

* various comments and renaming

* fix type error

* fix type error

* fix several types

* fix fieldfill

* add grid-to-mesh routehandle

* fix assignment

* add import states

* format consistency

* formatting consistency

* some comments

* add some smb variables

* fix deallocate

* add regrid for smb

* allocate grid field

* fix meshloc

* fixed allocation issue-mostly working

* update locstream transforms-working

* add do_issm flag

* specify issm expdir/input in rc file

* add average,refresh intervals to smb import

* add mesh save option

* set initialize method to be consistent w/o issm

* v11: Build ISSM based on detection of ISSM

* set issm surface resource parameters, fix comment

* add element IDs to mesh save

* init changes

* hide locstream and grid in internal state

* create mesh_grid for output

* add new issm expots to gridcomp

* fix variable name typo

* fix fielddestroy calls

* initialize issm outputs to zero

* rm whitespace

* edit formatting

* rename mesh file

* name mesh file according to issm coniguration name

* get issm exports in landice tile space

* initial changes

* fix interface arg

* icesurf export on landice tile via internal state

* fix deallocate error

* subroutine for transform mesh to tile

* allocates outside subroutine

* Revert "allocates outside subroutine"

This reverts commit 08f3b0c.

* Revert "subroutine for transform mesh to tile"

This reverts commit 67112db.

* add flow speed and thick exports

* rm grid deallocates

* Revert to 67112db, rm deallocate

* subroutine calls for other exports

* add deallocates

* mv fielddestroys

* subroutine for tile to mesh transform

* rm redundant fielddestroys

* add allocates

* commentary

* remove vm barriers

* Revert "remove vm barriers"

This reverts commit dc53ec9.

* keep necessary barriers

* comments

* Revert "keep necessary barriers"

This reverts commit 649cf4c.

* remove stray barrier

* comment

* rename ice-equiv smb export

* comment

* add elementCoords for the output

* convert unit to radiant

* add internal state

* fix mesh seam in antarctica

* add ice thickness internal

* add new exports and internals

* initial node updates

* update regridding routines with halo info

* minor fixes

* add nodeowners

* fix typo

* fix allocate omission

* fix mask type

* rename iceeqsmb for simplicity

* comment

* fix mask index

* switch from logical mask to indices

* fix typos

* import icesmb by private state (fix alloc issue)

* add icesmb to derived type

* fix deallocates

* fixed deallocates; everything works now

* put grid variables in subroutine

* set issm restarts from geos

* update gridcomp description

* set issm_expdir to scratch dir

* remove elementConn from run and restart interface

* comment and add allocate trues

* add comment

* delete whitespace

* more comments

* conditional compilation directives

* try preprocess property

* Revert "try preprocess property"

This reverts commit f4b6ec1.

* start preproc macros on first columns

* preproc initial issm additions

* minor issm preproc fixes

* revamp preproc file names and generalize scripts

* fix variable def

* hardcode model names

* organize data by glacier

* add script completion msg

* renamed issm bcs script

* update issm bcs script output

* add readme and protect against long domain names

* edit readme

* update readme

* slurm-ify issm bcs script

* update issm preproc readme

* update issm preproc readme w filepath

* clarify readme

* update issm preproc readme with stored ouput

* initial make bcs edit

* mesh name round to nearest meter

* preproc set resolution params from cmd line

* delegate issm_mesh netcdf to preproc/issm

* update preproc/issm readme

* initial changes

* fix types and subroutine call

* fix types

* working solution

* remove unnecessary var

* comments and formatting

* rename nsteps variable

* set up restart bootstrap

* fix error codes

* redo error codes

* fix alarm ring check

* fix declaration

* persist exports and internals from start

* issm_nsteps via tile internal state

* minor fixes

* minor fix and formatting

* add issm core timer

* comments and formatting

* add issm conditional

* add preprocessor directive

* get landice timestep carefully

* put landice_dt in tile state

* update issm_env in preproc

* edit readme and cp mesh file to directory

* make optional command line arguments

* fix h_min argument

* update issm bcs example name

* add comment reminder

* redistribute restart arrays when needed (different ntasks)

* fix alarm alignment, rs was off by one step

* single precision zero-diff fix

* clean up formatting

* only modify landice in/ex if both have+run issm

* fix export check

* fix export ptr checks

* update datasets read from shared directories

---------

Co-authored-by: agstub <aaron.g.stubblefield@dartmouth.edu>
Co-authored-by: Matthew Thompson <matthew.thompson@nasa.gov>
Co-authored-by: Weiyuan Jiang <weiyuan.jiang@nasa.gov>
Co-authored-by: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com>
Co-authored-by: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com>
…egrid.pl) (#1157)

* removed obsolete program used by regrid.pl (mk_GEOSldasRestarts.F90)

* remove more files not needed

* removed additional obsolete "regrid" files

* removed names of obsolete files from CMakeLists.txt

* Remove mk_GEOSldasRestarts.F90 from CMakeLists.txt

Removed mk_GEOSldasRestarts.F90 from the list of source files.

---------

Co-authored-by: Weiyuan Jiang <weiyuan.jiang@nasa.gov>
Co-authored-by: Matt Thompson <matthew.thompson@nasa.gov>
Co-authored-by: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com>
* fix stretched grid only area diagnostic

* fix comment

* orig comment was less confusing

---------

Co-authored-by: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com>
Co-authored-by: Matt Thompson <matthew.thompson@nasa.gov>
Port the WSPD_STABLE300M diagnostic from FVdycoreCubed_GridComp PR #411
to the datmodyn component. This export provides the maximum wind speed
in the lowest 300m of the atmosphere under stable, cold surface conditions
(katabatic wind detection).

The diagnostic is only nonzero when:
- Surface air temperature is at or below freezing (MAPL_TICE)
- A temperature inversion exists somewhere in the lowest 300m AGL
…300M-to-datmodyn' into feature/sdrabenh/Dev_v11p1_b7
@sdrabenh
sdrabenh requested a review from mathomp4 July 16, 2026 12:06
@sdrabenh
sdrabenh requested review from a team as code owners July 16, 2026 12:06
@sdrabenh sdrabenh added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Jul 16, 2026
@sdrabenh
sdrabenh requested review from a team as code owners July 16, 2026 12:06
@sdrabenh
sdrabenh merged commit 8d0bcf5 into main Jul 16, 2026
17 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0 diff The changes in this pull request have verified to be zero-diff with the target branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants