Index: trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/dynphy_wrf_generic_lmd_new/update_inputs_physiq_mod.F
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/dynphy_wrf_generic_lmd_new/update_inputs_physiq_mod.F	(revision 2060)
+++ trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/dynphy_wrf_generic_lmd_new/update_inputs_physiq_mod.F	(revision 2061)
@@ -378,31 +378,28 @@
      ! Variable surface roughness !
      !----------------------------!
-
-     !----------------------------!
-     ! Variable surface roughness !
-     !----------------------------!
-     IF (JULYR .ne. 9999) THEN
-      IF (CST_Z0 == 0) THEN
-       z0(subs) = M_Z0(i,j)
-      ELSE
-       z0(subs) = CST_Z0
-       IF ( (i == ips) .AND. (j == jps) ) PRINT *,'** Mars ** SET CONSTANT SURF ROUGHNESS (m) ',CST_Z0
-      ENDIF
-     ELSE
-      IF ( (i == ips) .AND. (j == jps) ) PRINT *,'** Mars ** IDEALIZED SIMULATION z0 (m) ', CST_Z0
-      z0(subs)=CST_Z0
-     ENDIF
-     !!!! ADDITIONAL SECURITY. THIS MIGHT HAPPEN WITH OLD INIT FILES.
-     IF (z0(subs) == 0.) THEN
-       IF ( (i == ips) .AND. (j == jps) ) PRINT *, 'WELL, z0 is 0, this is no good. Setting to old defaults value 0.01 m'
-       z0(subs) = 0.01
-     ENDIF
-     !!!! ADDITIONAL SECURITY. INTERP+SMOOTH IN GEOGRID MIGHT YIELD NEGATIVE Z0 !!!
-     IF (z0(subs) < 0.) THEN
-       PRINT *, 'WELL, z0 is NEGATIVE, this is impossible. better stop here.'
-       PRINT *, 'advice --> correct interpolation / smoothing of z0 in WPS'
-       PRINT *, '           -- or check the constant value set in namelist.input'
-       STOP
-     ENDIF
+     z0 = CST_Z0
+     !IF (JULYR .ne. 9999) THEN
+     ! IF (CST_Z0 == 0) THEN
+     !  z0(subs) = M_Z0(i,j)
+     ! ELSE
+     !  z0(subs) = CST_Z0
+     !  IF ( (i == ips) .AND. (j == jps) ) PRINT *,'** Mars ** SET CONSTANT SURF ROUGHNESS (m) ',CST_Z0
+     ! ENDIF
+     !ELSE
+     ! IF ( (i == ips) .AND. (j == jps) ) PRINT *,'** Mars ** IDEALIZED SIMULATION z0 (m) ', CST_Z0
+     ! z0(subs)=CST_Z0
+     !ENDIF
+     !!!!! ADDITIONAL SECURITY. THIS MIGHT HAPPEN WITH OLD INIT FILES.
+     !IF (z0(subs) == 0.) THEN
+     !  IF ( (i == ips) .AND. (j == jps) ) PRINT *, 'WELL, z0 is 0, this is no good. Setting to old defaults value 0.01 m'
+     !  z0(subs) = 0.01
+     !ENDIF
+     !!!!! ADDITIONAL SECURITY. INTERP+SMOOTH IN GEOGRID MIGHT YIELD NEGATIVE Z0 !!!
+     !IF (z0(subs) < 0.) THEN
+     !  PRINT *, 'WELL, z0 is NEGATIVE, this is impossible. better stop here.'
+     !  PRINT *, 'advice --> correct interpolation / smoothing of z0 in WPS'
+     !  PRINT *, '           -- or check the constant value set in namelist.input'
+     !  STOP
+     !ENDIF
 
      !-----------------------------------------------!