Changeset 5105 for LMDZ6/branches/Amaury_dev/libf/dyn3d

Timestamp:

Jul 23, 2024, 7:14:34 PM (6 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/dyn3d

Files:

• addfi.F90 (modified) (1 diff)
• advect.F90 (modified) (1 diff)
• bilan_dyn.F90 (modified) (1 diff)
• covnat.F90 (modified) (1 diff)
• dissip.F90 (modified) (1 diff)
• dteta1.F90 (modified) (1 diff)
• dudv1.F90 (modified) (1 diff)
• dudv2.F90 (modified) (1 diff)
• fluxstokenc.F90 (modified) (1 diff)
• friction.F90 (modified) (1 diff)
• groupe.F90 (modified) (1 diff)
• groupeun.F90 (modified) (2 diffs)
• guide_mod.F90 (modified) (2 diffs)
• iniinterp_horiz.F90 (modified) (1 diff)
• integrd.F90 (modified) (1 diff)
• interp_horiz.F90 (modified) (1 diff)
• leapfrog.F90 (modified) (3 diffs)
• qminimum.F90 (modified) (1 diff)
• tetaleveli1j.F90 (modified) (1 diff)
• tetaleveli1j1.F90 (modified) (1 diff)
• vlsplt.F90 (modified) (5 diffs)
• vlspltqs.F90 (modified) (3 diffs)
• wrgrads.f90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/dyn3d/addfi.F90

@@ -178 +178 @@
   ENDDO
 
-  RETURN
+
 END SUBROUTINE addfi

LMDZ6/branches/Amaury_dev/libf/dyn3d/advect.F90

@@ -162 +162 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE advect

LMDZ6/branches/Amaury_dev/libf/dyn3d/bilan_dyn.F90

@@ -578 +578 @@
   !=====================================================================
 
-  return
+
 END SUBROUTINE  bilan_dyn

LMDZ6/branches/Amaury_dev/libf/dyn3d/covnat.F90

@@ -44 +44 @@
 
   ENDDO
-  RETURN
+
 END SUBROUTINE covnat

LMDZ6/branches/Amaury_dev/libf/dyn3d/dissip.F90

@@ -142 +142 @@
   ENDDO
 
-  RETURN
+
 END SUBROUTINE dissip

LMDZ6/branches/Amaury_dev/libf/dyn3d/dteta1.F90

@@ -60 +60 @@
 
   !
-  RETURN
+
 END SUBROUTINE dteta1

LMDZ6/branches/Amaury_dev/libf/dyn3d/dudv1.F90

@@ -49 +49 @@
     !
   END DO
-  RETURN
+
 END SUBROUTINE dudv1

LMDZ6/branches/Amaury_dev/libf/dyn3d/dudv2.F90

@@ -58 +58 @@
   END DO
   !
-  RETURN
+
 END SUBROUTINE dudv2

LMDZ6/branches/Amaury_dev/libf/dyn3d/fluxstokenc.F90

@@ -158 +158 @@
   ENDIF ! if iadvtr.EQ.istdyn
 
-  RETURN
+
 END SUBROUTINE fluxstokenc

LMDZ6/branches/Amaury_dev/libf/dyn3d/friction.F90

@@ -125 +125 @@
   endif
 
-  RETURN
+
 END SUBROUTINE friction
 

LMDZ6/branches/Amaury_dev/libf/dyn3d/groupe.F90

@@ -104 +104 @@
   CALL vitvert(zconvmm, wm)
 
-  return
+
 END SUBROUTINE  groupe
 

LMDZ6/branches/Amaury_dev/libf/dyn3d/groupeun.F90

@@ -127 +127 @@
   !$OMP END DO NOWAIT
 
-  RETURN
+
 END SUBROUTINE groupeun
 
@@ -196 +196 @@
   ENDDO
 
-  RETURN
+
 END SUBROUTINE INIT_GROUPEUN

LMDZ6/branches/Amaury_dev/libf/dyn3d/guide_mod.F90

@@ -425 +425 @@
                 CALL massdair(p,masse)
             ENDIF
-            RETURN
+
         ENDIF
 ! Verification structure guidage
@@ -1811 +1811 @@
          enddo
      enddo
-     return
+
   END SUBROUTINE  correctbid
 

LMDZ6/branches/Amaury_dev/libf/dyn3d/iniinterp_horiz.F90

@@ -176 +176 @@
   ! END DO
 
-  return
+
 END SUBROUTINE  iniinterp_horiz

LMDZ6/branches/Amaury_dev/libf/dyn3d/integrd.F90

@@ -250 +250 @@
   END IF
 
-  RETURN
+
 END SUBROUTINE integrd

LMDZ6/branches/Amaury_dev/libf/dyn3d/interp_horiz.F90

@@ -143 +143 @@
   !---------------------------------------------------------------
 
-  return
+
 END SUBROUTINE  interp_horiz

LMDZ6/branches/Amaury_dev/libf/dyn3d/leapfrog.F90

@@ -227 +227 @@
   !   -----
 
-  jD_cur = jD_ref + day_ini - day_ref +                             & &
+  jD_cur = jD_ref + day_ini - day_ref +                             &
   (itau+1)/day_step
-  jH_cur = jH_ref + start_time +                                    & &
+  jH_cur = jH_ref + start_time +                                    &
           mod(itau+1, day_step)/float(day_step)
   jD_cur = jD_cur + int(jH_cur)
@@ -405 +405 @@
     !       jH_cur = jH_ref +                                            &
     ! &              (itau * dtvr / daysec - int(itau * dtvr / daysec))
-    jD_cur = jD_ref + day_ini - day_ref +                        & &
+    jD_cur = jD_ref + day_ini - day_ref +                        &
     (itau+1)/day_step
 
@@ -413 +413 @@
     ENDIF
 
-    jH_cur = jH_ref + start_time +                               & &
+    jH_cur = jH_ref + start_time +                               &
             mod(itau+1, day_step)/float(day_step)
     jD_cur = jD_cur + int(jH_cur)

LMDZ6/branches/Amaury_dev/libf/dyn3d/qminimum.F90

@@ -190 +190 @@
 
   !
-  RETURN
+
 END SUBROUTINE qminimum

LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j.F90

@@ -133 +133 @@
 
   !
-  RETURN
+
 END SUBROUTINE tetaleveli1j

LMDZ6/branches/Amaury_dev/libf/dyn3d/tetaleveli1j1.F90

@@ -133 +133 @@
 
   !
-  RETURN
+
 END SUBROUTINE tetaleveli1j1

LMDZ6/branches/Amaury_dev/libf/dyn3d/vlsplt.F90

@@ -102 +102 @@
   enddo
 
-  RETURN
+
 END SUBROUTINE vlsplt
 RECURSIVE SUBROUTINE vlx(q,pente_max,masse,u_m,iq)
@@ -419 +419 @@
   enddo
 
-  RETURN
+
 END SUBROUTINE vlx
 RECURSIVE SUBROUTINE vly(q,pente_max,masse,masse_adv_v,iq)
@@ -746 +746 @@
   ! !write(*,*) 'vly 853: sortie'
 
-  RETURN
+
 END SUBROUTINE vly
 RECURSIVE SUBROUTINE vlz(q,pente_max,masse,w,iq)
@@ -889 +889 @@
   enddo
 
-  RETURN
+
 END SUBROUTINE vlz
 
@@ -901 +901 @@
   real :: zq(ip1jmp1,llm)
   real :: zzq(iip1,jjp1,llm)
-  return
+
 END SUBROUTINE  minmaxq
 

LMDZ6/branches/Amaury_dev/libf/dyn3d/vlspltqs.F90

@@ -173 +173 @@
   ! !write(*,*) 'vlspltqs 183: fin de la routine'
 
-  RETURN
+
 END SUBROUTINE vlspltqs
 SUBROUTINE vlxqs(q, pente_max, masse, u_m, qsat, iq)
@@ -506 +506 @@
   ! CALL SCOPY((jjm-1)*llm,masse(iip1+iip1,1),iip1,masse(iip2,1),iip1)
 
-  RETURN
+
 END SUBROUTINE vlxqs
 SUBROUTINE vlyqs(q, pente_max, masse, masse_adv_v, qsat, iq)
@@ -840 +840 @@
   ! !write(*,*) 'vly 879'
 
-  RETURN
+
 END SUBROUTINE vlyqs

LMDZ6/branches/Amaury_dev/libf/dyn3d/wrgrads.f90

@@ -125 +125 @@
   endif ! writectl
 
-  return
+
 
 END SUBROUTINE wrgrads