Changeset 5105 for LMDZ6/branches/Amaury_dev/libf/phylmd/Dust

Timestamp:

Jul 23, 2024, 7:14:34 PM (7 months ago)

Author:

abarral

Message:

Replace 1DUTILS.h by module lmdz_1dutils.f90
Replace 1DConv.h by module lmdz_old_1dconv.f90 (it's only used by old_* files)
Convert *.F to *.f90
Fix gradsdef.h formatting
Remove unnecessary "RETURN" at the end of functions/subroutines

Location:

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust

Files:

• aeropt_spl.f90 (modified) (1 diff)
• bcscav_spl.f90 (modified) (1 diff)
• cltrac_spl.f90 (modified) (1 diff)
• condsurfc.f90 (modified) (1 diff)
• condsurfc_new.f90 (modified) (1 diff)
• condsurfs.f90 (modified) (1 diff)
• condsurfs_new.f90 (modified) (1 diff)
• dustemission_mod.F90 (modified) (3 diffs)
• gastoparticle.f90 (modified) (1 diff)
• inscav_spl.f90 (modified) (1 diff)
• neutral.f90 (modified) (1 diff)
• phytracr_spl_mod.F90 (modified) (2 diffs)
• read_dust.f90 (modified) (1 diff)
• read_surface.F90 (modified) (1 diff)
• read_vent.f90 (modified) (2 diffs)
• satellite_out_spla.F90 (modified) (2 diffs)
• seasalt.f90 (modified) (1 diff)
• sediment_mod.f90 (modified) (1 diff)
• tiedqneg.f90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/aeropt_spl.f90

@@ -246 +246 @@
   ! .                                        MAXVAL(taue550_ss)
   !
-  RETURN
+
 END SUBROUTINE aeropt_spl

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/bcscav_spl.f90

@@ -52 +52 @@
   ENDDO
   !
-  RETURN
+
 END SUBROUTINE bcscav_spl

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/cltrac_spl.f90

@@ -134 +134 @@
   ! print *,'d_tr = ',sum(d_tr),MINVAL(d_tr),MAXVAL(d_tr)
 
-  RETURN
+
 END SUBROUTINE cltrac_spl

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfc.f90

@@ -117 +117 @@
   PRINT*, 'Carbon sources lues pour jour: ', jour
 
-  RETURN
+
 END SUBROUTINE condsurfc

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfc_new.f90

@@ -205 +205 @@
   CALL scatter(lmt_omnat_glo, lmt_omnat)
 
-  RETURN
+
 END SUBROUTINE condsurfc_new

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfs.f90

@@ -235 +235 @@
   PRINT*, 'Sources SOUFRE lues pour jour: ', jour
 
-  RETURN
+
 END SUBROUTINE condsurfs

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfs_new.f90

@@ -258 +258 @@
   CALL scatter(lmt_altvolc_expl_glo, lmt_altvolc_expl)
 
-  RETURN
+
 END SUBROUTINE condsurfs_new

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/dustemission_mod.F90

@@ -978 +978 @@
 !        END IF
 !        IF(nbins2.EQ.1)THEN
-!           PRINT*,'!! warning: lower limit was found: STOP'
+!           PRINT*,'!! warning: lower limit was found: stop '
 !           STOP
 !        END IF
@@ -1410 +1410 @@
 !---------------        
 
-      return
+
 END SUBROUTINE def_copyncl
 
@@ -1531 +1531 @@
        END DO
 !c-----------------
-       RETURN
+
       END SUBROUTINE calcvd
 

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/gastoparticle.f90

@@ -87 +87 @@
 
   !
-  RETURN
+
 END SUBROUTINE gastoparticle

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/inscav_spl.f90

@@ -137 +137 @@
   ENDDO
   !
-  RETURN
+
 END SUBROUTINE inscav_spl

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/neutral.f90

@@ -67 +67 @@
 
   enddo
-  return
+
 end subroutine neutral
 !***********************************************************************

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phytracr_spl_mod.F90

@@ -762 +762 @@
     param_wstarWAKEperregion(:) = 0.
 
-    RETURN
+
   END SUBROUTINE phytracr_spl_ini
 
@@ -4207 +4207 @@
     !      CALL abort_gcm('TEST1', 'OK1', 1)
 
-    RETURN
+
   END SUBROUTINE phytracr_spl
 

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_dust.f90

@@ -72 +72 @@
   CALL scatter(dust_ec_glo, dust_ec)
 
-  RETURN
+
 END SUBROUTINE read_dust

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_surface.F90

@@ -148 +148 @@
 
 
-       return
+
        END SUBROUTINE  read_surface

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_vent.f90

@@ -102 +102 @@
   !   print *,'u v 1 ', u10m_ec(1),v10m_ec(1)
   !   print *,'u v klon ', u10m_ec(klon),v10m_ec(klon)
-  RETURN
+
 END SUBROUTINE read_vent
 
@@ -122 +122 @@
   enddo
 
-  return
+
 END SUBROUTINE  correctbid
 

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/satellite_out_spla.F90

@@ -61 +61 @@
 !  CALL writefield_phy("masque_terra",float(masque_terra),1)
 
-  RETURN
+
 END SUBROUTINE satellite_out_spla
 
@@ -187 +187 @@
   ENDDO
 
-  RETURN
+
 END SUBROUTINE swathpolder
 

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/seasalt.f90

@@ -49 +49 @@
   ! print *,'SUM OF WIND = ',wind
   ! print *,'SUM OF OCEAN SURFACE = ',ocean
-  RETURN
+
 END SUBROUTINE seasalt

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/sediment_mod.f90

@@ -334 +334 @@
 
   !
-  RETURN
+
 END SUBROUTINE sediment_mod

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/tiedqneg.f90

@@ -62 +62 @@
   ENDDO
 
-  RETURN
+
 END SUBROUTINE tiedqneg