Changeset 5791 for LMDZ6/branches/contrails/libf/dyn3dmem

Timestamp:

Jul 28, 2025, 7:23:15 PM (3 weeks ago)

Author:

aborella

Message:

Merge with trunk r5789

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/advtrac_loc.f90 (modified) (1 diff)
• libf/dyn3dmem/call_calfis_mod.f90 (modified) (1 diff)
• libf/dyn3dmem/check_isotopes_loc.f90 (modified) (5 diffs)
• libf/dyn3dmem/dynetat0_loc.f90 (modified) (3 diffs)
• libf/dyn3dmem/integrd_loc.f90 (modified) (2 diffs)
• libf/dyn3dmem/leapfrog_loc.f90 (modified) (11 diffs)

LMDZ6/branches/contrails/libf/dyn3dmem/advtrac_loc.f90

@@ -21 +21 @@
    USE times
    USE advtrac_mod, ONLY: finmasse
-   USE strings_mod, ONLY: int2str
    USE dimensions_mod, ONLY: iim, jjm, llm, ndm
 USE paramet_mod_h

LMDZ6/branches/contrails/libf/dyn3dmem/call_calfis_mod.f90

@@ -91 +91 @@
   USE temps_mod, ONLY: day_ini, day_ref, jd_ref, jh_ref, start_time
   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
-  USE strings_mod, ONLY: int2str
   USE iniprint_mod_h
   IMPLICIT NONE

LMDZ6/branches/contrails/libf/dyn3dmem/check_isotopes_loc.f90

@@ -1 +1 @@
 SUBROUTINE check_isotopes(q, ijb, ije, err_msg)
    USE parallel_lmdz
-   USE strings_mod, ONLY: maxlen, msg, strIdx, strStack, int2str, real2str
+   USE strings_mod, ONLY: maxlen, msg, strIdx, strStack, num2str
    USE infotrac,    ONLY: nqtot, niso, nphas, isotope, isoCheck, iqIsoPha, isoSelect, &
                           ntiso, iH2O, nzone, tracers, isoName,  itZonIso
@@ -89 +89 @@
                   CYCLE
                END IF
