Skip to content

Commit

Permalink
Merge pull request #264 from TillRasmussen/develop
Browse files Browse the repository at this point in the history
Smaller updates and clean up
  • Loading branch information
Jipingnersc authored Oct 8, 2024
2 parents f74b2fe + 81d3155 commit b4fdb09
Show file tree
Hide file tree
Showing 14 changed files with 7 additions and 1,735 deletions.
3 changes: 0 additions & 3 deletions README.betzy
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ ulimit -s 2000000 ## if needed
csh Make_all.com

!! NOT COMPLETE
The csh script above does not complete because it gets stuck in archive folder.
Normally it should fail and continue but not this time.
You can compile each folder individually for the time being until the problem is resolved.

Netcdf routines are partly compiled right,
csh Make_ncdf.com
Expand Down
2 changes: 1 addition & 1 deletion bin/compile_model.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ elif [ "${V}" == "2.3" ]; then
sourcedir=$NHCROOT/hycom/RELO/HYCOM_NERSC_src_v${V}/
sourcedir_cice=$NHCROOT/cice/Release-5.1/
else
sourcedir=$NHCROOT/hycom/RELO/src_${V}G-17Tsig2-SD-i_relo_mpi/
sourcedir=$NHCROOT/hycom/RELO/src_${V}G-17Tsig2-SD-i_relo_mpi/
fi
sourceconfdir=$NHCROOT/hycom/RELO/config/

Expand Down
2 changes: 1 addition & 1 deletion cice/Release-5.1/source/ice_init.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,7 @@ subroutine init_state
call ice_read_nc &
(fid, 1, fieldname, abar2d(:,:,:), .true., &
field_loc_center, field_type_scalar)
fieldname = 'hi'
fieldname = 'hi'
call ice_read_nc &
(fid, 1, fieldname, hbar2d(:,:,:), .true., &
field_loc_center, field_type_scalar)
Expand Down
3 changes: 2 additions & 1 deletion contributors.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
Knut Lisæter
Mostafa Bakhoday-Paskyabi
Caglar Yumruktepe
Jiping Xi
Jiping Xie
Roshin Raj
Annette Samuelsen
Achref Othmani
Till Rasmussen
223 changes: 0 additions & 223 deletions hycom/RELO/HYCOM_NERSC_src_v2.3/ALT_CODE/stmt_fns_SIGMA0_12term.h

This file was deleted.

Loading

0 comments on commit b4fdb09

Please # to comment.