Icepack merge #70
Icepack merge #70
Conversation
Update master code
|
@lzampier Thanks a lot! |
| @@ -43,6 +43,8 @@ elif [[ $LOGINHOST = bsc ]]; then | |||
| STRATEGY="bsc" | |||
| elif [[ $LOGINHOST =~ ^juwels[0-9][0-9].ib.juwels.fzj.de$ ]]; then | |||
| STRATEGY="juwels" | |||
| elif [[ $LOGINHOST =~ ^jwlogin[0-9][0-9].juwels$ ]]; then | |||
| STRATEGY="juwels" | |||
There was a problem hiding this comment.
Better to keep one for juwels, the shorter the better :)
There was a problem hiding this comment.
I added the second juwels case to allow an easy compilation on the login nodes. But I agree, it is not necessary.
No, no specific reason for that. You can retain the old permission level. |
| #module load Intel/2019.3.199-GCC-8.3.0 ParaStationMPI/5.4 imkl/2019.5.281 | ||
| #export FC=mpifort CC=mpicc CXX=mpicxx | ||
| module load Intel/2019.3.199-GCC-8.3.0 ParaStationMPI/5.4 imkl/2019.5.281 | ||
| export FC=mpifort CC=mpicc CXX=mpicxx |
There was a problem hiding this comment.
Are we more happy with this settings?
There was a problem hiding this comment.
Lately yes, for large mesh partitions (approximately >2000 CPUs) I have issues with IntelMPI when the communication structure is initialized by FESOM.
There was a problem hiding this comment.
Ok, let's keep your version then as a default.
Would be easier if you just put the permissions back in the PR :) |
src/ice_maEVP.F90
Outdated
| @@ -379,7 +409,7 @@ subroutine EVPdynamics_m(mesh) | |||
|
|
|||
| if (a_ice(i) >= 0.01_WP) then | |||
| inv_thickness(i) = (rhoice*m_ice(i)+rhosno*m_snow(i))/a_ice(i) | |||
| inv_thickness(i) = 1.0_WP/max(inv_thickness(i), 9.0_WP) ! Limit the mass | |||
| inv_thickness(i) = 1.0_WP/inv_thickness(i) !max(inv_thickness(i), 9.0_WP) ! Limit the mass | |||
There was a problem hiding this comment.
Are you sure we don't want to limit it?
src/ice_maEVP.F90
Outdated
|
|
||
| asum=sum(a_ice(elnodes))*val3 | ||
| !#if defined (__icepack) | ||
| ! pressure_fac(el) = det2*sum(strength(elnodes))*val3 |
src/ice_modules.F90
Outdated
| @@ -32,7 +32,7 @@ MODULE i_PARAM | |||
| real(kind=WP) :: theta_io=0.0_WP ! rotation angle | |||
| ! (ice-ocean), available | |||
| ! in EVP | |||
| real(kind=WP) :: alpha_evp=250, beta_evp=250 | |||
| real(kind=WP) :: alpha_evp=500, beta_evp=500 | |||
There was a problem hiding this comment.
Please return to old default values for consistency. Now one can change this parameters in the namelist.io.
Icepack merge
Addition of the Icepack subroutines to the FESOM2 model. The old sea-ice structure is maintained as default.