-               CALL msg('ixt, iq = '//TRIM(strStack(int2str([ixt,iq]))), modname)
-               msg1 = '('//TRIM(strStack(int2str([i,k])))//')'
-               CALL msg(TRIM(tracers(iqpar)%name)//TRIM(msg1)//' = '//TRIM(real2str(q1)), modname)
-               CALL msg(TRIM(tracers(iq   )%name)//TRIM(msg1)//' = '//TRIM(real2str(q2)), modname)
+               CALL msg('ixt, iq = '//TRIM(strStack(num2str([ixt,iq]))), modname)
+               msg1 = '('//TRIM(strStack(num2str([i,k])))//')'
+               CALL msg(TRIM(tracers(iqpar)%name)//TRIM(msg1)//' = '//TRIM(num2str(q1)), modname)
+               CALL msg(TRIM(tracers(iq   )%name)//TRIM(msg1)//' = '//TRIM(num2str(q2)), modname)
                CALL abort_gcm(modname, 'Error with isotopes: '//TRIM(err_msg), 1)
             END DO
@@ -122 +122 @@
                deltaD = (q2/q1/tnat(ixt)-1.)*1000.
                IF(deltaD <= deltaDmax .AND. deltaD >= deltaDmin) CYCLE
-               CALL msg('ixt, iq = '//TRIM(strStack(int2str([ixt,iq]))), modname)
-               msg1 = '('//TRIM(strStack(int2str([i,k])))//')'
-               CALL msg(TRIM(tracers(iqpar)%name)//TRIM(msg1)//' = '//TRIM(real2str(q1)), modname)
-               CALL msg(TRIM(tracers(iq   )%name)//TRIM(msg1)//' = '//TRIM(real2str(q2)), modname)
-               CALL msg(TRIM(nm(iiso))//TRIM(real2str(deltaD)), modname)
+               CALL msg('ixt, iq = '//TRIM(strStack(num2str([ixt,iq]))), modname)
+               msg1 = '('//TRIM(strStack(num2str([i,k])))//')'
+               CALL msg(TRIM(tracers(iqpar)%name)//TRIM(msg1)//' = '//TRIM(num2str(q1)), modname)
+               CALL msg(TRIM(tracers(iq   )%name)//TRIM(msg1)//' = '//TRIM(num2str(q2)), modname)
+               CALL msg(TRIM(nm(iiso))//TRIM(num2str(deltaD)), modname)
                CALL abort_gcm(modname, 'Error with isotopes: '//TRIM(err_msg), 1)
             END DO
@@ -153 +153 @@
                   deltaD = (q2/q1/tnat(iso_HDO)-1.)*1000.
                   IF(deltaD <= deltaDmax .AND. deltaD >= deltaDmin) CYCLE
-                  CALL msg('izon, ipha = '//TRIM(strStack(int2str([izon, ipha]))), modname)
-                  CALL msg( 'ixt, ieau = '//TRIM(strStack(int2str([ ixt, ieau]))), modname)
-                  msg1 = '('//TRIM(strStack(int2str([i,k])))//')'
-                  CALL msg(TRIM(tracers(iqeau)%name)//TRIM(msg1)//' = '//TRIM(real2str(q1)), modname)
-                  CALL msg(TRIM(tracers(iq   )%name)//TRIM(msg1)//' = '//TRIM(real2str(q2)), modname)
-                  CALL msg('deltaD = '//TRIM(real2str(deltaD)), modname)
+                  CALL msg('izon, ipha = '//TRIM(strStack(num2str([izon, ipha]))), modname)
+                  CALL msg( 'ixt, ieau = '//TRIM(strStack(num2str([ ixt, ieau]))), modname)
+                  msg1 = '('//TRIM(strStack(num2str([i,k])))//')'
+                  CALL msg(TRIM(tracers(iqeau)%name)//TRIM(msg1)//' = '//TRIM(num2str(q1)), modname)
+                  CALL msg(TRIM(tracers(iq   )%name)//TRIM(msg1)//' = '//TRIM(num2str(q2)), modname)
+                  CALL msg('deltaD = '//TRIM(num2str(deltaD)), modname)
                   CALL abort_gcm(modname, 'Error with isotopes: '//TRIM(err_msg), 1)
                END DO
@@ -178 +178 @@
                IF(ABS(xtractot-xiiso) > errmax .AND. ABS(xtractot-xiiso)/MAX(MAX(ABS(xtractot),ABS(xiiso)),1e-18) > errmaxrel) THEN
                   CALL msg('Error in iso_verif_aberrant trac: '//TRIM(err_msg))
-                  CALL msg('iiso, ipha = '//TRIM(strStack(int2str([iiso, ipha]))), modname)
-                  CALL msg('q('//TRIM(strStack(int2str([i,k])))//',:) = '//TRIM(strStack(real2str(q(i,k,:)))), modname)
+                  CALL msg('iiso, ipha = '//TRIM(strStack(num2str([iiso, ipha]))), modname)
+                  CALL msg('q('//TRIM(strStack(num2str([i,k])))//',:) = '//TRIM(strStack(num2str(q(i,k,:)))), modname)
                   CALL abort_gcm(modname, 'Error with isotopes: '//TRIM(err_msg), 1)
                END IF

LMDZ6/branches/contrails/libf/dyn3dmem/dynetat0_loc.f90

@@ -11 +11 @@
   USE infotrac,    ONLY: nqtot, tracers, niso, iqIsoPha, iH2O, isoName, &
                          new2oldH2O, newHNO3, oldHNO3
-  USE strings_mod, ONLY: maxlen, msg, strStack, real2str, int2str, strIdx
+  USE strings_mod, ONLY: maxlen, msg, strStack, num2str, strIdx
   USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQUIRE_DIMENSION, NF90_INQ_VARID, &
                          NF90_CLOSE, NF90_GET_VAR, NF90_INQUIRE_VARIABLE,  NF90_NoErr
@@ -111 +111 @@
 
 !-------------------------------------------------------------------------------
-  CALL msg('rad, omeg, g, cpp, kappa = '//TRIM(strStack(real2str([rad,omeg,g,cpp,kappa]))), modname)
+  CALL msg('rad, omeg, g, cpp, kappa = '//TRIM(strStack(num2str([rad,omeg,g,cpp,kappa]))), modname)
   CALL check_dim(im,iim,'im','im')
   CALL check_dim(jm,jjm,'jm','jm')
@@ -236 +236 @@
   CHARACTER(LEN=*), INTENT(IN) :: str1, str2
   CHARACTER(LEN=maxlen) :: s1, s2
-  IF(n1/=n2) CALL abort_gcm(TRIM(modname), 'value of "'//TRIM(str1)//'" = '//TRIM(int2str(n1))// &
-   ' read in starting file differs from gcm value of "'//TRIM(str2)//'" = '//TRIM(int2str(n2)), 1)
+  IF(n1/=n2) CALL abort_gcm(TRIM(modname), 'value of "'//TRIM(str1)//'" = '//TRIM(num2str(n1))// &
+   ' read in starting file differs from gcm value of "'//TRIM(str2)//'" = '//TRIM(num2str(n2)), 1)
 END SUBROUTINE check_dim
 

LMDZ6/branches/contrails/libf/dyn3dmem/integrd_loc.f90

@@ -17 +17 @@
   USE comvert_mod, ONLY: ap, bp
   USE temps_mod, ONLY: dt
-  USE strings_mod, ONLY: int2str
+  USE strings_mod, ONLY: num2str
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
 USE paramet_mod_h
@@ -184 +184 @@
      ! call WriteField_u('int_finvmaold',finvmaold)
     do j=1,nq
-      call WriteField_u('int_q'//trim(int2str(j)), &
+      call WriteField_u('int_q'//trim(num2str(j)), &
             q(:,:,j))
-      call WriteField_u('int_dq'//trim(int2str(j)), &
+      call WriteField_u('int_dq'//trim(num2str(j)), &
             dq(:,:,j))
     enddo

LMDZ6/branches/contrails/libf/dyn3dmem/leapfrog_loc.f90

@@ -42 +42 @@
    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS
    USE lmdz_reprobus_wrappers, ONLY: finalize_reprobus
-   USE strings_mod, ONLY: int2str
+   USE strings_mod, ONLY: num2str
 
    USE dimensions_mod, ONLY: iim, jjm, llm, ndm
@@ -643 +643 @@
     call WriteField_u('phis',phis)
     do iq=1,nqtot
-      call WriteField_u('q'//trim(int2str(iq)), &
+      call WriteField_u('q'//trim(num2str(iq)), &
             q(:,:,iq))
     enddo
@@ -709 +709 @@
 
    ! do j=1,nqtot
-   !   call WriteField_u('qadv'//trim(int2str(j)),q(:,:,j))
+   !   call WriteField_u('qadv'//trim(num2str(j)),q(:,:,j))
    ! enddo
 
@@ -744 +744 @@
 
    ! do j=1,nqtot
-   !   call WriteField_p('q'//trim(int2str(j)),
+   !   call WriteField_p('q'//trim(num2str(j)),
   ! .                reshape(q(:,:,j),(/iip1,jmp1,llm/)))
-  !    call WriteField_p('dq'//trim(int2str(j)),
+  !    call WriteField_p('dq'//trim(num2str(j)),
   ! .                reshape(dq(:,:,j),(/iip1,jmp1,llm/)))
   !  enddo
@@ -782 +782 @@
       ! call WriteField_u('pkfi',pk)
       ! do j=1,nqtot
-      !   call WriteField_u('qfi'//trim(int2str(j)),q(:,:,j))
+      !   call WriteField_u('qfi'//trim(num2str(j)),q(:,:,j))
       ! enddo
   ! #endif
@@ -888 +888 @@
   !   call WriteField_u('pkfi',pk)
   !   do j=1,nqtot
-  !     call WriteField_u('qfi'//trim(int2str(j)),q(:,:,j))
+  !     call WriteField_u('qfi'//trim(num2str(j)),q(:,:,j))
   !   enddo
   ! #endif
@@ -979 +979 @@
   !     call WriteField_u('dpfi',dpfi)
   !     do j=1,nqtot
-  !       call WriteField_u('dqfi'//trim(int2str(j)),dqfi(:,:,j))
+  !       call WriteField_u('dqfi'//trim(num2str(j)),dqfi(:,:,j))
   !    enddo
   ! #endif
@@ -993 +993 @@
   !         call WriteField_u('psfi',ps)
   !     do j=1,nqtot
-  !       call WriteField_u('qfi'//trim(int2str(j)),q(:,:,j))
+  !       call WriteField_u('qfi'//trim(num2str(j)),q(:,:,j))
   !    enddo
   ! #endif
@@ -1007 +1007 @@
   !         call WriteField_u('psfi',ps)
   !     do j=1,nqtot
-  !       call WriteField_u('qfi'//trim(int2str(j)),q(:,:,j))
+  !       call WriteField_u('qfi'//trim(num2str(j)),q(:,:,j))
   !    enddo
   ! #endif
@@ -1021 +1021 @@
   !         call WriteField_u('psfi',ps)
   !     do j=1,nqtot
-  !       call WriteField_u('qfi'//trim(int2str(j)),q(:,:,j))
+  !       call WriteField_u('qfi'//trim(num2str(j)),q(:,:,j))
   !    enddo
   ! #endif
@@ -1087 +1087 @@
   !         call WriteField_u('psfi',ps)
   !     do j=1,nqtot
-  !       call WriteField_u('qfi'//trim(int2str(j)),q(:,:,j))
+  !       call WriteField_u('qfi'//trim(num2str(j)),q(:,:,j))
   !    enddo
   ! #endif