Changeset 4059 for trunk

Timestamp:

Feb 10, 2026, 10:18:01 AM (2 weeks ago)

Author:

jbclement

Message:

Mars PCM:
Deletion of 'qsurf' in the information provided by "start1D.txt" since it is unused and unnecessary until now. Addition of an error-leading check to prevent an unintended situation (which should not happen) regarding the presence of starting files.
JBC

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• deftank/start1D.txt (modified) (1 diff)
• libf/phymars/dyn1d/init_testphys1d_mod.F90 (modified) (1 diff)
• libf/phymars/dyn1d/testphys1d.F90 (modified) (3 diffs)
• libf/phymars/dyn1d/writerestart1D_mod.F90 (modified) (3 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -5063 +5063 @@
 or reference to it througout the code; write_output() should be used.
 
+== 10/02/2026 == JBC
+Deletion of 'qsurf' in the information provided by "start1D.txt" since it is unused and unnecessary until now. Addition of an error-leading check to prevent an unintended situation (which should not happen) regarding the presence of starting files.

trunk/LMDZ.MARS/deftank/start1D.txt

@@ -1 @@
- ps   610.00000000000000        30.000000000000000        610.00000000000000     
- co2                              207.28974396245630       0.95000000000143014       0.95000000000143014       0.95000000000143014       0.95000000000143014       0.95000000000142992       0.95000000000142903       0.95000000000142748       0.95000000000140117     
- h2o_ice                          2.0159175267859371        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000     
- h2o_vap                          2.0005511063113608        1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004
- dust_number                      3683127184588657.0        908741027699.70618        908741039954.43994        908740972528.71692        908740463802.42969        908738139867.22363        908730241124.12024        908709894792.02307        908244679635.97949     
- dust_mass                        324.19385997885132        9.3577293158506472E-006   9.3577312787075566E-006   9.3577300683319967E-006   9.3577140152716434E-006   9.3576374666951889E-006   9.3573734748091863E-006   9.3566521625726684E-006   9.3415891149355426E-006
- u   7.0162859775779278        7.0583328857319874        7.1693033167409466        7.3965987936610089        7.7658238566395656        8.2177899931297080        8.5806634750712991        9.9754019280278978     
+ ps   610.00000000000000        20.000000000000000        610.00000000000000     
+ co2                             0.95000000000039175       0.95000000000039164       0.95000000000039175       0.95000000000039231       0.95000000000039309       0.95000000000039353       0.95000000000039375       0.95000000000039675     
+ h2o_ice                          0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000     
+ h2o_vap                          1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004   1.0000000000000000E-004
+ dust_number                      913125351788.64746        913125365078.18054        913125295343.43115        913124785417.02563        913122452893.30396        913114524797.47522        913094099717.80786        912625801560.15234     
+ dust_mass                        9.3724303384156145E-006   9.3724324256698849E-006   9.3724310282428060E-006   9.3724150148580197E-006   9.3723384239435314E-006   9.3720742972476765E-006   9.3713525730294407E-006   9.3562371092787578E-006
+ u   7.0198534410958411        7.0621834665631784        7.1729667254377460        7.3996797533678533        7.7683520173918144        8.2197283557876499        8.5820520428384093        9.9754969109773590     
  v   0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000        0.0000000000000000     
- teta   147.61966732093049        168.54757895560138        168.62487570105756        168.83484726114642        169.32134171225377        170.24056991939565        171.67221112253304        173.47542102796041        186.22344609723632     
+ teta   147.61966732092046        168.56637639452077        168.64420969516397        168.85409996236143        169.33991992707061        170.25839106961627        171.68903267609639        173.49187212635630        186.22101330311474     

trunk/LMDZ.MARS/libf/phymars/dyn1d/init_testphys1d_mod.F90

@@ -538 +538 @@
 else
     do iq = 1,nq
-        read(3,*,iostat = ierr) header, (qsurf(1,iq,j), j = 1,size(qsurf,3)), (q(1,ilayer,iq), ilayer = 1,nlayer)
+        read(3,*,iostat = ierr) header, (q(1,ilayer,iq), ilayer = 1,nlayer)
         if (ierr /= 0) error stop 'Not enough atmospheric layers defined in the file "'//trim(start1Dname)//'" for the tracer "'//trim(header)//'"!'
         if (trim(tname(iq)) /= trim(header)) then

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F90

@@ -129 +129 @@
 if (startfiles_1D) then
     inquire(file = 'start1D.txt',exist = therestart1D)
-    if (startfiles_1D .and. .not. therestart1D) then
+    if (.not. therestart1D) then
         write(*,*) 'There is no "start1D.txt" file!'
         write(*,*) 'Initialization is done with default values.'
@@ -139 +139 @@
     endif
 endif
+if (therestart1D .and. .not. therestartfi) error stop 'There is a "start1D.txt" but no "startfi.nc". There might be problems for the initialization (for example ''qsurf'')!'
 
 call init_testphys1d('start1D.txt','startfi.nc',therestart1D,therestartfi,ngrid,nlayer,odpref,nq,q, &
@@ -261 +262 @@
 
 ! Writing the "restart1D.txt" file for the next run
-if (startfiles_1D) call writerestart1D('restart1D.txt',psurf,pa,preff,tsurf(1,:),nlayer,size(tsurf,2),temp,u,v,nq,noms,qsurf(1,:,:),q)
+if (startfiles_1D) call writerestart1D('restart1D.txt',psurf,pa,preff,tsurf(1,:),nlayer,size(tsurf,2),temp,u,v,nq,noms,q)
 
 write(*,*) "testphys1d: everything is cool!"

trunk/LMDZ.MARS/libf/phymars/dyn1d/writerestart1D_mod.F90

@@ -5 +5 @@
 contains
 
-SUBROUTINE writerestart1D(filename,psurf,pa,preff,tsurf,nlayer,nslope,temp,u,v,nq,qnames,qsurf,q)
+SUBROUTINE writerestart1D(filename,psurf,pa,preff,tsurf,nlayer,nslope,temp,u,v,nq,qnames,q)
 
 implicit none
@@ -16 +16 @@
 real, dimension(nlayer),     intent(in) :: temp, u, v
 real, dimension(nlayer,nq),  intent(in) :: q
-real, dimension(nq,nslope),  intent(in) :: qsurf
 character(*), dimension(nq), intent(in) :: qnames
 
@@ -26 +25 @@
 write(1,*) 'ps', psurf, pa, preff
 do i = 1,nq
-    write(1,*) qnames(i), (qsurf(i,j), j = 1,nslope), (q(il,i), il = 1,nlayer)
+    write(1,*) qnames(i), (q(il,i), il = 1,nlayer)
 enddo
 write(1,*) 'u', (u(il), il = 1,nlayer)