Quentin 05/12/2022: bugfix merge 5.5 to 5.6 mesonh ext/

src/mesonh/ext/phys_paramn.f90

@@ -864,12 +864,12 @@ IF (LOCEAN) THEN
   ZIZOCE(IKU)   = XSSOLA_T(JSW+1)*(1.-ZSWA)+XSSOLA_T(JSW+2)*ZSWA
   ZPROSOL1(IKU) = CST%XROC*ZIZOCE(IKU)
   ZPROSOL2(IKU) = (1.-CST%XROC)*ZIZOCE(IKU)
-  IF(NVERB >= 5 ) THEN   
+!  IF(NVERB >= 5 ) THEN   
 !    WRITE(ILUOUT,*)'ZSWA JSW TDTCUR XTSTEP FT FU FV SolarR(IKU)', NINFRT, ZSWA,JSW,&
 !       TDTCUR%xtime, XTSTEP, ZSFTH(2,2), ZSFU(2,2),ZSFV(2,2),ZIZOCE(IKU)
-   WRITE(ILUOUT,*)'XSSTP1,XSSTP,NINFRT,ZSWA,JSW,TDTCUR%xtime,ZSFT', &
-      XSSTFL_T(JSW+1),XSSTFL_T(JSW),NINFRT,ZSWA,JSW, TDTCUR%xtime,ZSFTH(2,2)
-  END IF
+!   WRITE(ILUOUT,*)'XSSTP1,XSSTP,NINFRT,ZSWA,JSW,TDTCUR%xtime,ZSFT', &
+!      XSSTFL_T(JSW+1),XSSTFL_T(JSW),NINFRT,ZSWA,JSW, TDTCUR%xtime,ZSFTH(2,2)
+!  END IF
   if ( TBUCONF%LBUDGET_th ) call Budget_store_init( TBUDGETS(NBUDGET_TH), 'OCEAN', xrths(:, :, :) ) 
   DO JKM=IKU-1,2,-1
     ZPROSOL1(JKM) = ZPROSOL1(JKM+1)* exp(-XDZZ(2,2,JKM)/CST%XD1)

src/mesonh/ext/prep_ideal_case.f90

@@ -341,6 +341,7 @@ USE MODD_PGDDIM
 USE MODD_PGDGRID
 USE MODD_TIME
 USE MODD_TIME_n
+USE MODD_PARAM_ICE, ONLY: PARAM_ICE_ASSOCIATE
 USE MODD_REF
 USE MODD_REF_n
 USE MODD_LUNIT
@@ -653,7 +654,7 @@ CALL INI_NEB
 !*       2.1  For variables in DESFM file
 !
 CALL ALLOC_FIELD_SCALARS()
-!
+CALL PARAM_ICE_ASSOCIATE()
 CALL DEFAULT_DESFM_n(1)
 !
 CSURF = "NONE"